Display tax amount in receipts for membership and event offline contribution with...

[civicrm-core.git] / CRM / Contribute / Form / Contribution.php

diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
index 2c5e91cd05897128a51b724163686982ab0ad7c3..93c5de014564a0c6d29aeb05d75602d908c10c26 100644 (file)
--- a/CRM/Contribute/Form/Contribution.php
+++ b/CRM/Contribute/Form/Contribution.php
@@ -1352,7 +1352,6 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
       $getTaxDetails = FALSE;
       $invoiceSettings = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME,'contribution_invoice_settings');
       $invoicing = CRM_Utils_Array::value('invoicing', $invoiceSettings);
-      $this->assign('invoicing', $invoicing);
       if ($invoicing) {
         if ($this->_action & CRM_Core_Action::ADD) {
           $line = $lineItem;
@@ -1374,9 +1373,6 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
           }
         }
       }
-      else {
-        $taxRate = array($submittedValues['tax_amount']);
-      }
        
       if ($invoicing) {
         if ($this->_action & CRM_Core_Action::UPDATE) {
@@ -1394,6 +1390,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
             $this->assign('totalTaxAmount', $submittedValues['tax_amount']);
             $this->assign('getTaxDetails', $getTaxDetails);
             $this->assign('dataArray', $taxRate);
+            $this->assign('taxTerm', CRM_Utils_Array::value('tax_term', $invoiceSettings));
           }
           else {
             $this->assign('totalTaxAmount', CRM_Utils_Array::value('tax_amount', $submittedValues));