Skip to content

Commit 5621eee

Browse files
author
Stanislav Idolov
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - magento/graphql-ce#114: Mutations Prototype (POC) #74 (by @paliarush) - #16699: Declare module namespace before template path in Magento_Theme, Magento_Newsletter and Magento_Tax (by @mageprince) - #16701: Declare module namespace before template path in all other modules (by @mageprince) - #16698: Declare module namespace before template path in Magento_Sales and Magento_Paypal (by @mageprince) - #16687: [Forwardport] Corrected function comment (by @sanganinamrata) - #16663: [Forwardport] Fixed Issue #11354 Merged CSS file name generation (by @mageprince) - #16588: [Forwardport] Fix of invalid price for integer currencies when amount less than group size (by @vkublytskyi) - #16562: [Forwardport] Coupon API not working for guest user (by @gelanivishal) - #16630: [Forwardport] Small refactoring to better code readability (by @ronak2ram) - #16613: Update Israeli ZIP code mask, 7 digits instead of 5 ,according to the� (by @gelanivishal) - #16569: Make it possible to disable cross-sell on cart page (by @arnoudhgz) - #16487: [Forwardport] Prevent layout cache corruption in edge case (by @gelanivishal) Fixed GitHub Issues: - #11354: Merged CSS file name generation (reported by @pmoreno1980) has been fixed in #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 - #11717: Wrong price amount on product page (reported by @HirokazuNishi) has been fixed in #16588 by @vkublytskyi in 2.3-develop branch Related commits: 1. e2c4aca - #14056: Coupon API not working for guest user (reported by @gnanasekaranl) has been fixed in #16562 by @gelanivishal in 2.3-develop branch Related commits: 1. 1acd06f 2. 2651be3
2 parents 6b7a9b3 + bfaac1f commit 5621eee

File tree

94 files changed

+212
-91
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+212
-91
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ abstract class SearchData extends Template implements SearchDataInterface
3030
/**
3131
* @var string
3232
*/
33-
protected $_template = 'search_data.phtml';
33+
protected $_template = 'Magento_AdvancedSearch::search_data.phtml';
3434

3535
/**
3636
* @param Template\Context $context

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,18 @@ protected function _toHtml()
124124
if (!$this->_depends) {
125125
return '';
126126
}
127-
return '<script>
128-
require(["mage/adminhtml/form"], function(){
129-
new FormElementDependenceController(' .
130-
$this->_getDependsJson() .
131-
($this->_configOptions ? ', ' .
132-
$this->_jsonEncoder->encode(
133-
$this->_configOptions
134-
) : '') . '); });</script>';
127+
128+
$params = $this->_getDependsJson();
129+
130+
if ($this->_configOptions) {
131+
$params .= ', ' . $this->_jsonEncoder->encode($this->_configOptions);
132+
}
133+
134+
return "<script>
135+
require(['mage/adminhtml/form'], function(){
136+
new FormElementDependenceController({$params});
137+
});
138+
</script>";
135139
}
136140

137141
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ class Attribute extends \Magento\Backend\Block\Template
1414
/**
1515
* @var string
1616
*/
17-
protected $_template = 'catalog/product/attribute/set/main/tree/attribute.phtml';
17+
protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main/tree/attribute.phtml';
1818
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
<field id="number_items_to_display_pager" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
4242
<label>Number of Items to Display Pager</label>
4343
</field>
44+
<field id="crosssell_enabled" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
45+
<label>Show Cross-sell Items in the Shopping Cart</label>
46+
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
47+
</field>
4448
</group>
4549
<group id="cart_link" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0">
4650
<label>My Cart Link</label>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<delete_quote_after>30</delete_quote_after>
1818
<redirect_to_cart>0</redirect_to_cart>
1919
<number_items_to_display_pager>20</number_items_to_display_pager>
20+
<crosssell_enabled>1</crosssell_enabled>
2021
</cart>
2122
<cart_link>
2223
<use_qty>1</use_qty>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,3 +181,4 @@ Payment,Payment
181181
"Item in Cart","Item in Cart"
182182
"Items in Cart","Items in Cart"
183183
"Close","Close"
184+
"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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
</block>
187187
<container name="checkout.cart.widget" as="checkout_cart_widget" label="Shopping Cart Items After"/>
188188
</container>
189-
<block class="Magento\Checkout\Block\Cart\Crosssell" name="checkout.cart.crosssell" template="Magento_Catalog::product/list/items.phtml" after="-">
189+
<block class="Magento\Checkout\Block\Cart\Crosssell" name="checkout.cart.crosssell" template="Magento_Catalog::product/list/items.phtml" after="-" ifconfig="checkout/cart/crosssell_enabled">
190190
<arguments>
191191
<argument name="type" xsi:type="string">crosssell</argument>
192192
</arguments>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<system>
1010
<section id="checkout">
1111
<group id="cart">
12-
<field id="configurable_product_image" translate="label" type="select" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
12+
<field id="configurable_product_image" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
1313
<label>Configurable Product Image</label>
1414
<source_model>Magento\Catalog\Model\Config\Source\Product\Thumbnail</source_model>
1515
</field>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
</zip>
197197
<zip countryCode="IL">
198198
<codes>
199-
<code id="pattern_1" active="true" example="12345">^[0-9]{5}$</code>
199+
<code id="pattern_1" active="true" example="6687865">^[0-9]{7}$</code>
200200
</codes>
201201
</zip>
202202
<zip countryCode="IT">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Js extends \Magento\Backend\Block\Template
1818
* @var string
1919
*/
2020

21-
protected $_template = 'attribute/edit/js.phtml';
21+
protected $_template = 'Magento_Eav::attribute/edit/js.phtml';
2222

2323
/**
2424
* @var \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype

0 commit comments

Comments
 (0)