ENGCOM-4510: [Forwardport] [Checkout] Fix clearing admin quote address when removing all items #21785

magento-engcom-team · magento-engcom-team · commit fdc575405f66 · 2019-03-16T04:39:16.000-05:00
- Merge Pull Request #21785 from eduard13/magento2:2.3-develop-up-port-21051 - Merged commits: 1. 01eb7e6
diff --git a/app/code/Magento/Checkout/etc/di.xml b/app/code/Magento/Checkout/etc/di.xml
@@ -49,7 +49,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Quote\Model\Quote">
-        <plugin name="clear_addresses_after_product_delete" type="Magento\Checkout\Plugin\Model\Quote\ResetQuoteAddresses"/>
-    </type>
 </config>
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -96,4 +96,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Quote\Model\Quote">
+        <plugin name="clear_addresses_after_product_delete" type="Magento\Checkout\Plugin\Model\Quote\ResetQuoteAddresses"/>
+    </type>
 </config>
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
@@ -22,6 +22,7 @@ class ResetQuoteAddressesTest extends \PHPUnit\Framework\TestCase
     /**
      * @magentoDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
      *
+     * @magentoAppArea frontend
      * @return void
      */
     public function testAfterRemoveItem(): void

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ class ResetQuoteAddressesTest extends \PHPUnit\Framework\TestCase`
`22`	`22`	`/**`
`23`	`23`	`* @magentoDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php`
`24`	`24`	`*`
	`25`	`+ * @magentoAppArea frontend`
`25`	`26`	`* @return void`
`26`	`27`	`*/`
`27`	`28`	`public function testAfterRemoveItem(): void`