Added configuration field for shipping tax code. Default to old constant value.

Author: chris-huffman

Helper/Config.php

@@ -132,6 +132,8 @@ class Config extends AbstractHelper
     const XML_PATH_AVATAX_ADMIN_NOTIFICATION_IGNORE_NATIVE_TAX_RULES = 'tax/avatax/ignore_native_tax_rules_notification';
 
     const XML_PATH_AVATAX_ADMIN_IS_SELLER_IMPORTER_OF_RECORD = 'tax/avatax/is_seller_importer_of_record';
+
+    const XML_PATH_AVATAX_SHIPPING_TAX_CODE = 'tax/avatax/shipping_tax_code';
     /**#@-*/
 
     /**
@@ -1072,4 +1074,20 @@ public function isSellerImporterOfRecord($originAddress, $destAddress, $storeId)
         }
         return $isSellerImporterOfRecord;
     }
+
+    /**
+    * Get Shipping Tax Code.
+    *
+    * @param $store
+    *
+    * @return string
+    */
+    public function getShippingTaxCode($store = null)
+    {
+        return $this->scopeConfig->getValue(
+            self::XML_PATH_AVATAX_SHIPPING_TAX_CODE,
+            ScopeInterface::SCOPE_STORE,
+            $store
+        );
+    }
 }

Helper/TaxClass.php

@@ -23,11 +23,6 @@
  */
 class TaxClass
 {
-    /**
-     * Avatax shipping tax code
-     */
-    const SHIPPING_LINE_AVATAX_TAX_CODE = 'FR020100';
-
     /**
      * Avatax gift certificate tax code
      */
@@ -177,12 +172,13 @@ public function getRef2ForProduct(\Magento\Catalog\Model\Product $product)
 
     /**
      * Get AvaTax Tax Code for shipping
+     * Default Configuration Setting: FR020100
      *
      * @return string
      */
     public function getAvataxTaxCodeForShipping()
     {
-        return self::SHIPPING_LINE_AVATAX_TAX_CODE;
+        return $this->config->getShippingTaxCode();
     }
 
     /**

etc/adminhtml/system.xml

@@ -230,6 +230,14 @@
                     <depends>
                         <field id="enabled">1</field>
                     </depends>
+                </field>
+                 <field id="shipping_tax_code" translate="label" type="text" sortOrder="3065" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <config_path>tax/avatax/shipping_tax_code</config_path>
+                    <label>Shipping Tax Code</label>
+                    <comment>The Avalara tax code used to classify the shipping service type.</comment>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
                 </field>
                 <field id="sku_shipping" translate="label" type="text" sortOrder="3070" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Shipping SKU</label>

etc/config.xml

@@ -24,6 +24,7 @@
                 <tax_calculation_countries_enabled>CA,US</tax_calculation_countries_enabled>
                 <is_seller_importer_of_record>0</is_seller_importer_of_record>
                 <use_business_identification_number>1</use_business_identification_number>
+                <shipping_tax_code>FR020100</shipping_tax_code>
                 <sku_shipping>Shipping</sku_shipping>
                 <sku_gift_wrap_order>GwOrder</sku_gift_wrap_order>
                 <sku_gift_wrap_item>GwItems</sku_gift_wrap_item>