diff --git a/app/code/Magento/Email/Model/Source/Variables.php b/app/code/Magento/Email/Model/Source/Variables.php
index 65296fea60c02..b7cb1dfb2aead 100644
--- a/app/code/Magento/Email/Model/Source/Variables.php
+++ b/app/code/Magento/Email/Model/Source/Variables.php
@@ -49,6 +49,7 @@ public function __construct()
['value' => 'general/store_information/city', 'label' => __('City')],
['value' => 'general/store_information/street_line1', 'label' => __('Street Address 1')],
['value' => 'general/store_information/street_line2', 'label' => __('Street Address 2')],
+ ['value' => 'general/store_information/merchant_vat_number', 'label' => __('VAT Number')],
];
}
diff --git a/app/code/Magento/Email/Test/Unit/Model/Source/VariablesTest.php b/app/code/Magento/Email/Test/Unit/Model/Source/VariablesTest.php
index 0406c399cf57a..225b63da7ce81 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Source/VariablesTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Source/VariablesTest.php
@@ -53,6 +53,7 @@ protected function setup()
['value' => 'general/store_information/city', 'label' => __('City')],
['value' => 'general/store_information/street_line1', 'label' => __('Street Address 1')],
['value' => 'general/store_information/street_line2', 'label' => __('Street Address 2')],
+ ['value' => 'general/store_information/merchant_vat_number', 'label' => __('VAT Number')],
];
}
diff --git a/app/code/Magento/Email/i18n/en_US.csv b/app/code/Magento/Email/i18n/en_US.csv
index 58a26aa31cd66..23d86c1fefd11 100644
--- a/app/code/Magento/Email/i18n/en_US.csv
+++ b/app/code/Magento/Email/i18n/en_US.csv
@@ -54,6 +54,7 @@ Region/State,Region/State
City,City
"Street Address 1","Street Address 1"
"Street Address 2","Street Address 2"
+"VAT Number","VAT Number"
"Store Contact Information","Store Contact Information"
%1,%1
"Template Variables","Template Variables"
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
index 3bf69ca8aae8f..3b865fb21799f 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
@@ -206,7 +206,7 @@ public function getForm()
}
/**
- * Return return template name for JS
+ * Return template name for JS
*
* @return string
*/
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index a76700bded466..7125d5ff687d3 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -417,7 +417,6 @@ public function subscribe($email)
self::XML_PATH_CONFIRMATION_FLAG,
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
) == 1 ? true : false;
- $isOwnSubscribes = false;
$isSubscribeOwnEmail = $this->_customerSession->isLoggedIn()
&& $this->_customerSession->getCustomerDataObject()->getEmail() == $email;
@@ -426,13 +425,7 @@ public function subscribe($email)
|| $this->getStatus() == self::STATUS_NOT_ACTIVE
) {
if ($isConfirmNeed === true) {
- // if user subscribes own login email - confirmation is not needed
- $isOwnSubscribes = $isSubscribeOwnEmail;
- if ($isOwnSubscribes == true) {
- $this->setStatus(self::STATUS_SUBSCRIBED);
- } else {
- $this->setStatus(self::STATUS_NOT_ACTIVE);
- }
+ $this->setStatus(self::STATUS_NOT_ACTIVE);
} else {
$this->setStatus(self::STATUS_SUBSCRIBED);
}
@@ -458,9 +451,7 @@ public function subscribe($email)
try {
/* Save model before sending out email */
$this->save();
- if ($isConfirmNeed === true
- && $isOwnSubscribes === false
- ) {
+ if ($isConfirmNeed === true) {
$this->sendConfirmationRequestEmail();
} else {
$this->sendConfirmationSuccessEmail();
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
index de8030a8709a3..93623ff02589e 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
@@ -5,6 +5,8 @@
*/
namespace Magento\Newsletter\Test\Unit\Model;
+use Magento\Newsletter\Model\Subscriber;
+
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
@@ -134,7 +136,7 @@ public function testSubscribe()
$email = 'subscriber_email@magento.com';
$this->resource->expects($this->any())->method('loadByEmail')->willReturn(
[
- 'subscriber_status' => 3,
+ 'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
'subscriber_email' => $email,
'name' => 'subscriber_name'
]
@@ -151,7 +153,7 @@ public function testSubscribe()
$this->sendEmailCheck();
$this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
- $this->assertEquals(1, $this->subscriber->subscribe($email));
+ $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->subscribe($email));
}
public function testSubscribeNotLoggedIn()
@@ -159,7 +161,7 @@ public function testSubscribeNotLoggedIn()
$email = 'subscriber_email@magento.com';
$this->resource->expects($this->any())->method('loadByEmail')->willReturn(
[
- 'subscriber_status' => 3,
+ 'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
'subscriber_email' => $email,
'name' => 'subscriber_name'
]
@@ -176,7 +178,7 @@ public function testSubscribeNotLoggedIn()
$this->sendEmailCheck();
$this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
- $this->assertEquals(2, $this->subscriber->subscribe($email));
+ $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->subscribe($email));
}
public function testUpdateSubscription()
@@ -193,7 +195,7 @@ public function testUpdateSubscription()
->willReturn(
[
'subscriber_id' => 1,
- 'subscriber_status' => 1
+ 'subscriber_status' => Subscriber::STATUS_SUBSCRIBED
]
);
$customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -228,7 +230,7 @@ public function testUnsubscribeCustomerById()
->willReturn(
[
'subscriber_id' => 1,
- 'subscriber_status' => 1
+ 'subscriber_status' => Subscriber::STATUS_SUBSCRIBED
]
);
$customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -254,7 +256,7 @@ public function testSubscribeCustomerById()
->willReturn(
[
'subscriber_id' => 1,
- 'subscriber_status' => 3
+ 'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED
]
);
$customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -280,7 +282,7 @@ public function testSubscribeCustomerById1()
->willReturn(
[
'subscriber_id' => 1,
- 'subscriber_status' => 3
+ 'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED
]
);
$customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -294,7 +296,7 @@ public function testSubscribeCustomerById1()
$this->scopeConfig->expects($this->atLeastOnce())->method('getValue')->with()->willReturn(true);
$this->subscriber->subscribeCustomerById($customerId);
- $this->assertEquals(\Magento\Newsletter\Model\Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->getStatus());
+ $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->getStatus());
}
public function testSubscribeCustomerByIdAfterConfirmation()
@@ -311,7 +313,7 @@ public function testSubscribeCustomerByIdAfterConfirmation()
->willReturn(
[
'subscriber_id' => 1,
- 'subscriber_status' => 4
+ 'subscriber_status' => Subscriber::STATUS_UNCONFIRMED
]
);
$customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -323,7 +325,7 @@ public function testSubscribeCustomerByIdAfterConfirmation()
$this->scopeConfig->expects($this->atLeastOnce())->method('getValue')->with()->willReturn(true);
$this->subscriber->updateSubscription($customerId);
- $this->assertEquals(\Magento\Newsletter\Model\Subscriber::STATUS_SUBSCRIBED, $this->subscriber->getStatus());
+ $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $this->subscriber->getStatus());
}
public function testUnsubscribe()
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php b/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
index c4fe10c386645..d60348d9dc1c7 100644
--- a/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
+++ b/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
@@ -15,5 +15,5 @@ class Banktransfer extends \Magento\OfflinePayments\Block\Form\AbstractInstructi
*
* @var string
*/
- protected $_template = 'form/banktransfer.phtml';
+ protected $_template = 'Magento_OfflinePayments::form/banktransfer.phtml';
}
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php b/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
index 4e0f7d48ce09b..de0f7a57bae62 100644
--- a/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
+++ b/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
@@ -15,5 +15,5 @@ class Cashondelivery extends \Magento\OfflinePayments\Block\Form\AbstractInstruc
*
* @var string
*/
- protected $_template = 'form/cashondelivery.phtml';
+ protected $_template = 'Magento_OfflinePayments::form/cashondelivery.phtml';
}
diff --git a/app/code/Magento/Payment/Block/Info/Instructions.php b/app/code/Magento/Payment/Block/Info/Instructions.php
index 76d18edcb47af..0cb0d749693d6 100644
--- a/app/code/Magento/Payment/Block/Info/Instructions.php
+++ b/app/code/Magento/Payment/Block/Info/Instructions.php
@@ -20,7 +20,7 @@ class Instructions extends \Magento\Payment\Block\Info
/**
* @var string
*/
- protected $_template = 'info/instructions.phtml';
+ protected $_template = 'Magento_Payment::info/instructions.phtml';
/**
* Get instructions text from order payment
diff --git a/app/code/Magento/ProductAlert/Block/Email/Price.php b/app/code/Magento/ProductAlert/Block/Email/Price.php
index 982b0f7f63375..0430a21dc8bfd 100644
--- a/app/code/Magento/ProductAlert/Block/Email/Price.php
+++ b/app/code/Magento/ProductAlert/Block/Email/Price.php
@@ -15,7 +15,7 @@ class Price extends \Magento\ProductAlert\Block\Email\AbstractEmail
/**
* @var string
*/
- protected $_template = 'email/price.phtml';
+ protected $_template = 'Magento_ProductAlert::email/price.phtml';
/**
* Retrieve unsubscribe url for product
diff --git a/app/code/Magento/ProductAlert/Block/Email/Stock.php b/app/code/Magento/ProductAlert/Block/Email/Stock.php
index 1e0a6eb278a9e..b6e745e9c540f 100644
--- a/app/code/Magento/ProductAlert/Block/Email/Stock.php
+++ b/app/code/Magento/ProductAlert/Block/Email/Stock.php
@@ -16,7 +16,7 @@ class Stock extends \Magento\ProductAlert\Block\Email\AbstractEmail
/**
* @var string
*/
- protected $_template = 'email/stock.phtml';
+ protected $_template = 'Magento_ProductAlert::email/stock.phtml';
/**
* Retrieve unsubscribe url for product
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
index 161ff159a2df9..12bb78b0c75ad 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
@@ -272,6 +272,10 @@ protected function _assignProducts()
*/
private function removeItemsWithAbsentProducts()
{
+ if (count($this->_productIds) === 0) {
+ return;
+ }
+
$productCollection = $this->_productCollectionFactory->create()->addIdFilter($this->_productIds);
$existingProductsIds = $productCollection->getAllIds();
$absentProductsIds = array_diff($this->_productIds, $existingProductsIds);
diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating/Collection.php b/app/code/Magento/Review/Model/ResourceModel/Rating/Collection.php
index 18eb38ea72d38..0a82fb871339d 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Rating/Collection.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Rating/Collection.php
@@ -138,7 +138,6 @@ public function setStoreFilter($storeId)
'main_table.rating_id = store.rating_id',
[]
);
- // ->group('main_table.rating_id')
$this->_isStoreJoined = true;
}
$inCondition = $connection->prepareSqlCondition('store.store_id', ['in' => $storeId]);
diff --git a/app/code/Magento/Rss/Block/Feeds.php b/app/code/Magento/Rss/Block/Feeds.php
index 62d2f988ceac0..5d06ef3519751 100644
--- a/app/code/Magento/Rss/Block/Feeds.php
+++ b/app/code/Magento/Rss/Block/Feeds.php
@@ -14,7 +14,7 @@ class Feeds extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'feeds.phtml';
+ protected $_template = 'Magento_Rss::feeds.phtml';
/**
* @var \Magento\Framework\App\Rss\RssManagerInterface
diff --git a/app/code/Magento/Sales/Block/Order/History.php b/app/code/Magento/Sales/Block/Order/History.php
index e4530c9c33b1f..058618332e516 100644
--- a/app/code/Magento/Sales/Block/Order/History.php
+++ b/app/code/Magento/Sales/Block/Order/History.php
@@ -16,7 +16,7 @@ class History extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'order/history.phtml';
+ protected $_template = 'Magento_Sales::order/history.phtml';
/**
* @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index 2adbece5d89f4..6d6117290292b 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -475,13 +475,6 @@ public function getStateName($stateId = null)
*/
public function setShippingAmount($amount)
{
- // base shipping amount calculated in total model
- // $amount = $this->getStore()->round($amount);
- // $this->setData('base_shipping_amount', $amount);
- //
- // $amount = $this->getStore()->round(
- // $amount*$this->getOrder()->getStoreToOrderRate()
- // );
return $this->setData(CreditmemoInterface::SHIPPING_AMOUNT, $amount);
}
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
index 5b701762e04a2..76dc55b9c8787 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
@@ -31,6 +31,6 @@
| getQty() * 1 ?> |
- getItemPrice($_item); ?>
+ getItemPrice($_item->getOrderItem()) ?>
|
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
index 9e340cc31ff17..1d3f6ad1ee5a3 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
@@ -10,7 +10,7 @@ class Grid extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'order/packaging/grid.phtml';
+ protected $_template = 'Magento_Shipping::order/packaging/grid.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Shipping/Block/Order/Shipment.php b/app/code/Magento/Shipping/Block/Order/Shipment.php
index ee21fc1351b45..4145ee1beb6ee 100644
--- a/app/code/Magento/Shipping/Block/Order/Shipment.php
+++ b/app/code/Magento/Shipping/Block/Order/Shipment.php
@@ -15,7 +15,7 @@ class Shipment extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'order/shipment.phtml';
+ protected $_template = 'Magento_Shipping::order/shipment.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
index ebea50588f9e5..a38ea6d1272e8 100644
--- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php
+++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
@@ -6,6 +6,7 @@
namespace Magento\Store\App\Request;
use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\Store;
class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface
{
@@ -42,7 +43,7 @@ public function process(\Magento\Framework\App\RequestInterface $request, $pathI
}
if ($store->isUseStoreInUrl()) {
- if (!$request->isDirectAccessFrontendName($storeCode)) {
+ if (!$request->isDirectAccessFrontendName($storeCode) && $storeCode != Store::ADMIN_CODE) {
$this->storeManager->setCurrentStore($storeCode);
$pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : '');
return $pathInfo;
diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
index e7cc5b9469db3..eb049033194cc 100644
--- a/app/code/Magento/Theme/etc/di.xml
+++ b/app/code/Magento/Theme/etc/di.xml
@@ -94,7 +94,7 @@
- Magento\Framework\Translate
+ Magento\Framework\TranslateInterface
Magento\Theme\Model\Design\Proxy
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js b/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js
index dfae2b9da9501..7d2a54e805748 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js
@@ -62,7 +62,7 @@ define([
Element = _.extend({
defaults: {
- _requesetd: {},
+ _requested: {},
containers: [],
exports: {},
imports: {},
@@ -245,7 +245,7 @@ define([
* @returns {Function} Async module wrapper.
*/
requestModule: function (name) {
- var requested = this._requesetd;
+ var requested = this._requested;
if (!requested[name]) {
requested[name] = registry.async(name);
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
index 8104d4883dce6..00de03ba69647 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
@@ -316,7 +316,7 @@ define([
],
"pattern": [
function(value, param) {
- return param.test(value);
+ return new RegExp(param).test(value);
},
$.mage.__('Invalid format.')
],
diff --git a/app/code/Magento/Ui/view/base/web/js/modal/modal.js b/app/code/Magento/Ui/view/base/web/js/modal/modal.js
index b2ce644afce45..05a8f68f845d4 100644
--- a/app/code/Magento/Ui/view/base/web/js/modal/modal.js
+++ b/app/code/Magento/Ui/view/base/web/js/modal/modal.js
@@ -100,11 +100,12 @@ define([
/**
* Escape key press handler,
* close modal window
+ * @param {Object} event - event
*/
- escapeKey: function () {
+ escapeKey: function (event) {
if (this.options.isOpen && this.modal.find(document.activeElement).length ||
this.options.isOpen && this.modal[0] === document.activeElement) {
- this.closeModal();
+ this.closeModal(event);
}
}
}
diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
index a726b974eb324..157cfd1105e41 100644
--- a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
+++ b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
@@ -26,7 +26,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
/**
* @var string
*/
- protected $_template = 'categories.phtml';
+ protected $_template = 'Magento_UrlRewrite::categories.phtml';
/**
* Adminhtml data
diff --git a/app/code/Magento/UrlRewrite/Block/Selector.php b/app/code/Magento/UrlRewrite/Block/Selector.php
index fdad01d139fc9..eaba5682034e9 100644
--- a/app/code/Magento/UrlRewrite/Block/Selector.php
+++ b/app/code/Magento/UrlRewrite/Block/Selector.php
@@ -18,7 +18,7 @@ class Selector extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'selector.phtml';
+ protected $_template = 'Magento_UrlRewrite::selector.phtml';
/**
* Set block template and get available modes
diff --git a/app/code/Magento/User/Block/Role/Tab/Edit.php b/app/code/Magento/User/Block/Role/Tab/Edit.php
index 96489cac07a36..b682acfb6881f 100644
--- a/app/code/Magento/User/Block/Role/Tab/Edit.php
+++ b/app/code/Magento/User/Block/Role/Tab/Edit.php
@@ -18,7 +18,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form implements \Magento\Backen
/**
* @var string
*/
- protected $_template = 'role/edit.phtml';
+ protected $_template = 'Magento_User::role/edit.phtml';
/**
* Root ACL Resource
diff --git a/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php b/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
index 05ed8875ff9e5..142ce22510de4 100644
--- a/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
+++ b/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
@@ -33,7 +33,7 @@ class Tax extends \Magento\Backend\Block\Widget implements \Magento\Framework\Da
/**
* @var string
*/
- protected $_template = 'renderer/tax.phtml';
+ protected $_template = 'Magento_Weee::renderer/tax.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
index 2111de987ae28..1e90fe892ea1c 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -25,7 +25,7 @@ class Layout extends \Magento\Backend\Block\Template implements \Magento\Framewo
/**
* @var string
*/
- protected $_template = 'instance/edit/layout.phtml';
+ protected $_template = 'Magento_Widget::instance/edit/layout.phtml';
/**
* @var \Magento\Catalog\Model\Product\Type
diff --git a/app/code/Magento/Wishlist/Block/Rss/EmailLink.php b/app/code/Magento/Wishlist/Block/Rss/EmailLink.php
index 23b6a334e435f..25148bbe5bc0d 100644
--- a/app/code/Magento/Wishlist/Block/Rss/EmailLink.php
+++ b/app/code/Magento/Wishlist/Block/Rss/EmailLink.php
@@ -19,7 +19,7 @@ class EmailLink extends Link
/**
* @var string
*/
- protected $_template = 'rss/email.phtml';
+ protected $_template = 'Magento_Wishlist::rss/email.phtml';
/**
* @return array
diff --git a/app/code/Magento/Wishlist/Block/Share/Email/Items.php b/app/code/Magento/Wishlist/Block/Share/Email/Items.php
index f0c5cea3c2962..7fb3be584347b 100644
--- a/app/code/Magento/Wishlist/Block/Share/Email/Items.php
+++ b/app/code/Magento/Wishlist/Block/Share/Email/Items.php
@@ -16,7 +16,7 @@ class Items extends \Magento\Wishlist\Block\AbstractBlock
/**
* @var string
*/
- protected $_template = 'email/items.phtml';
+ protected $_template = 'Magento_Wishlist::email/items.phtml';
/**
* Retrieve Product View URL
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
index 88f96f04785b3..daa9f6aa07315 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
@@ -7,6 +7,7 @@
-->
+
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
index cf84f34279086..273f626ec03d6 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
@@ -8,7 +8,6 @@
// _____________________________________________
@checkout-tooltip__hover__z-index: @tooltip__z-index;
-@checkout-tooltip-breakpoint__screen-m: @modal-popup-breakpoint-screen__m;
@checkout-tooltip-icon-arrow__font-size: 10px;
@checkout-tooltip-icon-arrow__left: -( @checkout-tooltip-content__padding + @checkout-tooltip-icon-arrow__font-size - @checkout-tooltip-content__border-width);
@@ -138,7 +137,7 @@
}
}
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @checkout-tooltip-breakpoint__screen-m) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
.field-tooltip {
.field-tooltip-content {
&:extend(.abs-checkout-tooltip-content-position-top-mobile all);
diff --git a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less
index 84adec39c8892..215d7d8b322b4 100644
--- a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less
+++ b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less
@@ -203,7 +203,8 @@
text-align: center;
}
- .item-price {
+ .item-price,
+ .item-subtotal {
text-align: right;
}
diff --git a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less
index 37f59cf59d1f8..8263432359238 100644
--- a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less
@@ -262,7 +262,7 @@
}
.toolbar {
- &:extend(.abs-add-clearfix-desktop all);
+ &:extend(.abs-add-clearfix-mobile all);
.pages {
float: right;
diff --git a/app/design/frontend/Magento/blank/i18n/en_US.csv b/app/design/frontend/Magento/blank/i18n/en_US.csv
index b9a1d343b7f2d..a491a567a3777 100644
--- a/app/design/frontend/Magento/blank/i18n/en_US.csv
+++ b/app/design/frontend/Magento/blank/i18n/en_US.csv
@@ -1,5 +1,4 @@
Summary,Summary
-"Account Dashboard","Account Dashboard"
"Account Information","Account Information"
"Address Book","Address Book"
Menu,Menu
diff --git a/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less
index 5974b92186cb0..5cdb1444094e9 100644
--- a/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less
+++ b/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less
@@ -16,7 +16,6 @@
@modal-popup-title__font-size: 26px;
@modal-popup-title-mobile__font-size: @font-size__base;
-@modal-popup-breakpoint-screen__m: @screen__m;
@modal-slide__first__indent-left: 44px;
@modal-slide-mobile__background-color: @color-gray-light01;
@@ -151,7 +150,7 @@
}
}
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @modal-popup-breakpoint-screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
.modal-popup {
&.modal-slide {
.modal-inner-wrap[class] {
@@ -182,7 +181,7 @@
// Desktop
// _____________________________________________
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @modal-popup-breakpoint-screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
.modal-popup {
&.modal-slide {
.modal-footer {
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
index 84f116c2c9547..8053856ace285 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
@@ -156,11 +156,11 @@
.column.main {
.product {
&-items {
- margin-left: -@indent__base;
+ margin-left: 0;
}
&-item {
- padding-left: @indent__base;
+ padding-left: 0;
}
}
}
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml b/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
index e64adea22f636..b27d996b6c12f 100644
--- a/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
+++ b/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
@@ -10,7 +10,7 @@
- Account Dashboard
+ My Account
block-collapsible-nav
@@ -19,7 +19,7 @@
- Account Dashboard
+ My Account
customer/account
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
old mode 100644
new mode 100755
index aa86872dbb49e..bb4728aacf49c
--- a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -198,7 +198,7 @@
.column.main & {
}
}
-
+ display: block;
margin-bottom: @indent__s;
}
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less
index 9a3f433618c36..3f19d1020bab9 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less
+++ b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less
@@ -207,7 +207,8 @@
text-align: center;
}
- .item-price {
+ .item-price,
+ .item-subtotal {
text-align: right;
}
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
index 3342a868aaca3..94b9629864142 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -420,6 +420,17 @@
}
}
+//
+// Mobile
+// _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+ .cms-page-view .page-main {
+ padding-top: 41px;
+ position: relative;
+ }
+}
+
//
// Desktop
// _____________________________________________
diff --git a/app/design/frontend/Magento/luma/i18n/en_US.csv b/app/design/frontend/Magento/luma/i18n/en_US.csv
index 6f79508746d9d..2146cb8fc24b6 100644
--- a/app/design/frontend/Magento/luma/i18n/en_US.csv
+++ b/app/design/frontend/Magento/luma/i18n/en_US.csv
@@ -42,3 +42,6 @@ Password:,Password:
"Placed on %created_at","Placed on %created_at"
"Your shipping confirmation is below. Thank you again for your business.","Your shipping confirmation is below. Thank you again for your business."
"Your Shipment #%shipment_id for Order #%order_id","Your Shipment #%shipment_id for Order #%order_id"
+"Update to your %store_name shipment","Update to your %store_name shipment"
+"Address Book","Address Book"
+"Account Information","Account Information"
diff --git a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
index ed01ef7d027f5..ae68fc81acd6e 100644
--- a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
+++ b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
@@ -16,7 +16,6 @@
@modal-popup-title__font-size: 26px;
@modal-popup-title-mobile__font-size: @font-size__base;
-@modal-popup-breakpoint-screen__m: @screen__m;
@modal-slide__first__indent-left: 44px;
@modal-slide-mobile__background-color: @color-gray-light01;
@@ -150,7 +149,7 @@
}
}
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @modal-popup-breakpoint-screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
.modal-popup {
&.modal-slide {
.modal-inner-wrap[class] {
@@ -181,7 +180,7 @@
// Desktop
// _____________________________________________
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @modal-popup-breakpoint-screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
.modal-popup {
&.modal-slide {
.modal-footer {
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
index 07e4717fda4a6..c130af57c48b7 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
@@ -24,7 +24,7 @@ class AssertCustomerDefaultAddresses extends AbstractConstraint
*/
public function processAssert(CustomerAccountIndex $customerAccountIndex, Address $address)
{
- $customerAccountIndex->getAccountMenuBlock()->openMenuItem('Account Dashboard');
+ $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Account');
sleep(6);
$defaultBillingAddress = explode(
"\n",
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
index e5201d18b3fd4..96c3c3933cc07 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
@@ -17,7 +17,7 @@ class AssertCustomerRedirectToDashboard extends AbstractConstraint
/**
* Dashboard Message on account index page.
*/
- const DASHBOARD_MESSAGE = 'My Dashboard';
+ const DASHBOARD_MESSAGE = 'My Account';
/**
* Constraint severeness
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
index df14db909a8f6..22cd5bd13e94c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
@@ -49,7 +49,7 @@ public function run()
{
$this->customerAccount->open();
$this->cmsIndex->getCmsPageBlock()->waitPageInit();
- if ($this->cmsIndex->getTitleBlock()->getTitle() != 'Customer Login') {
+ if ($this->cmsIndex->getTitleBlock()->getTitle() === 'My Account') {
$this->cmsIndex->getLinksBlock()->openLink('Sign Out');
$this->cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible('Home Page');
$this->cmsIndex->getCmsPageBlock()->waitPageInit();
diff --git a/dev/tests/integration/testsuite/Magento/Cron/Observer/ProcessCronQueueObserverTest.php b/dev/tests/integration/testsuite/Magento/Cron/Observer/ProcessCronQueueObserverTest.php
index 107bf8ae14bb9..6216cfb473628 100644
--- a/dev/tests/integration/testsuite/Magento/Cron/Observer/ProcessCronQueueObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cron/Observer/ProcessCronQueueObserverTest.php
@@ -27,7 +27,7 @@ protected function setUp()
}
/**
- * @magentoConfigFixture current_store crontab/default/jobs/catalog_product_alert/schedule/cron_expr 8 * * * *
+ * @magentoConfigFixture current_store crontab/default/jobs/catalog_product_alert/schedule/cron_expr * * * * *
*/
public function testDispatchScheduled()
{
@@ -35,6 +35,7 @@ public function testDispatchScheduled()
'Magento\Cron\Model\ResourceModel\Schedule\Collection'
);
$collection->addFieldToFilter('status', \Magento\Cron\Model\Schedule::STATUS_PENDING);
+ $collection->addFieldToFilter('job_code', 'catalog_product_alert');
$this->assertGreaterThan(0, $collection->count(), 'Cron has failed to schedule tasks for itself for future.');
}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml
index 18501ecfbbfbf..8e50fe1888104 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml
@@ -9,17 +9,17 @@
- blok2
+ block2
- blok3
+ block3
- blok4
+ block4
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php b/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
index 76bc4fce5f95c..3048be4d5dc1b 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
@@ -178,14 +178,6 @@ public function getOnchange($value)
return;
}
- // public function getName($value)
- // {
- // if ($name = $this->getData('name')) {
- // return str_replace('$value', $value, $name);
- // }
- // return ;
- // }
-
/**
* @param array $option
* @return string
diff --git a/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php b/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
index 4973a2ebe50e1..74584a1d3c0ea 100644
--- a/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
+++ b/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
@@ -5,6 +5,8 @@
*/
namespace Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Encryption\Helper\Security;
+
class Validator
{
/**
@@ -29,9 +31,7 @@ public function __construct(\Magento\Framework\Data\Form\FormKey $formKey)
public function validate(\Magento\Framework\App\RequestInterface $request)
{
$formKey = $request->getParam('form_key', null);
- if (!$formKey || $formKey !== $this->_formKey->getFormKey()) {
- return false;
- }
- return true;
+
+ return $formKey && Security::compareStrings($formKey, $this->_formKey->getFormKey());
}
}
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Relation/ActionPool.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Relation/ActionPool.php
index 433762556693d..781f96585dd50 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Relation/ActionPool.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Relation/ActionPool.php
@@ -50,9 +50,6 @@ public function getActions($entityType, $actionName)
}
foreach ($this->relationActions[$entityType][$actionName] as $actionClassName) {
$action = $this->objectManager->get($actionClassName);
- //if (!$action instanceof ProcessEntityRelationInterface) {
- // throw new \Exception('Not compliant with action interface');
- //}
$actions[] = $action;
}
return $actions;
diff --git a/lib/internal/Magento/Framework/System/Ftp.php b/lib/internal/Magento/Framework/System/Ftp.php
index 216026be8d72e..73b76931ead2b 100644
--- a/lib/internal/Magento/Framework/System/Ftp.php
+++ b/lib/internal/Magento/Framework/System/Ftp.php
@@ -107,6 +107,12 @@ public function validateConnectionString($string)
if ($data['scheme'] != 'ftp') {
throw new \Exception("Support for scheme unsupported: '{$data['scheme']}'");
}
+
+ // Decode user & password strings from URL
+ foreach (array_intersect(array_keys($data), ['user', 'pass']) as $key) {
+ $data[$key] = urldecode($data[$key]);
+ }
+
return $data;
}
diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
index aafb5eda9b617..529f8b02e0635 100644
--- a/lib/internal/Magento/Framework/View/Page/Config.php
+++ b/lib/internal/Magento/Framework/View/Page/Config.php
@@ -174,7 +174,7 @@ public function __construct(
$this->setElementAttribute(
self::ELEMENT_TYPE_HTML,
self::HTML_ATTRIBUTE_LANG,
- str_replace('_', '-', $this->localeResolver->getLocale())
+ strstr($this->localeResolver->getLocale(), '_', true)
);
}
diff --git a/lib/web/css/source/lib/_responsive.less b/lib/web/css/source/lib/_responsive.less
index d1bbbae7f6875..efb706f85eac0 100644
--- a/lib/web/css/source/lib/_responsive.less
+++ b/lib/web/css/source/lib/_responsive.less
@@ -27,24 +27,24 @@
& when (@media-target = 'mobile'), (@media-target = 'all') {
- @media only screen and (max-width: (@screen__xxs - 1)) {
- .media-width('max', @screen__xxs);
+ @media only screen and (max-width: @screen__m) {
+ .media-width('max', (@screen__m + 1));
}
- @media only screen and (max-width: (@screen__xs - 1)) {
- .media-width('max', @screen__xs);
+ @media only screen and (max-width: (@screen__m - 1)) {
+ .media-width('max', @screen__m);
}
@media only screen and (max-width: (@screen__s - 1)) {
.media-width('max', @screen__s);
}
- @media only screen and (max-width: (@screen__m - 1)) {
- .media-width('max', @screen__m);
+ @media only screen and (max-width: (@screen__xs - 1)) {
+ .media-width('max', @screen__xs);
}
- @media only screen and (max-width: @screen__m) {
- .media-width('max', (@screen__m + 1));
+ @media only screen and (max-width: (@screen__xxs - 1)) {
+ .media-width('max', @screen__xxs);
}
@media all and (min-width: @screen__s) {
diff --git a/lib/web/mage/utils/template.js b/lib/web/mage/utils/template.js
index 619f93229f61a..add59bdb1448e 100644
--- a/lib/web/mage/utils/template.js
+++ b/lib/web/mage/utils/template.js
@@ -2,12 +2,15 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
+/* eslint-disable no-shadow */
+
define([
'jquery',
'underscore',
'mage/utils/objects',
'mage/utils/strings'
-], function (jQuery, _, utils, stringUtils) {
+], function ($, _, utils, stringUtils) {
'use strict';
var tmplSettings = _.templateSettings,
@@ -172,7 +175,7 @@ define([
if (isTemplate(value)) {
list[key] = render(value, tmpl, castString);
- } else if (jQuery.isPlainObject(value) || Array.isArray(value)) {
+ } else if ($.isPlainObject(value) || Array.isArray(value)) {
_.each(value, iterate);
}
});
diff --git a/pub/errors/processor.php b/pub/errors/processor.php
index 231c13dcfe0c4..2ee52de447d2f 100644
--- a/pub/errors/processor.php
+++ b/pub/errors/processor.php
@@ -203,7 +203,7 @@ public function process503()
public function processReport()
{
$this->pageTitle = 'There has been an error processing your request';
- $this->_response->setHttpResponseCode(503);
+ $this->_response->setHttpResponseCode(500);
$this->showErrorMsg = false;
$this->showSentMsg = false;