From 17ab42dd922c779eece855ae20d27ac7e9d20dcd Mon Sep 17 00:00:00 2001 From: dpradeep Date: Mon, 29 Sep 2014 17:42:08 +0530 Subject: [PATCH] Unit test failure fixes --- CRM/Contribute/Form/Contribution/Confirm.php | 2 +- CRM/Price/BAO/PriceField.php | 2 +- api/v3/examples/Contribution/Create.php | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index 4066df0810..eac0ff9a14 100644 --- 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 2c1b3899b2..88f89876ea 100644 --- 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 c43b8e855b..a2c2a7296b 100644 --- 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' => '', ), ), ); -- 2.25.1