From 59e17783a96e2f8de0c00a14b618e42c06ca7958 Mon Sep 17 00:00:00 2001 From: Samuel Vanhove Date: Mon, 24 Jul 2017 17:17:26 -0400 Subject: [PATCH] CRM-20954 Initiate paid status id only once --- CRM/Contribute/BAO/Contribution.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index 88f5413eed..a47996ec2c 100755 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -3861,6 +3861,10 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac $params['skipLineItem'] = TRUE; $trxnsData['trxn_date'] = !empty($trxnsData['trxn_date']) ? $trxnsData['trxn_date'] : date('YmdHis'); $arAccountId = CRM_Contribute_PseudoConstant::getRelationalFinancialAccount($contributionDAO->financial_type_id, 'Accounts Receivable Account is'); + + // get the paid status id + $paidStatus = CRM_Core_PseudoConstant::getKey('CRM_Financial_DAO_FinancialItem', 'status_id', 'Paid'); + if ($paymentType == 'owed') { $params['partial_payment_total'] = $contributionDAO->total_amount; $params['partial_amount_to_pay'] = $trxnsData['total_amount']; @@ -3932,8 +3936,6 @@ WHERE eft.entity_table = 'civicrm_contribution' } // update financial item statuses - $paidStatus = CRM_Core_PseudoConstant::getKey('CRM_Financial_DAO_FinancialItem', 'status_id', 'Paid'); - $baseTrxnId = CRM_Core_BAO_FinancialTrxn::getFinancialTrxnId($contributionId); $sqlFinancialItemUpdate = " UPDATE civicrm_financial_item fi @@ -3960,7 +3962,6 @@ 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 - $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) { -- 2.25.1