From 0512b6113252dcfe3fc3b0bac3effa4fbb8ad115 Mon Sep 17 00:00:00 2001 From: Samuel Vanhove Date: Mon, 24 Jul 2017 16:19:57 -0400 Subject: [PATCH] CRM-20954 Fixing localized finantial status problems --- CRM/Contribute/BAO/Contribution.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) mode change 100644 => 100755 CRM/Contribute/BAO/Contribution.php diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php old mode 100644 new mode 100755 index 01a4f4283d..88f5413eed --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -3932,8 +3932,7 @@ WHERE eft.entity_table = 'civicrm_contribution' } // update financial item statuses - $financialItemStatus = CRM_Core_PseudoConstant::get('CRM_Financial_DAO_FinancialItem', 'status_id'); - $paidStatus = array_search('Paid', $financialItemStatus); + $paidStatus = CRM_Core_PseudoConstant::getKey('CRM_Financial_DAO_FinancialItem', 'status_id', 'Paid'); $baseTrxnId = CRM_Core_BAO_FinancialTrxn::getFinancialTrxnId($contributionId); $sqlFinancialItemUpdate = " @@ -3961,7 +3960,7 @@ WHERE eft.financial_trxn_id IN ({$trxnId}, {$baseTrxnId['financialTrxnId']}) $contributionDetails = CRM_Core_DAO::setFieldValue('CRM_Contribute_BAO_Contribution', $contributionId, 'contribution_status_id', $statusId); } // add financial item entry - $financialItemStatus = CRM_Core_PseudoConstant::get('CRM_Financial_DAO_FinancialItem', 'status_id'); + $paidStatus = CRM_Core_PseudoConstant::getKey('CRM_Financial_DAO_FinancialItem', 'status_id', 'Paid'); $lineItems = CRM_Price_BAO_LineItem::getLineItemsByContributionID($contributionDAO->id); if (!empty($lineItems)) { foreach ($lineItems as $lineItemId => $lineItemValue) { @@ -3975,7 +3974,7 @@ WHERE eft.financial_trxn_id IN ({$trxnId}, {$baseTrxnId['financialTrxnId']}) 'contact_id' => $contributionDAO->contact_id, 'amount' => round($paid, 2), 'currency' => $contributionDAO->currency, - 'status_id' => array_search('Paid', $financialItemStatus), + 'status_id' => $paidStatus, 'entity_id' => $lineItemId, 'entity_table' => 'civicrm_line_item', ); -- 2.25.1