From 217da64626de69d5e0908cfcbd69e7dfeee71a9f Mon Sep 17 00:00:00 2001 From: eileen Date: Tue, 28 Nov 2017 20:05:58 +1300 Subject: [PATCH] CRM-19723 minor code simplification --- CRM/Price/BAO/LineItem.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CRM/Price/BAO/LineItem.php b/CRM/Price/BAO/LineItem.php index a87cec2878..bf7f93be06 100644 --- a/CRM/Price/BAO/LineItem.php +++ b/CRM/Price/BAO/LineItem.php @@ -664,7 +664,6 @@ WHERE li.contribution_id = %1"; CRM_Price_BAO_LineItem::create($lineItemToAlter); } - // the recordAdjustedAmt code would execute over here $count = 0; if ($entity == 'participant') { $count = count(CRM_Event_BAO_Participant::getParticipantIds($contributionId)); @@ -694,14 +693,15 @@ WHERE li.contribution_id = %1"; } $trxn = $lineItemObj->recordAdjustedAmt($updatedAmount, $paidAmount, $contributionId, $taxAmount, $updateAmountLevel); - $contributionCompletedStatusID = CRM_Core_PseudoConstant::getKey('CRM_Contribute_DAO_Contribution', 'contribution_status_id', 'Completed'); + $contributionStatus = CRM_Core_PseudoConstant::getName('CRM_Contribute_DAO_Contribution', 'contribution_status_id', CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_Contribution', $contributionId, 'contribution_status_id')); + if (!empty($financialItemsArray)) { foreach ($financialItemsArray as $updateFinancialItemInfoValues) { $newFinancialItem = CRM_Financial_BAO_FinancialItem::create($updateFinancialItemInfoValues); // record reverse transaction only if Contribution is Completed because for pending refund or // partially paid we are already recording the surplus owed or refund amount - if (!empty($updateFinancialItemInfoValues['financialTrxn']) && ($contributionCompletedStatusID == - CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_Contribution', $contributionId, 'contribution_status_id')) + if (!empty($updateFinancialItemInfoValues['financialTrxn']) && ($contributionStatus == 'Completed' + ) ) { $updateFinancialItemInfoValues = array_merge($updateFinancialItemInfoValues['financialTrxn'], array( 'entity_id' => $newFinancialItem->id, -- 2.25.1