Merge branch 'release/1.4.8'

classyllama · Oct 15, 2018 · 2bad00c · 2bad00c
2 parents 5bfbd7b + c29b0ec
commit 2bad00c
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### 1.4.8 (2018-10-15)
+
+* Fix issue where editing customer in backend of Magento 2.1.x results in missing tabs (e.g. "Orders") [#151](https://github.com/classyllama/ClassyLlama_AvaTax/issues/151)
+* Added sensitive and environment-specific entries to the configuration type pool [#178](https://github.com/classyllama/ClassyLlama_AvaTax/issues/178) (from @leoquijano)
+* Add additional conditional check to prevent inadvertently disabling address validation [PR #124](https://github.com/classyllama/ClassyLlama_AvaTax/pull/124) (from @vovayatsyuk)
+
 ### 1.4.7 (2018-10-02)
 
 * Fix issue where Magento 2.1.15 and 2.2.6 zero out shipping amount at checkout [#184](https://github.com/classyllama/ClassyLlama_AvaTax/issues/184)

diff --git a/Framework/AppInterface.php b/Framework/AppInterface.php
@@ -20,5 +20,5 @@ interface AppInterface
     /**
      * If this is updated it must also be updated in composer.json
      */
-    const APP_VERSION = '1.4.7';
+    const APP_VERSION = '1.4.8';
 }
diff --git a/Plugin/Checkout/Model/ShippingInformationManagement.php b/Plugin/Checkout/Model/ShippingInformationManagement.php
@@ -174,7 +174,10 @@ public function aroundSaveAddressInformation(
         $quoteAddress = null;
 
         $shouldValidateAddress = true;
-        if (!is_null($shippingInformationExtension)) {
+        if (
+            !is_null($shippingInformationExtension)
+            && $shippingInformationExtension->getShouldValidateAddress() !== null
+        ) {
             $shouldValidateAddress = $shippingInformationExtension->getShouldValidateAddress();
         }
 

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "classyllama/module-avatax",
     "type": "magento2-module",
-    "version": "1.4.7",
+    "version": "1.4.8",
     "license": "OSL-3.0",
     "require": {
         "magento/framework": "^100.1.0|101.0.*",

diff --git a/etc/di.xml b/etc/di.xml
@@ -135,4 +135,29 @@
             <argument name="connectionName" xsi:type="string">sales</argument>
         </arguments>
     </type>
+
+    <!--
+    /**
+     * Add sensitive and environment-specific settings to the configuration type pool.
+     * This ensures that their values are not dumped by app:config:dump in app/etc/config.php, which is usually in version control.
+     *
+     * See:
+     * - https://devdocs.magento.com/guides/v2.2/extension-dev-guide/configuration/sensitive-and-environment-settings.html
+     */
+      -->
+    <type name="Magento\Config\Model\Config\TypePool">
+        <arguments>
+            <argument name="sensitive" xsi:type="array">
+                <item name="tax/avatax/production_account_number" xsi:type="string">1</item>
+                <item name="tax/avatax/production_license_key" xsi:type="string">1</item>
+                <item name="tax/avatax/production_company_code" xsi:type="string">1</item>
+                <item name="tax/avatax/development_account_number" xsi:type="string">1</item>
+                <item name="tax/avatax/development_license_key" xsi:type="string">1</item>
+                <item name="tax/avatax/development_company_code" xsi:type="string">1</item>
+            </argument>
+            <argument name="environment" xsi:type="array">
+                <item name="tax/avatax/live_mode" xsi:type="string">1</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/view/adminhtml/layout/customer_index_edit.xml b/view/adminhtml/layout/customer_index_edit.xml
@@ -7,7 +7,6 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <uiComponent name="customer_form"/>
             <block class="ClassyLlama\AvaTax\Block\Adminhtml\Customer\Edit\Region" name="edit" template="ClassyLlama_AvaTax::customer/edit/region.phtml" />
         </referenceContainer>
     </body>