projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Additional fix for CRM-17815 and alignment fixes
[civicrm-core.git]
/
CRM
/
Contribute
/
BAO
/
Contribution.php
diff --git
a/CRM/Contribute/BAO/Contribution.php
b/CRM/Contribute/BAO/Contribution.php
index 9bc685129e74e1f0d7597e74c92e71b875c69dab..617033da661ccc1514e265babd5c26ae6be66602 100644
(file)
--- a/
CRM/Contribute/BAO/Contribution.php
+++ b/
CRM/Contribute/BAO/Contribution.php
@@
-4046,7
+4046,7
@@
WHERE con.id = {$contributionId}
empty($params['skipLineItem']) && !$isLineItem
) {
$taxRateParams = $taxRates[$params['financial_type_id']];
empty($params['skipLineItem']) && !$isLineItem
) {
$taxRateParams = $taxRates[$params['financial_type_id']];
- $taxAmount = CRM_Contribute_BAO_Contribution_Utils::calculateTaxAmount(
$params['total_amount']
, $taxRateParams);
+ $taxAmount = CRM_Contribute_BAO_Contribution_Utils::calculateTaxAmount(
CRM_Utils_Array::value('total_amount', $params)
, $taxRateParams);
$params['tax_amount'] = round($taxAmount['tax_amount'], 2);
// Get Line Item on update of contribution
$params['tax_amount'] = round($taxAmount['tax_amount'], 2);
// Get Line Item on update of contribution
@@
-4061,7
+4061,7
@@
WHERE con.id = {$contributionId}
$params['line_item'][$setID][$priceFieldID]['tax_amount'] = $params['tax_amount'];
}
}
$params['line_item'][$setID][$priceFieldID]['tax_amount'] = $params['tax_amount'];
}
}
- $params['total_amount'] =
$params['total_amount']
+ $params['tax_amount'];
+ $params['total_amount'] =
CRM_Utils_Array::value('total_amount', $params)
+ $params['tax_amount'];
}
elseif (isset($params['api.line_item.create'])) {
// Update total amount of contribution using lineItem
}
elseif (isset($params['api.line_item.create'])) {
// Update total amount of contribution using lineItem