CIVICRM-868: Hiding tax field on edit line item form if no tax collec…

…ted.
JMAConsulting · May 22, 2018 · 9442710 · 9442710
1 parent 255c62c
commit 9442710
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/CRM/Lineitemedit/Form/Edit.php b/CRM/Lineitemedit/Form/Edit.php
@@ -30,9 +30,12 @@ public function preProcess() {
 
   public function assignFormVariables($params = []) {
     $this->_lineitemInfo = civicrm_api3('lineItem', 'getsingle', array('id' => $this->_id));
-    $this->_lineitemInfo['tax_amount'] = CRM_Utils_Array::value('tax_amount', $this->_lineitemInfo, 0.00);
+    $this->_lineitemInfo['tax_amount'] = CRM_Utils_Array::value('tax_amount', $this->_lineitemInfo, NULL);
     foreach (CRM_Lineitemedit_Util::getLineitemFieldNames() as $attribute) {
-      $this->_values[$attribute] = CRM_Utils_Array::value($attribute, $this->_lineitemInfo, 0);
+      $lineitemAttributeValue = CRM_Utils_Array::value($attribute, $this->_lineitemInfo, 0);
+      if ($lineitemAttributeValue !== NULL) {
+        $this->_values[$attribute] = $lineitemAttributeValue;
+      }
     }
 
     $this->_values['currency'] = CRM_Core_DAO::getFieldValue(
@@ -155,7 +158,7 @@ public function submit($values, $isTest = FALSE) {
       'qty' => $values['qty'],
       'unit_price' => CRM_Utils_Rule::cleanMoney($values['unit_price']),
       'line_total' => $values['line_total'],
-      'tax_amount' => CRM_Utils_Array::value('tax_amount', $values, 0.00),
+      'tax_amount' => CRM_Utils_Array::value('tax_amount', $values, NULL),
     );
     $lineItem = CRM_Price_BAO_LineItem::create($params);
     $lineItem = $lineItem->toArray();