Tax field can be text or dropdown. Fixes #34

surprisehighway · Jul 7, 2021 · 3690997 · 3690997
1 parent 21aa901
commit 3690997
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/services/SalesTaxService.php b/src/services/SalesTaxService.php
@@ -600,8 +600,8 @@ private function getTotalTax($order, $transaction)
 
                 $taxCode = $defaultTaxCode;
 
-                if(isset($lineItem->purchasable->product->avataxTaxCode)) {
-                    $taxCode = $lineItem->purchasable->product->avataxTaxCode ?: $defaultTaxCode;
+                if($this->getFieldValue('avataxTaxCode', $lineItem->purchasable->product)) {
+                    $taxCode = $this->getFieldValue('avataxTaxCode', $lineItem->purchasable->product);
                 }
 
                 $itemCode = $lineItem->id;
@@ -639,9 +639,9 @@ private function getTotalTax($order, $transaction)
                     $discountCode = $defaultTaxCode;
 
                     // check to see if there is an Avatax Tax Code override specified
-                    if(!empty($adjustmentLineItem->purchasable->product->avataxTaxCode))
+                    if($this->getFieldValue('avataxTaxCode', $lineItem->purchasable->product))
                     {
-                        $discountCode = $adjustmentLineItem->purchasable->product->avataxTaxCode;
+                        $discountCode = $this->getFieldValue('avataxTaxCode', $lineItem->purchasable->product);
                     }
                 }