🔃 [EngCom] Public Pull Requests - 2.2-develop

magento-engcom-team · web-flow · commit fb8ea463545b · 2018-03-28T09:42:45.000+03:00
Accepted Public Pull Requests: - #14325: #7816: Customer_account.xml file abused (2.2) (by @mikewhitby) - #14299: [#14072 2.2] Add Zip Pattern for Japan JP (by @osrecio) - #14060: Disable add to cart button when redirect to cart enabled (by @ihor-sviziev) Fixed GitHub Issues: - #7816: Customer_account.xml file abused (reported by @LiamFielding) has been fixed in #14325 by @mikewhitby in 2.2-develop branch Related commits: 1. 56b3598 2. 09f8059 - #14072: Change zip code validation pattern for Japan (reported by @HirokazuNishi) has been fixed in #14299 by @osrecio in 2.2-develop branch Related commits: 1. 6b6ce0a 2. af6bbfd
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
@@ -40,22 +40,10 @@
     </div>
 </div>
 <?php endif; ?>
-<?php if ($block->isRedirectToCartEnabled()) : ?>
-<script type="text/x-magento-init">
-    {
-        "#product_addtocart_form": {
-            "Magento_Catalog/product/view/validation": {
-                "radioCheckboxClosest": ".nested"
-            }
-        }
-    }
-</script>
-<?php else : ?>
 <script type="text/x-magento-init">
     {
         "#product_addtocart_form": {
             "Magento_Catalog/js/validate-product": {}
         }
     }
 </script>
-<?php endif; ?>
diff --git a/app/code/Magento/Customer/Controller/Account/Index.php b/app/code/Magento/Customer/Controller/Account/Index.php
@@ -35,9 +35,6 @@ public function __construct(
      */
     public function execute()
     {
-        /** @var \Magento\Framework\View\Result\Page $resultPage */
-        $resultPage = $this->resultPageFactory->create();
-        $resultPage->getConfig()->getTitle()->set(__('My Account'));
-        return $resultPage;
+        return $this->resultPageFactory->create();
     }
 }
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
@@ -6,6 +6,9 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd" label="Customer My Account (All Pages)" design_abstraction="custom">
+    <head>
+        <title>My Account</title>
+    </head>
     <body>
         <attribute name="class" value="account"/>
         <referenceContainer name="sidebar.main">
diff --git a/app/code/Magento/Directory/etc/zip_codes.xml b/app/code/Magento/Directory/etc/zip_codes.xml
@@ -207,7 +207,7 @@
     <zip countryCode="JP">
         <codes>
             <code id="pattern_1" active="true" example="123-4567">^[0-9]{3}-[0-9]{4}$</code>
-            <code id="pattern_2" active="true" example="123">^[0-9]{3}$</code>
+            <code id="pattern_2" active="true" example="1234567">^[0-9]{7}$</code>
         </codes>
     </zip>
     <zip countryCode="JE">
diff --git a/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml b/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml
@@ -6,9 +6,6 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-        <title>Billing Agreements</title>
-    </head>
     <body>
         <referenceBlock name="customer_account_navigation">
             <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-billing-agreements-link">
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php
@@ -133,7 +133,7 @@ public function getPostcodesDataProvider()
             ['countryId' => 'IL', 'postcode' => '12345'],
             ['countryId' => 'IT', 'postcode' => '12345'],
             ['countryId' => 'JP', 'postcode' => '123-4567'],
-            ['countryId' => 'JP', 'postcode' => '123'],
+            ['countryId' => 'JP', 'postcode' => '1234567'],
             ['countryId' => 'JE', 'postcode' => 'TY8 9PL'],
             ['countryId' => 'KZ', 'postcode' => '123456'],
             ['countryId' => 'KE', 'postcode' => '12345'],

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,6 @@ public function __construct(`
`35`	`35`	`*/`
`36`	`36`	`public function execute()`
`37`	`37`	`{`
`38`		`- /** @var \Magento\Framework\View\Result\Page $resultPage */`
`39`		`- $resultPage = $this->resultPageFactory->create();`
`40`		`- $resultPage->getConfig()->getTitle()->set(__('My Account'));`
`41`		`- return $resultPage;`
	`38`	`+ return $this->resultPageFactory->create();`
`42`	`39`	`}`
`43`	`40`	`}`