From 97288cdc6a08d6249cfc344b2a0302bb95422c59 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 19 Mar 2019 23:11:36 +1300
Subject: [PATCH] Minor code cleanups around invoicing assignment

---
 CRM/Contribute/Form/Contribution/Confirm.php  | 24 +++++++++----------
 .../Form/FrontEndPaymentFormTrait.php         | 10 ++++----
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index 0afaf65fb1..6d791a5db9 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -508,18 +508,22 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
     $amount_block_is_active = $this->get('amount_block_is_active');
     $this->assign('amount_block_is_active', $amount_block_is_active);
 
-    $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
-    $invoicing = CRM_Utils_Array::value('invoicing', $invoiceSettings);
     // Make a copy of line items array to use for display only
     $tplLineItems = $this->_lineItem;
-    if ($invoicing) {
-      $getTaxDetails = FALSE;
-      $taxTerm = CRM_Utils_Array::value('tax_term', $invoiceSettings);
+    if (CRM_Invoicing_Utils::isInvoicingEnabled()) {
       list($getTaxDetails, $tplLineItems) = $this->alterLineItemsForTemplate($tplLineItems);
       $this->assign('getTaxDetails', $getTaxDetails);
-      $this->assign('taxTerm', $taxTerm);
+      $this->assign('taxTerm', CRM_Invoicing_Utils::getTaxTerm());
       $this->assign('totalTaxAmount', $params['tax_amount']);
     }
+    if ($this->_priceSetId && !CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceSet', $this->_priceSetId, 'is_quick_config')) {
+      $this->assign('lineItem', $tplLineItems);
+    }
+    else {
+      $this->assign('is_quick_config', 1);
+      $this->_params['is_quick_config'] = 1;
+    }
+
     if (!empty($params['selectProduct']) && $params['selectProduct'] != 'no_thanks') {
       $option = CRM_Utils_Array::value('options_' . $params['selectProduct'], $params);
       $productID = $params['selectProduct'];
@@ -574,13 +578,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
 
     $this->_separateMembershipPayment = $this->get('separateMembershipPayment');
     $this->assign('is_separate_payment', $this->_separateMembershipPayment);
-    if ($this->_priceSetId && !CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceSet', $this->_priceSetId, 'is_quick_config')) {
-      $this->assign('lineItem', $tplLineItems);
-    }
-    else {
-      $this->assign('is_quick_config', 1);
-      $this->_params['is_quick_config'] = 1;
-    }
+
     $this->assign('priceSetID', $this->_priceSetId);
 
     // The concept of contributeMode is deprecated.
diff --git a/CRM/Financial/Form/FrontEndPaymentFormTrait.php b/CRM/Financial/Form/FrontEndPaymentFormTrait.php
index c74dea5ad4..c65d8898ed 100644
--- a/CRM/Financial/Form/FrontEndPaymentFormTrait.php
+++ b/CRM/Financial/Form/FrontEndPaymentFormTrait.php
@@ -50,12 +50,10 @@ trait CRM_Financial_Form_FrontEndPaymentFormTrait {
     $getTaxDetails = FALSE;
     foreach ($tplLineItems as $key => $value) {
       foreach ($value as $k => $v) {
-        if (isset($v['tax_rate'])) {
-          if ($v['tax_rate'] != '') {
-            $getTaxDetails = TRUE;
-            // Cast to float to display without trailing zero decimals
-            $tplLineItems[$key][$k]['tax_rate'] = (float) $v['tax_rate'];
-          }
+        if (isset($v['tax_rate']) && $v['tax_rate'] != '') {
+          $getTaxDetails = TRUE;
+          // Cast to float to display without trailing zero decimals
+          $tplLineItems[$key][$k]['tax_rate'] = (float) $v['tax_rate'];
         }
       }
     }
-- 
2.25.1