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

diff --git a/CRM/Contribute/BAO/Contribution/Utils.php b/CRM/Contribute/BAO/Contribution/Utils.php
index 58fdea9ad5ba9ea7ef91dacd111162ed87f3bb2e..9ceea353808b0a1e77e94f0700c0741e094bb0ae 100644 (file)
--- 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 5f3a119cb6db4a83cb781167f7297149ae408124..9192e912261527a45ce674a862435d39010af26e 100644 (file)
--- 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'])
       ) {