Skip to content

Commit 028156d

Browse files
author
Magento CICD
authored
merge magento/2.3-develop into magento-earl-grey/MAGETWO-92929
2 parents 86df69f + ce5eacd commit 028156d

File tree

108 files changed

+681
-96
lines changed

Some content is hidden

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

108 files changed

+681
-96
lines changed

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

+1-1
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

+12-8
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/Backend/Test/Mftf/Section/AdminMessagesSection.xml

+1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
<section name="AdminMessagesSection">
1212
<element name="success" type="text" selector="#messages div.message-success"/>
1313
<element name="nthSuccess" type="text" selector=".message.message-success.success:nth-of-type({{n}})>div" parameterized="true"/>
14+
<element name="error" type="text" selector="#messages div.message-error"/>
1415
</section>
1516
</sections>

‎app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml

+7-2
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,16 @@
7575
<seeElement stepKey="LookingForNameOfProduct" selector="{{BundleStorefrontSection.bundleProductName}}"/>
7676

7777
<!--Testing disabled view-->
78-
<actionGroup ref="FindProductToEdit" stepKey="FindProductEditPage"/>
78+
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="GoToProductCatalog"/>
79+
<waitForPageLoad stepKey="WaitForCatalogProductPageToLoad"/>
80+
<actionGroup ref="filterProductGridBySku" stepKey="FindProductEditPage">
81+
<argument name="product" value="BundleProduct"/>
82+
</actionGroup>
83+
<click selector="{{AdminDataGridTableSection.rowViewAction('1')}}" stepKey="ClickProductInGrid"/>
7984
<click stepKey="ClickOnEnableDisableToggle" selector="{{AdminProductFormBundleSection.enableDisableToggle}}"/>
8085
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAgain"/>
81-
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown2"/>
8286
<waitForPageLoad stepKey="PauseForSave"/>
87+
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
8388
<amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="GoToProductPageAgain"/>
8489
<waitForPageLoad stepKey="WaitForProductPageToLoadToShowElement"/>
8590
<dontSeeElement stepKey="LookingForNameOfProductTwo" selector="{{BundleStorefrontSection.bundleProductName}}"/>

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

+1-1
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/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
<!--Create Store view -->
3636
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
37+
<waitForElementVisible selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="waitForStoreViewBtn"/>
3738
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
3839
<waitForPageLoad stepKey="waitForProductPageLoad"/>
3940
<selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>

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

+4
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

+1
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

+1
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

+1-1
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/Config/Test/Mftf/ActionGroup/ConfigSalesTaxClassActionGroup.xml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="SetTaxClassForShipping">
12+
<amOnPage url="{{AdminSalesTaxClassPage.url}}" stepKey="navigateToSalesTaxPage"/>
13+
<waitForPageLoad stepKey="waitForPageLoad"/>
14+
<conditionalClick selector="{{SalesConfigSection.TaxClassesTab}}" dependentSelector="{{SalesConfigSection.CheckIfTaxClassesTabExpand}}" visible="true" stepKey="expandTaxClassesTab"/>
15+
<waitForElementVisible selector="{{SalesConfigSection.ShippingTaxClass}}" stepKey="seeShippingTaxClass"/>
16+
<uncheckOption selector="{{SalesConfigSection.EnableTaxClassForShipping}}" stepKey="uncheckUseSystemValue"/>
17+
<selectOption selector="{{SalesConfigSection.ShippingTaxClass}}" userInput="Taxable Goods" stepKey="setShippingTaxClass"/>
18+
<click selector="{{SalesConfigSection.TaxClassesTab}}" stepKey="collapseTaxClassesTab"/>
19+
<click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
20+
</actionGroup>
21+
<actionGroup name="ResetTaxClassForShipping">
22+
<amOnPage url="{{AdminSalesTaxClassPage.url}}" stepKey="navigateToSalesTaxConfigPagetoReset"/>
23+
<waitForPageLoad stepKey="waitForPageLoad2"/>
24+
<conditionalClick selector="{{SalesConfigSection.TaxClassesTab}}" dependentSelector="{{SalesConfigSection.CheckIfTaxClassesTabExpand}}" visible="true" stepKey="openTaxClassTab"/>
25+
<waitForElementVisible selector="{{SalesConfigSection.ShippingTaxClass}}" stepKey="seeShippingTaxClass2"/>
26+
<selectOption selector="{{SalesConfigSection.ShippingTaxClass}}" userInput="None" stepKey="resetShippingTaxClass"/>
27+
<checkOption selector="{{SalesConfigSection.EnableTaxClassForShipping}}" stepKey="useSystemValue"/>
28+
<click selector="{{SalesConfigSection.TaxClassesTab}}" stepKey="collapseTaxClassesTab"/>
29+
<click selector="{{ContentManagementSection.Save}}" stepKey="saveConfiguration"/>
30+
</actionGroup>
31+
</actionGroups>

‎app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml

+3
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@
1212
<page name="AdminContentManagementPage" url="admin/system_config/edit/section/cms/" area="admin" module="Magento_Config">
1313
<section name="ContentManagementSection"/>
1414
</page>
15+
<page name="AdminSalesTaxClassPage" url="admin/system_config/edit/section/tax/" area="admin" module="Magento_Config">
16+
<section name="SalesTaxClassSection"/>
17+
</page>
1518
</pages>

‎app/code/Magento/Config/Test/Mftf/Section/SalesConfigSection.xml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
11+
<section name="SalesConfigSection">
12+
<element name="TaxClassesTab" type="button" selector="#tax_classes-head"/>
13+
<element name="CheckIfTaxClassesTabExpand" type="button" selector="#tax_classes-head:not(.open)"/>
14+
<element name="ShippingTaxClass" type="select" selector="#tax_classes_shipping_tax_class"/>
15+
<element name="EnableTaxClassForShipping" type="checkbox" selector="#tax_classes_shipping_tax_class_inherit"/>
16+
</section>
17+
</sections>

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

+1-1
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

+1-1
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

+1-1
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

‎app/code/Magento/GraphQl/etc/schema.graphqls

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
type Query {
55
}
66

7+
type Mutation {
8+
placeholderMutation: String @doc(description: "Mutation type cannot be declared without fields. The placeholder will be removed when at least one mutation field is declared.")
9+
}
10+
711
input FilterTypeInput @doc(description: "FilterTypeInput specifies which action will be performed in a query ") {
812
eq: String @doc(description: "Equals")
913
finset: [String] @doc(description: "Find in set. The value can contain a set of comma-separated values")
@@ -30,4 +34,4 @@ type SearchResultPageInfo @doc(description: "SearchResultPageInfo provides navig
3034
enum SortEnum @doc(description: "This enumeration indicates whether to return results in ascending or descending order") {
3135
ASC
3236
DESC
33-
}
37+
}

‎app/code/Magento/GroupedProduct/etc/adminhtml/system.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<system>
1010
<section id="checkout" translate="label" type="text" sortOrder="305" showInDefault="1" showInWebsite="1" showInStore="1">
1111
<group id="cart" translate="label" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
12-
<field id="grouped_product_image" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
12+
<field id="grouped_product_image" translate="label" type="select" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
1313
<label>Grouped Product Image</label>
1414
<source_model>Magento\Catalog\Model\Config\Source\Product\Thumbnail</source_model>
1515
</field>

‎app/code/Magento/Newsletter/Block/Adminhtml/Problem.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Problem extends \Magento\Backend\Block\Template
1919
/**
2020
* @var string
2121
*/
22-
protected $_template = 'problem/list.phtml';
22+
protected $_template = 'Magento_Newsletter::problem/list.phtml';
2323

2424
/**
2525
* @var \Magento\Newsletter\Model\ResourceModel\Problem\Collection

‎app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Edit extends \Magento\Backend\Block\Template
1919
/**
2020
* @var string
2121
*/
22-
protected $_template = 'queue/edit.phtml';
22+
protected $_template = 'Magento_Newsletter::queue/edit.phtml';
2323

2424
/**
2525
* Core registry

‎app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Subscriber extends \Magento\Backend\Block\Template
2929
/**
3030
* @var string
3131
*/
32-
protected $_template = 'subscriber/list.phtml';
32+
protected $_template = 'Magento_Newsletter::subscriber/list.phtml';
3333

3434
/**
3535
* @var \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory

‎app/code/Magento/Newsletter/Block/Adminhtml/Template.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Template extends \Magento\Backend\Block\Template
1616
/**
1717
* @var string
1818
*/
19-
protected $_template = 'template/list.phtml';
19+
protected $_template = 'Magento_Newsletter::template/list.phtml';
2020

2121
/**
2222
* @return $this

‎app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ class Banktransfer extends \Magento\OfflinePayments\Block\Form\AbstractInstructi
1515
*
1616
* @var string
1717
*/
18-
protected $_template = 'form/banktransfer.phtml';
18+
protected $_template = 'Magento_OfflinePayments::form/banktransfer.phtml';
1919
}

‎app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ class Cashondelivery extends \Magento\OfflinePayments\Block\Form\AbstractInstruc
1515
*
1616
* @var string
1717
*/
18-
protected $_template = 'form/cashondelivery.phtml';
18+
protected $_template = 'Magento_OfflinePayments::form/cashondelivery.phtml';
1919
}

‎app/code/Magento/Payment/Block/Info/Instructions.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Instructions extends \Magento\Payment\Block\Info
2323
/**
2424
* @var string
2525
*/
26-
protected $_template = 'info/instructions.phtml';
26+
protected $_template = 'Magento_Payment::info/instructions.phtml';
2727

2828
/**
2929
* Get instructions text from order payment

‎app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Form.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ class Form extends \Magento\Backend\Block\Template
1313
/**
1414
* @var string
1515
*/
16-
protected $_template = 'billing/agreement/view/form.phtml';
16+
protected $_template = 'Magento_Paypal::billing/agreement/view/form.phtml';
1717
}

‎app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Info extends \Magento\Backend\Block\Template implements \Magento\Backend\B
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'billing/agreement/view/tab/info.phtml';
18+
protected $_template = 'Magento_Paypal::billing/agreement/view/tab/info.phtml';
1919

2020
/**
2121
* Core registry

‎app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ class Advanced extends \Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink
1616
*
1717
* @var string
1818
*/
19-
protected $_template = 'system/config/payflowlink/advanced.phtml';
19+
protected $_template = 'Magento_Paypal::system/config/payflowlink/advanced.phtml';
2020
}

‎app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Info extends \Magento\Config\Block\System\Config\Form\Field
1616
*
1717
* @var string
1818
*/
19-
protected $_template = 'system/config/payflowlink/info.phtml';
19+
protected $_template = 'Magento_Paypal::system/config/payflowlink/info.phtml';
2020

2121
/**
2222
* Render fieldset html

‎app/code/Magento/Paypal/Block/Hosted/Pro/Form.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ class Form extends \Magento\Payment\Block\Form
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'hss/info.phtml';
18+
protected $_template = 'Magento_Paypal::hss/info.phtml';
1919
}

‎app/code/Magento/Paypal/Block/Iframe.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class Iframe extends \Magento\Payment\Block\Form
4444
/**
4545
* @var string
4646
*/
47-
protected $_template = 'hss/js.phtml';
47+
protected $_template = 'Magento_Paypal::hss/js.phtml';
4848

4949
/**
5050
* @var \Magento\Sales\Model\OrderFactory

‎app/code/Magento/Paypal/Block/Payflow/Advanced/Form.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Form extends \Magento\Paypal\Block\Payflow\Link\Form
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'payflowadvanced/info.phtml';
18+
protected $_template = 'Magento_Paypal::payflowadvanced/info.phtml';
1919

2020
/**
2121
* Get frame action URL

‎app/code/Magento/Paypal/Block/Payflow/Link/Form.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Form extends \Magento\Payment\Block\Form
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'payflowlink/info.phtml';
18+
protected $_template = 'Magento_Paypal::payflowlink/info.phtml';
1919

2020
/**
2121
* Get frame action URL

‎app/code/Magento/ProductAlert/Block/Email/Price.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Price extends \Magento\ProductAlert\Block\Email\AbstractEmail
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'email/price.phtml';
18+
protected $_template = 'Magento_ProductAlert::email/price.phtml';
1919

2020
/**
2121
* Retrieve unsubscribe url for product

‎app/code/Magento/ProductAlert/Block/Email/Stock.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Stock extends \Magento\ProductAlert\Block\Email\AbstractEmail
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'email/stock.phtml';
18+
protected $_template = 'Magento_ProductAlert::email/stock.phtml';
1919

2020
/**
2121
* Retrieve unsubscribe url for product

‎app/code/Magento/Quote/Model/CouponManagement.php

+3
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ public function set($cartId, $couponCode)
5555
if (!$quote->getItemsCount()) {
5656
throw new NoSuchEntityException(__('The "%1" Cart doesn\'t contain products.', $cartId));
5757
}
58+
if (!$quote->getStoreId()) {
59+
throw new NoSuchEntityException(__('Cart isn\'t assigned to correct store'));
60+
}
5861
$quote->getShippingAddress()->setCollectShippingRates(true);
5962

6063
try {

0 commit comments

Comments
 (0)