From b75ef57ed7303aa88817690ac0a496010dc34d04 Mon Sep 17 00:00:00 2001 From: Pratik Joshi Date: Wed, 12 Mar 2014 19:53:14 +0530 Subject: [PATCH] CRM-13973-qa : financial_item statuses fix on change selection --- CRM/Event/BAO/Participant.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/CRM/Event/BAO/Participant.php b/CRM/Event/BAO/Participant.php index 4c6036811d..f0432ce009 100644 --- a/CRM/Event/BAO/Participant.php +++ b/CRM/Event/BAO/Participant.php @@ -1776,9 +1776,6 @@ WHERE cpf.price_set_id = %1 AND cpfv.label LIKE %2"; $contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name'); $partiallyPaidStatusId = array_search('Partially paid', $contributionStatuses); $pendngRefundStatusId = array_search('Pending refund', $contributionStatuses); - $fetchCon = array('id' => $contributionId); - $contributionObj = CRM_Contribute_BAO_Contribution::retrieve($fetchCon, CRM_Core_DAO::$_nullArray, CRM_Core_DAO::$_nullArray); - $previousLineItems = CRM_Price_BAO_LineItem::getLineItems($participantId, 'participant'); CRM_Price_BAO_PriceSet::processAmount($feeBlock, $params, $lineItems @@ -1820,6 +1817,13 @@ WHERE (li.entity_table = 'civicrm_participant' AND li.entity_id = {$participantI CRM_Core_DAO::executeQuery($updateLineItem); } + // insert new 'adjusted amount' transaction entry and update contribution entry. + // ensure entity_financial_trxn table has a linking of it. + $updatedAmount = $params['amount']; + self::recordAdjustedAmt($updatedAmount, $paidAmount, $contributionId); + $fetchCon = array('id' => $contributionId); + $updatedContribution = CRM_Contribute_BAO_Contribution::retrieve($fetchCon, CRM_Core_DAO::$_nullArray, CRM_Core_DAO::$_nullArray); + // insert new line items foreach ($insertLines as $valueId => $lineParams) { $lineParams['entity_table'] = 'civicrm_participant'; @@ -1827,14 +1831,9 @@ WHERE (li.entity_table = 'civicrm_participant' AND li.entity_id = {$participantI $lineObj = CRM_Price_BAO_LineItem::create($lineParams); // insert financial items // ensure entity_financial_trxn table has a linking of it. - $prevItem = CRM_Financial_BAO_FinancialItem::add($lineObj, $contributionObj); + $prevItem = CRM_Financial_BAO_FinancialItem::add($lineObj, $updatedContribution); } - // insert new 'adjusted amount' transaction entry and update contribution entry. - // ensure entity_financial_trxn table has a linking of it. - $updatedAmount = $params['amount']; - self::recordAdjustedAmt($updatedAmount, $paidAmount, $contributionId); - // update participant fee_amount column $partUpdateFeeAmt['id'] = $participantId; $partUpdateFeeAmt['fee_amount'] = $params['amount']; -- 2.25.1