[Magento Community Engineering] Community Contributions - 2.3-develop-expedited-prs

magento-engcom-team · web-flow · commit d9193aaa8b89 · 2019-10-04T01:02:13.000+03:00
- merged with '2.3-develop-prs' branch
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
@@ -216,6 +216,7 @@ public function export()
             if ($entityCollection->count() == 0) {
                 break;
             }
+            $entityCollection->clear();
             $exportData = $this->getExportData();
             foreach ($exportData as $dataRow) {
                 $writer->writeRow($dataRow);
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php
@@ -1,12 +1,19 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Multishipping\Controller\Checkout\Address;
 
-class NewShipping extends \Magento\Multishipping\Controller\Checkout\Address
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Multishipping\Controller\Checkout\Address;
+
+/**
+ * Class NewShipping
+ *
+ * @package Address
+ */
+class NewShipping extends Address implements HttpGetActionInterface
 {
     /**
      * Create New Shipping address Form
@@ -35,7 +42,7 @@ public function execute()
             if ($this->_getCheckout()->getCustomerDefaultShippingAddress()) {
                 $addressForm->setBackUrl($this->_url->getUrl('*/checkout/addresses'));
             } else {
-                $addressForm->setBackUrl($this->_url->getUrl('*/cart/'));
+                $addressForm->setBackUrl($this->_url->getUrl('checkout/cart/'));
             }
         }
         $this->_view->renderLayout();
diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewShippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewShippingTest.php
@@ -170,7 +170,7 @@ public function executeDataProvider()
     {
         return [
             'shipping_address_exists' => ['*/checkout/addresses', 'shipping_address', 'back/address'],
-            'shipping_address_not_exist' => ['*/cart/', null, 'back/cart']
+            'shipping_address_not_exist' => ['checkout/cart/', null, 'back/cart']
         ];
     }
 
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Newsletter/Test/Mftf/Data/AdminMenuData.xml
@@ -19,8 +19,8 @@
         <data key="dataUiId">magento-newsletter-newsletter-subscriber</data>
     </entity>
     <entity name="AdminMenuMarketingCommunicationsNewsletterTemplate">
-        <data key="pageTitle">Newsletter Template</data>
-        <data key="title">Newsletter Template</data>
+        <data key="pageTitle">Newsletter Templates</data>
+        <data key="title">Newsletter Templates</data>
         <data key="dataUiId">magento-newsletter-newsletter-template</data>
     </entity>
     <entity name="AdminMenuReportsMarketingNewsletterProblemReports">
diff --git a/app/code/Magento/Newsletter/etc/adminhtml/menu.xml b/app/code/Magento/Newsletter/etc/adminhtml/menu.xml
@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
-        <add id="Magento_Newsletter::newsletter_template" title="Newsletter Template" translate="title" module="Magento_Newsletter" parent="Magento_Backend::marketing_communications" sortOrder="30" action="newsletter/template/" resource="Magento_Newsletter::template"/>
+        <add id="Magento_Newsletter::newsletter_template" title="Newsletter Templates" translate="title" module="Magento_Newsletter" parent="Magento_Backend::marketing_communications" sortOrder="30" action="newsletter/template/" resource="Magento_Newsletter::template"/>
         <add id="Magento_Newsletter::newsletter_queue" title="Newsletter Queue" translate="title" module="Magento_Newsletter" sortOrder="40" parent="Magento_Backend::marketing_communications" action="newsletter/queue/" resource="Magento_Newsletter::queue"/>
         <add id="Magento_Newsletter::newsletter_subscriber" title="Newsletter Subscribers" translate="title" module="Magento_Newsletter" sortOrder="50" parent="Magento_Backend::marketing_communications" action="newsletter/subscriber/" resource="Magento_Newsletter::subscriber"/>
         <add id="Magento_Newsletter::newsletter_problem" title="Newsletter Problem Reports" translate="title" module="Magento_Newsletter" sortOrder="50" parent="Magento_Reports::report_marketing" action="newsletter/problem/" resource="Magento_Newsletter::problem"/>

Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,7 @@ public function export()`
`216`	`216`	`if ($entityCollection->count() == 0) {`
`217`	`217`	`break;`
`218`	`218`	`}`
	`219`	`+ $entityCollection->clear();`
`219`	`220`	`$exportData = $this->getExportData();`
`220`	`221`	`foreach ($exportData as $dataRow) {`
`221`	`222`	`$writer->writeRow($dataRow);`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ public function executeDataProvider()`
`170`	`170`	`{`
`171`	`171`	`return [`
`172`	`172`	`'shipping_address_exists' => ['*/checkout/addresses', 'shipping_address', 'back/address'],`
`173`		`- 'shipping_address_not_exist' => ['*/cart/', null, 'back/cart']`
	`173`	`+ 'shipping_address_not_exist' => ['checkout/cart/', null, 'back/cart']`
`174`	`174`	`];`
`175`	`175`	`}`
`176`	`176`