From 7a557322ea0a5de1e81163c2c759c3ef91cbc690 Mon Sep 17 00:00:00 2001 From: Vova Yatsyuk Date: Fri, 27 Apr 2018 09:35:23 +0300 Subject: [PATCH 1/5] Don't disable validation if it wasn't intentionally --- Plugin/Checkout/Model/ShippingInformationManagement.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Plugin/Checkout/Model/ShippingInformationManagement.php b/Plugin/Checkout/Model/ShippingInformationManagement.php index daae25df..ec45f4f0 100644 --- a/Plugin/Checkout/Model/ShippingInformationManagement.php +++ b/Plugin/Checkout/Model/ShippingInformationManagement.php @@ -165,7 +165,9 @@ public function aroundSaveAddressInformation( $quoteAddress = null; $shouldValidateAddress = true; - if (!is_null($shippingInformationExtension)) { + if (!is_null($shippingInformationExtension) + && ($shippingInformationExtension->getShouldValidateAddress() !== null)) { + $shouldValidateAddress = $shippingInformationExtension->getShouldValidateAddress(); } From f95353b0861a490af658d589bb4ad4b2362209c8 Mon Sep 17 00:00:00 2001 From: Leonardo Quijano Date: Sun, 7 Oct 2018 14:05:38 -0600 Subject: [PATCH 2/5] [#178] Added sensitive and environment-specific entries to the configuration type pool. --- etc/di.xml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/etc/di.xml b/etc/di.xml index cf39ecee..b6dd9985 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -135,4 +135,29 @@ sales + + + + + + 1 + 1 + 1 + 1 + 1 + 1 + + + 1 + + + From 242808fbd29a89427a2d06522c818533503a1a0a Mon Sep 17 00:00:00 2001 From: Richard Sisco Date: Sun, 14 Oct 2018 22:35:52 -0500 Subject: [PATCH 3/5] AVS-421_107 - Fix no orders tab on customer edit form - Remove errant line in XML file --- view/adminhtml/layout/customer_index_edit.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/view/adminhtml/layout/customer_index_edit.xml b/view/adminhtml/layout/customer_index_edit.xml index 1e173c2f..f87b2990 100644 --- a/view/adminhtml/layout/customer_index_edit.xml +++ b/view/adminhtml/layout/customer_index_edit.xml @@ -7,7 +7,6 @@ - From 7df67db7285dc059feae355b4c2f982e526007e3 Mon Sep 17 00:00:00 2001 From: rsisco Date: Mon, 15 Oct 2018 09:39:10 -0500 Subject: [PATCH 4/5] - Reformat submitted change --- Plugin/Checkout/Model/ShippingInformationManagement.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Plugin/Checkout/Model/ShippingInformationManagement.php b/Plugin/Checkout/Model/ShippingInformationManagement.php index ec45f4f0..5c40e877 100644 --- a/Plugin/Checkout/Model/ShippingInformationManagement.php +++ b/Plugin/Checkout/Model/ShippingInformationManagement.php @@ -165,9 +165,10 @@ public function aroundSaveAddressInformation( $quoteAddress = null; $shouldValidateAddress = true; - if (!is_null($shippingInformationExtension) - && ($shippingInformationExtension->getShouldValidateAddress() !== null)) { - + if ( + !is_null($shippingInformationExtension) + && $shippingInformationExtension->getShouldValidateAddress() !== null + ) { $shouldValidateAddress = $shippingInformationExtension->getShouldValidateAddress(); } From c29b0ec2cf3b0c2bd95a412a044867786fe1b606 Mon Sep 17 00:00:00 2001 From: Richard Sisco Date: Mon, 15 Oct 2018 09:48:13 -0500 Subject: [PATCH 5/5] - Update version number and changelog --- CHANGELOG.md | 6 ++++++ Framework/AppInterface.php | 2 +- composer.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67040c71..4ce7eedd 100644 --- 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 index ac0c899c..5150c358 100644 --- 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/composer.json b/composer.json index 978f0f72..ebe78469 100644 --- 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.*",