🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - magento/graphql-ce#114: Mutations Prototype (POC) #74 (by @paliarush)
 - magento/magento2#16699: Declare module namespace before template path in Magento_Theme,  Magento_Newsletter and Magento_Tax (by @mageprince)
 - magento/magento2#16701: Declare module namespace before template path in all other modules (by @mageprince)
 - magento/magento2#16698: Declare module namespace before template path in Magento_Sales and Magento_Paypal (by @mageprince)
 - magento/magento2#16687: [Forwardport] Corrected function comment (by @sanganinamrata)
 - magento/magento2#16663: [Forwardport] Fixed Issue #11354 Merged CSS file name generation (by @mageprince)
 - magento/magento2#16588: [Forwardport] Fix of invalid price for integer currencies when amount less than group size (by @vkublytskyi)
 - magento/magento2#16562: [Forwardport] Coupon API not working for guest user (by @gelanivishal)
 - magento/magento2#16630: [Forwardport] Small refactoring to better code readability (by @ronak2ram)
 - magento/magento2#16613: Update Israeli ZIP code mask, 7 digits instead of 5 ,according to the� (by @gelanivishal)
 - magento/magento2#16569: Make it possible to disable cross-sell on cart page (by @arnoudhgz)
 - magento/magento2#16487: [Forwardport] Prevent layout cache corruption in edge case (by @gelanivishal)


Fixed GitHub Issues:
 - magento/magento2#11354: Merged CSS file name generation (reported by @pmoreno1980) has been fixed in magento/magento2#16663 by @mageprince in 2.3-develop branch
   Related commits:
     1. 2816764
     2. 2d31c1d
     3. e7677e8
     4. ca3c79c
     5. 311f8ca
     6. 1782c54
     7. 94e0e25
     8. 831e58c
     9. 742ad8c

 - magento/magento2#11717: Wrong price amount on product page (reported by @HirokazuNishi) has been fixed in magento/magento2#16588 by @vkublytskyi in 2.3-develop branch
   Related commits:
     1. e2c4aca

 - magento/magento2#14056: Coupon API not working for guest user (reported by @gnanasekaranl) has been fixed in magento/magento2#16562 by @gelanivishal in 2.3-develop branch
   Related commits:
     1. 1acd06f
     2. 2651be3

Author: Stanislav Idolov

app/code/Magento/AdvancedSearch/Block/SearchData.php

@@ -30,7 +30,7 @@ abstract class SearchData extends Template implements SearchDataInterface
     /**
      * @var string
      */
-    protected $_template = 'search_data.phtml';
+    protected $_template = 'Magento_AdvancedSearch::search_data.phtml';
 
     /**
      * @param Template\Context $context

app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php

@@ -124,14 +124,18 @@ protected function _toHtml()
         if (!$this->_depends) {
             return '';
         }
-        return '<script>
-            require(["mage/adminhtml/form"], function(){
-        new FormElementDependenceController(' .
-            $this->_getDependsJson() .
-            ($this->_configOptions ? ', ' .
-            $this->_jsonEncoder->encode(
-                $this->_configOptions
-            ) : '') . '); });</script>';
+
+        $params = $this->_getDependsJson();
+
+        if ($this->_configOptions) {
+            $params .= ', ' .  $this->_jsonEncoder->encode($this->_configOptions);
+        }
+
+        return "<script>
+require(['mage/adminhtml/form'], function(){
+    new FormElementDependenceController({$params});
+});
+</script>";
     }
 
     /**

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php

@@ -14,5 +14,5 @@ class Attribute extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/attribute/set/main/tree/attribute.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main/tree/attribute.phtml';
 }

app/code/Magento/Checkout/etc/adminhtml/system.xml

@@ -41,6 +41,10 @@
                 <field id="number_items_to_display_pager" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Number of Items to Display Pager</label>
                 </field>
+                <field id="crosssell_enabled" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Show Cross-sell Items in the Shopping Cart</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
             </group>
             <group id="cart_link" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>My Cart Link</label>

app/code/Magento/Checkout/etc/config.xml

@@ -17,6 +17,7 @@
                 <delete_quote_after>30</delete_quote_after>
                 <redirect_to_cart>0</redirect_to_cart>
                 <number_items_to_display_pager>20</number_items_to_display_pager>
+                <crosssell_enabled>1</crosssell_enabled>
             </cart>
             <cart_link>
                 <use_qty>1</use_qty>

app/code/Magento/Checkout/i18n/en_US.csv

@@ -181,3 +181,4 @@ Payment,Payment
 "Item in Cart","Item in Cart"
 "Items in Cart","Items in Cart"
 "Close","Close"
+"Show Cross-sell Items in the Shopping Cart","Show Cross-sell Items in the Shopping Cart"

app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml

@@ -186,7 +186,7 @@
                         </block>
                         <container name="checkout.cart.widget" as="checkout_cart_widget" label="Shopping Cart Items After"/>
                     </container>
-                    <block class="Magento\Checkout\Block\Cart\Crosssell" name="checkout.cart.crosssell" template="Magento_Catalog::product/list/items.phtml" after="-">
+                    <block class="Magento\Checkout\Block\Cart\Crosssell" name="checkout.cart.crosssell" template="Magento_Catalog::product/list/items.phtml" after="-" ifconfig="checkout/cart/crosssell_enabled">
                         <arguments>
                             <argument name="type" xsi:type="string">crosssell</argument>
                         </arguments>

app/code/Magento/ConfigurableProduct/etc/adminhtml/system.xml

@@ -9,7 +9,7 @@
     <system>
         <section id="checkout">
             <group id="cart">
-                <field id="configurable_product_image" translate="label" type="select" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="configurable_product_image" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Configurable Product Image</label>
                     <source_model>Magento\Catalog\Model\Config\Source\Product\Thumbnail</source_model>
                 </field>

app/code/Magento/Directory/etc/zip_codes.xml

@@ -196,7 +196,7 @@
     </zip>
     <zip countryCode="IL">
         <codes>
-            <code id="pattern_1" active="true" example="12345">^[0-9]{5}$</code>
+            <code id="pattern_1" active="true" example="6687865">^[0-9]{7}$</code>
         </codes>
     </zip>
     <zip countryCode="IT">

app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php

@@ -18,7 +18,7 @@ class Js extends \Magento\Backend\Block\Template
      * @var string
      */
 
-    protected $_template = 'attribute/edit/js.phtml';
+    protected $_template = 'Magento_Eav::attribute/edit/js.phtml';
 
     /**
      * @var \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype