Unit test failure fixes

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index 4066df081017aace8902101073cf3131cc710b38..eac0ff9a14c1be9e0a1cec51052472a96e52646c 100644 (file)
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -94,7 +94,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
       'receive_date' => (CRM_Utils_Array::value('receive_date', $params)) ? CRM_Utils_Date::processDate($params['receive_date']) : date('YmdHis'),
       'non_deductible_amount' => $nonDeductibleAmount,
       'total_amount' => $params['amount'],
-      'tax_amount' => $params['tax_amount'],
+      'tax_amount' => CRM_Utils_Array::value('tax_amount', $params),
       'amount_level' => CRM_Utils_Array::value('amount_level', $params),
       'invoice_id' => $params['invoiceID'],
       'currency' => $params['currencyID'],

diff --git a/CRM/Price/BAO/PriceField.php b/CRM/Price/BAO/PriceField.php
index 2c1b3899b256eff95952405f81f121fa7e65836f..88f89876ea9a944c311ac5d42275b99585173e68 100644 (file)
--- a/CRM/Price/BAO/PriceField.php
+++ b/CRM/Price/BAO/PriceField.php
@@ -553,7 +553,7 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
       // ToDo - Code for Hook Invoke
 
       foreach ($options[$fieldId] as $priceFieldId => $priceFieldValues) {
-        if (array_key_exists($priceFieldValues['financial_type_id'], $taxRates)) {
+        if (isset($priceFieldValues['financial_type_id']) && array_key_exists($priceFieldValues['financial_type_id'], $taxRates)) {
           $options[$fieldId][$priceFieldId]['tax_rate'] = $taxRates[$priceFieldValues['financial_type_id']];
           $taxAmount = CRM_Contribute_BAO_Contribution_Utils::calculateTaxAmount($priceFieldValues['amount'], $options[$fieldId][$priceFieldId]['tax_rate']);
           $options[$fieldId][$priceFieldId]['tax_amount'] = round($taxAmount['tax_amount'],2);

diff --git a/api/v3/examples/Contribution/Create.php b/api/v3/examples/Contribution/Create.php
index c43b8e855b9f6ec6f95286039968376e53f001c1..a2c2a7296b5b4be251773cb309af4a9a209cf57a 100644 (file)
--- a/api/v3/examples/Contribution/Create.php
+++ b/api/v3/examples/Contribution/Create.php
@@ -69,6 +69,8 @@ function contribution_create_expectedresult(){
           'check_number' => '',
           'campaign_id' => '',
           'contribution_type_id' => '1',
+          'creditnote_id' => '',
+          'tax_amount' => '',
         ),
     ),
 );