From 1659de202cb55ee07ccde1484eb59f639e778c78 Mon Sep 17 00:00:00 2001 From: Pradeep Nayak Date: Thu, 29 Dec 2016 02:41:16 +0530 Subject: [PATCH] CRM-19799, set line item in form layer ---------------------------------------- * CRM-19799: LineItems incorrect at both Contribution Level and Financial Accounts Level https://issues.civicrm.org/jira/browse/CRM-19799 --- CRM/Contribute/BAO/Contribution/Utils.php | 3 --- CRM/Contribute/Form/Contribution/Confirm.php | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CRM/Contribute/BAO/Contribution/Utils.php b/CRM/Contribute/BAO/Contribution/Utils.php index 58fdea9ad5..9ceea35380 100644 --- a/CRM/Contribute/BAO/Contribution/Utils.php +++ b/CRM/Contribute/BAO/Contribution/Utils.php @@ -110,9 +110,6 @@ class CRM_Contribute_BAO_Contribution_Utils { // @todo make sure this is consisently set at this point. $contributionParams['line_item'] = $paymentParams['line_item']; } - elseif (isset($form->_lineItem)) { - $contributionParams['line_item'] = $form->_lineItem; - } if (!empty($form->_paymentProcessor)) { $contributionParams['payment_instrument_id'] = $paymentParams['payment_instrument_id'] = $form->_paymentProcessor['payment_instrument_id']; } diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index 5f3a119cb6..9192e91226 100644 --- a/CRM/Contribute/Form/Contribution/Confirm.php +++ b/CRM/Contribute/Form/Contribution/Confirm.php @@ -2268,6 +2268,10 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr // Make it explict that we are letting the processConfirm function figure out the line items. $paymentParams['skipLineItem'] = 0; + if (!isset($paymentParams['line_item'])) { + $paymentParams['line_item'] = $this->_lineItem; + } + if (!empty($paymentParams['onbehalf']) && is_array($paymentParams['onbehalf']) ) { -- 2.25.1