+
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
index c10d1a77997..c709859adb1 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
@@ -6,7 +6,13 @@
namespace Magento\Backend\Controller\Adminhtml\Dashboard;
-class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Reports\Controller\Adminhtml\Report\Statistics;
+
+/**
+ * Refresh Dashboard statistics action.
+ */
+class RefreshStatistics extends Statistics implements HttpPostActionInterface
{
/**
* @param \Magento\Backend\App\Action\Context $context
@@ -25,6 +31,8 @@ public function __construct(
}
/**
+ * Refresh statistics.
+ *
* @return \Magento\Backend\Model\View\Result\Redirect
*/
public function execute()
diff --git a/app/code/Magento/Backend/Model/Search/Customer.php b/app/code/Magento/Backend/Model/Search/Customer.php
index 35a7359ce99..e76a1b77ab2 100644
--- a/app/code/Magento/Backend/Model/Search/Customer.php
+++ b/app/code/Magento/Backend/Model/Search/Customer.php
@@ -89,7 +89,7 @@ public function load()
$this->searchCriteriaBuilder->setCurrentPage($this->getStart());
$this->searchCriteriaBuilder->setPageSize($this->getLimit());
- $searchFields = ['firstname', 'lastname', 'company'];
+ $searchFields = ['firstname', 'lastname', 'billing_company'];
$filters = [];
foreach ($searchFields as $field) {
$filters[] = $this->filterBuilder
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.xml
new file mode 100644
index 00000000000..9e5c0bb3f39
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | @@ -116,7 +125,7 @@ | - canShowPriceInfo($_item)): ?> + canShowPriceInfo($_item) || $shipTogether): ?> canEditQty()) : ?> getItem(); +$items = array_merge([$parentItem], $parentItem->getChildrenItems()); +$index = 0; +$prevOptionId = ''; ?> -getItem() ?> -getChildrenItems()); ?> - - + - - - getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?> - + getItemOptions() + || $parentItem->getDescription() + || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) + && $parentItem->getGiftMessageId()): ?> + - + - getParentItem()): ?> - getSelectionAttributes($_item) ?> - + getParentItem()): ?> + getSelectionAttributes($item) ?> + | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| + | escapeHtml($attributes['option_label']); ?> | ||||||||
| - escapeHtml($_item->getName()) ?> + | |||||||||
| + escapeHtml($item->getName()); ?> | -getValueHtml($_item) ?> | ++ getValueHtml($item); ?> + | -prepareSku($_item->getSku()) ?> | -- getParentItem()): ?> - getItemPriceHtml() ?> + | + prepareSku($item->getSku()); ?> + | ++ getParentItem()): ?> + getItemPriceHtml(); ?> | -+ |
getParentItem() && $block->isChildCalculated()) ||
- (!$_item->getParentItem() && !$block->isChildCalculated()) || ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $block->isShipmentSeparately())):?>
+ ($item->getParentItem() && $block->isChildCalculated()) ||
+ (!$item->getParentItem() && !$block->isChildCalculated()) ||
+ ($item->getQtyShipped() > 0 && $item->getParentItem() && $block->isShipmentSeparately())): ?>
|
- getParentItem()): ?> - getItemRowTotalHtml() ?> + getParentItem()): ?> + getItemRowTotalHtml(); ?> @@ -103,33 +119,38 @@ |
| - getItemOptions()): ?> + getItemOptions()): ?> - escapeHtml($_item->getDescription()) ?> + escapeHtml($item->getDescription()); ?> | |||||||||
| - {{trans "Confirm Your Account"}} + {{trans "Confirm Your Account"}} |
-
-
-
-
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index faa15f72402..df3f0004108 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -126,6 +126,9 @@
title="getAttributeData()->getFrontendLabel('postcode') ?>"
id="zip"
class="input-text validate-zip-international escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode')) ?>">
+
escapeHtml(__('Additional Address Entries')) ?>
-
- getAdditionalAddresses()): ?>
-
--
-
-
-
-
- getAddressHtml($_address) ?>
- - -
-
-
escapeHtml(__('You have no other address entries in your address book.')) ?>
- -
@@ -184,7 +187,9 @@
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
index 0a37896b810..31510a65ef7 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
@@ -29,7 +29,7 @@ $fieldCssClass = 'field date field-' . $block->getHtmlId();
$fieldCssClass .= $block->isRequired() ? ' required' : '';
?>
-
+
getFieldHtml() ?>
getAdditionalDescription()) : ?>
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
index d60f0968ad4..8b45618a891 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
@@ -9,9 +9,9 @@
/** @var \Magento\Customer\Block\Widget\Gender $block */
?>
-
+
-
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/shortcut_button.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/shortcut_button.phtml
new file mode 100644
index 00000000000..ac0eda99ee9
--- /dev/null
+++ b/app/code/Magento/Paypal/view/frontend/templates/express/shortcut_button.phtml
@@ -0,0 +1,13 @@
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
index 8b4855cff68..012a1f18f9a 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
@@ -2,50 +2,52 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-define(
- [
- 'uiComponent',
- 'jquery',
- 'domReady!'
- ],
- function (
- Component,
- $
- ) {
- 'use strict';
-
- return Component.extend({
-
- defaults: {},
-
- /**
- * @returns {Object}
- */
- initialize: function () {
- this._super();
-
- return this.initEvents();
- },
-
- /**
- * @returns {Object}
- */
- initEvents: function () {
- $('a[data-action="' + this.linkDataAction + '"]').off('click.' + this.id)
- .on('click.' + this.id, this.click.bind(this));
-
- return this;
- },
-
- /**
- * @param {Object} event
- * @returns void
- */
- click: function (event) {
- event.preventDefault();
-
- $('#' + this.paypalButton).click();
+define([
+ 'uiComponent',
+ 'jquery',
+ 'Magento_Paypal/js/in-context/express-checkout-wrapper',
+ 'Magento_Customer/js/customer-data'
+], function (Component, $, Wrapper, customerData) {
+ 'use strict';
+
+ return Component.extend(Wrapper).extend({
+ defaults: {
+ declinePayment: false
+ },
+
+ /** @inheritdoc */
+ initialize: function (config, element) {
+ var cart = customerData.get('cart'),
+ customer = customerData.get('customer');
+
+ this._super();
+ this.renderPayPalButtons(element);
+ this.declinePayment = !customer().firstname && !cart().isGuestCheckoutAllowed;
+
+ return this;
+ },
+
+ /** @inheritdoc */
+ beforePayment: function (resolve, reject) {
+ var promise = $.Deferred();
+
+ if (this.declinePayment) {
+ this.addError(this.signInMessage, 'warning');
+
+ reject();
+ } else {
+ promise.resolve();
}
- });
- }
-);
+
+ return promise;
+ },
+
+ /** @inheritdoc */
+ prepareClientConfig: function () {
+ this._super();
+ this.clientConfig.commit = false;
+
+ return this.clientConfig;
+ }
+ });
+});
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
new file mode 100644
index 00000000000..ad7e86f2e99
--- /dev/null
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -0,0 +1,123 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+ 'underscore',
+ 'paypalInContextExpressCheckout'
+], function (_, paypal) {
+ 'use strict';
+
+ /**
+ * Returns array of allowed funding
+ *
+ * @param {Object} config
+ * @return {Array}
+ */
+ function getFunding(config) {
+ return _.map(config, function (name) {
+ return paypal.FUNDING[name];
+ });
+ }
+
+ return function (clientConfig, element) {
+ paypal.Button.render({
+ env: clientConfig.environment,
+ client: clientConfig.client,
+ locale: clientConfig.locale,
+ funding: {
+ allowed: getFunding(clientConfig.allowedFunding),
+ disallowed: getFunding(clientConfig.disallowedFunding)
+ },
+ style: clientConfig.styles,
+
+ // Enable Pay Now checkout flow (optional)
+ commit: clientConfig.commit,
+
+ /**
+ * Validate payment method
+ *
+ * @param {Object} actions
+ */
+ validate: function (actions) {
+ clientConfig.rendererComponent.validate(actions);
+ },
+
+ /**
+ * Execute logic on Paypal button click
+ */
+ onClick: function () {
+ clientConfig.rendererComponent.onClick();
+ },
+
+ /**
+ * Set up a payment
+ *
+ * @return {*}
+ */
+ payment: function () {
+ var params = {
+ 'quote_id': clientConfig.quoteId,
+ 'customer_id': clientConfig.customerId || '',
+ 'form_key': clientConfig.formKey,
+ button: clientConfig.button
+ };
+
+ return new paypal.Promise(function (resolve, reject) {
+ clientConfig.rendererComponent.beforePayment(resolve, reject).then(function () {
+ paypal.request.post(clientConfig.getTokenUrl, params).then(function (res) {
+ return clientConfig.rendererComponent.afterPayment(res, resolve, reject);
+ }).catch(function (err) {
+ return clientConfig.rendererComponent.catchPayment(err, resolve, reject);
+ });
+ });
+ });
+ },
+
+ /**
+ * Execute the payment
+ *
+ * @param {Object} data
+ * @param {Object} actions
+ * @return {*}
+ */
+ onAuthorize: function (data, actions) {
+ var params = {
+ paymentToken: data.paymentToken,
+ payerId: data.payerID,
+ quoteId: clientConfig.quoteId || '',
+ customerId: clientConfig.customerId || '',
+ 'form_key': clientConfig.formKey
+ };
+
+ return new paypal.Promise(function (resolve, reject) {
+ clientConfig.rendererComponent.beforeOnAuthorize(resolve, reject, actions).then(function () {
+ paypal.request.post(clientConfig.onAuthorizeUrl, params).then(function (res) {
+ clientConfig.rendererComponent.afterOnAuthorize(res, resolve, reject, actions);
+ }).catch(function (err) {
+ return clientConfig.rendererComponent.catchOnAuthorize(err, resolve, reject);
+ });
+ });
+ });
+
+ },
+
+ /**
+ * Process cancel action
+ *
+ * @param {Object} data
+ * @param {Object} actions
+ */
+ onCancel: function (data, actions) {
+ clientConfig.rendererComponent.onCancel(data, actions);
+ },
+
+ /**
+ * Process errors
+ */
+ onError: function (err) {
+ clientConfig.rendererComponent.onError(err);
+ }
+ }, element);
+ };
+});
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js
new file mode 100644
index 00000000000..905f860fe26
--- /dev/null
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js
@@ -0,0 +1,187 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+ 'jquery',
+ 'mage/translate',
+ 'Magento_Customer/js/customer-data',
+ 'Magento_Paypal/js/in-context/express-checkout-smart-buttons',
+ 'mage/cookies'
+], function ($, $t, customerData, checkoutSmartButtons) {
+ 'use strict';
+
+ return {
+ defaults: {
+ paymentActionError: $t('Something went wrong with your request. Please try again later.'),
+ signInMessage: $t('To check out, please sign in with your email address.')
+ },
+
+ /**
+ * Render PayPal buttons using checkout.js
+ */
+ renderPayPalButtons: function (element) {
+ checkoutSmartButtons(this.prepareClientConfig(), element);
+ },
+
+ /**
+ * Validate payment method
+ *
+ * @param {Object} actions
+ */
+ validate: function (actions) {
+ this.actions = actions || this.actions;
+ },
+
+ /**
+ * Execute logic on Paypal button click
+ */
+ onClick: function () {},
+
+ /**
+ * Before payment execute
+ *
+ * @param {Function} resolve
+ * @param {Function} reject
+ * @return {*}
+ */
+ beforePayment: function (resolve, reject) { //eslint-disable-line no-unused-vars
+ return $.Deferred().resolve();
+ },
+
+ /**
+ * After payment execute
+ *
+ * @param {Object} res
+ * @param {Function} resolve
+ * @param {Function} reject
+ *
+ * @return {*}
+ */
+ afterPayment: function (res, resolve, reject) {
+ if (res.success) {
+ return resolve(res.token);
+ }
+
+ this.addError(res['error_message']);
+
+ return reject(new Error(res['error_message']));
+ },
+
+ /**
+ * Catch payment
+ *
+ * @param {Error} err
+ * @param {Function} resolve
+ * @param {Function} reject
+ */
+ catchPayment: function (err, resolve, reject) {
+ this.addError(this.paymentActionError);
+ reject(err);
+ },
+
+ /**
+ * Before onAuthorize execute
+ *
+ * @param {Function} resolve
+ * @param {Function} reject
+ * @param {Object} actions
+ *
+ * @return {jQuery.Deferred}
+ */
+ beforeOnAuthorize: function (resolve, reject, actions) { //eslint-disable-line no-unused-vars
+ return $.Deferred().resolve();
+ },
+
+ /**
+ * After onAuthorize execute
+ *
+ * @param {Object} res
+ * @param {Function} resolve
+ * @param {Function} reject
+ * @param {Object} actions
+ *
+ * @return {*}
+ */
+ afterOnAuthorize: function (res, resolve, reject, actions) {
+ if (res.success) {
+ resolve();
+
+ return actions.redirect(window, res.redirectUrl);
+ }
+
+ this.addError(res['error_message']);
+
+ return reject(new Error(res['error_message']));
+ },
+
+ /**
+ * Catch payment
+ *
+ * @param {Error} err
+ * @param {Function} resolve
+ * @param {Function} reject
+ */
+ catchOnAuthorize: function (err, resolve, reject) {
+ this.addError(this.paymentActionError);
+ reject(err);
+ },
+
+ /**
+ * Process cancel action
+ *
+ * @param {Object} data
+ * @param {Object} actions
+ */
+ onCancel: function (data, actions) {
+ actions.redirect(window, this.clientConfig.onCancelUrl);
+ },
+
+ /**
+ * Process errors
+ *
+ * @param {Error} err
+ */
+ onError: function (err) { //eslint-disable-line no-unused-vars
+ // Uncaught error isn't displayed in the console
+ },
+
+ /**
+ * Adds error message
+ *
+ * @param {String} message
+ * @param {String} [type]
+ */
+ addError: function (message, type) {
+ type = type || 'error';
+ customerData.set('messages', {
+ messages: [{
+ type: type,
+ text: message
+ }],
+ 'data_id': Math.floor(Date.now() / 1000)
+ });
+ },
+
+ /**
+ * @returns {String}
+ */
+ getButtonId: function () {
+ return this.inContextId;
+ },
+
+ /**
+ * Populate client config with all required data
+ *
+ * @return {Object}
+ */
+ prepareClientConfig: function () {
+ this.clientConfig.client = {};
+ this.clientConfig.client[this.clientConfig.environment] = this.clientConfig.merchantId;
+ this.clientConfig.rendererComponent = this;
+ this.clientConfig.formKey = $.mage.cookies.get('form_key');
+
+ return this.clientConfig;
+ }
+ };
+});
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js
new file mode 100644
index 00000000000..413820cc731
--- /dev/null
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js
@@ -0,0 +1,76 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+ 'underscore',
+ 'jquery',
+ 'uiComponent',
+ 'Magento_Paypal/js/in-context/express-checkout-wrapper',
+ 'Magento_Customer/js/customer-data'
+], function (_, $, Component, Wrapper, customerData) {
+ 'use strict';
+
+ return Component.extend(Wrapper).extend({
+ defaults: {
+ productFormSelector: '#product_addtocart_form',
+ declinePayment: false,
+ formInvalid: false
+ },
+
+ /** @inheritdoc */
+ initialize: function (config, element) {
+ var cart = customerData.get('cart'),
+ customer = customerData.get('customer');
+
+ this._super();
+ this.renderPayPalButtons(element);
+ this.declinePayment = !customer().firstname && !cart().isGuestCheckoutAllowed;
+
+ return this;
+ },
+
+ /** @inheritdoc */
+ onClick: function () {
+ var $form = $(this.productFormSelector);
+
+ if (!this.declinePayment) {
+ $form.submit();
+ this.formInvalid = !$form.validation('isValid');
+ }
+ },
+
+ /** @inheritdoc */
+ beforePayment: function (resolve, reject) {
+ var promise = $.Deferred();
+
+ if (this.declinePayment) {
+ this.addError(this.signInMessage, 'warning');
+ reject();
+ } else if (this.formInvalid) {
+ reject();
+ } else {
+ $(document).on('ajax:addToCart', function (e, data) {
+ if (_.isEmpty(data.response)) {
+ return promise.resolve();
+ }
+
+ return reject();
+ });
+ $(document).on('ajax:addToCart:error', reject);
+ }
+
+ return promise;
+ },
+
+ /** @inheritdoc */
+ prepareClientConfig: function () {
+ this._super();
+ this.clientConfig.quoteId = '';
+ this.clientConfig.customerId = '';
+ this.clientConfig.commit = false;
+
+ return this.clientConfig;
+ }
+ });
+});
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js
index 3315a7c402d..7fb94a7e234 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js
@@ -4,10 +4,9 @@
*/
define([
'Magento_Checkout/js/view/payment/default',
- 'ko',
'Magento_Paypal/js/model/iframe',
'Magento_Checkout/js/model/full-screen-loader'
-], function (Component, ko, iframe, fullScreenLoader) {
+], function (Component, iframe, fullScreenLoader) {
'use strict';
return Component.extend({
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
index c56f21bc718..5c509238fe5 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -2,134 +2,103 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-define(
- [
- 'underscore',
- 'jquery',
- 'Magento_Paypal/js/view/payment/method-renderer/paypal-express-abstract',
- 'Magento_Paypal/js/action/set-payment-method',
- 'Magento_Checkout/js/model/payment/additional-validators',
- 'Magento_Ui/js/lib/view/utils/dom-observer',
- 'paypalInContextExpressCheckout',
- 'Magento_Customer/js/customer-data',
- 'Magento_Ui/js/model/messageList'
- ],
- function (
- _,
- $,
- Component,
- setPaymentMethodAction,
- additionalValidators,
- domObserver,
- paypalExpressCheckout,
- customerData,
- messageList
- ) {
- 'use strict';
-
- // State of PayPal module initialization
- var clientInit = false;
-
- return Component.extend({
-
- defaults: {
- template: 'Magento_Paypal/payment/paypal-express-in-context',
- clientConfig: {
- /**
- * @param {Object} event
- */
- click: function (event) {
- event.preventDefault();
-
- if (additionalValidators.validate()) {
- paypalExpressCheckout.checkout.initXO();
-
- this.selectPaymentMethod();
- setPaymentMethodAction(this.messageContainer).done(function () {
- $('body').trigger('processStart');
-
- $.getJSON(this.path, {
- button: 0
- }).done(function (response) {
- var message = response && response.message;
-
- if (message) {
- if (message.type === 'error') {
- messageList.addErrorMessage({
- message: message.text
- });
- } else {
- messageList.addSuccessMessage({
- message: message.text
- });
- }
- }
-
- if (response && response.url) {
- paypalExpressCheckout.checkout.startFlow(response.url);
-
- return;
- }
-
- paypalExpressCheckout.checkout.closeFlow();
- }).fail(function () {
- paypalExpressCheckout.checkout.closeFlow();
- }).always(function () {
- $('body').trigger('processStop');
- customerData.invalidate(['cart']);
- });
- }.bind(this)).fail(function () {
- paypalExpressCheckout.checkout.closeFlow();
- });
- }
- }
- }
- },
-
- /**
- * @returns {Object}
- */
- initialize: function () {
- this._super();
- this.initClient();
-
- return this;
- },
+define([
+ 'jquery',
+ 'Magento_Paypal/js/view/payment/method-renderer/paypal-express-abstract',
+ 'Magento_Paypal/js/in-context/express-checkout-wrapper',
+ 'Magento_Paypal/js/action/set-payment-method',
+ 'Magento_Checkout/js/model/payment/additional-validators',
+ 'Magento_Ui/js/model/messageList',
+ 'Magento_Ui/js/lib/view/utils/async'
+], function ($, Component, Wrapper, setPaymentMethod, additionalValidators, messageList) {
+ 'use strict';
+
+ return Component.extend(Wrapper).extend({
+ defaults: {
+ template: 'Magento_Paypal/payment/paypal-express-in-context',
+ validationElements: 'input'
+ },
+
+ /**
+ * Listens element on change and validate it.
+ *
+ * @param {HTMLElement} context
+ */
+ initListeners: function (context) {
+ $.async(this.validationElements, context, function (element) {
+ $(element).on('change', function () {
+ this.validate();
+ }.bind(this));
+ }.bind(this));
+ },
+
+ /**
+ * Validates Smart Buttons
+ */
+ validate: function () {
+ this._super();
+
+ if (this.actions) {
+ additionalValidators.validate(true) ? this.actions.enable() : this.actions.disable();
+ }
+ },
- /**
- * @returns {Object}
- */
- initClient: function () {
- var selector = '#' + this.getButtonId();
+ /** @inheritdoc */
+ beforePayment: function (resolve, reject) {
+ var promise = $.Deferred();
- _.each(this.clientConfig, function (fn, name) {
- if (typeof fn === 'function') {
- this.clientConfig[name] = fn.bind(this);
- }
- }, this);
+ setPaymentMethod(this.messageContainer).done(function () {
+ return promise.resolve();
+ }).fail(function (response) {
+ var error;
- if (!clientInit) {
- domObserver.get(selector, function () {
- paypalExpressCheckout.checkout.setup(this.merchantId, this.clientConfig);
- clientInit = true;
- domObserver.off(selector);
- }.bind(this));
- } else {
- domObserver.get(selector, function () {
- $(selector).on('click', this.clientConfig.click);
- domObserver.off(selector);
- }.bind(this));
+ try {
+ error = JSON.parse(response.responseText);
+ } catch (exception) {
+ error = this.paymentActionError;
}
- return this;
- },
-
- /**
- * @returns {String}
- */
- getButtonId: function () {
- return this.inContextId;
- }
- });
- }
-);
+ this.addError(error);
+
+ return reject(new Error(error));
+ }.bind(this));
+
+ return promise;
+ },
+
+ /**
+ * Populate client config with all required data
+ *
+ * @return {Object}
+ */
+ prepareClientConfig: function () {
+ this._super();
+ this.clientConfig.quoteId = window.checkoutConfig.quoteData['entity_id'];
+ this.clientConfig.customerId = window.customerData.id;
+ this.clientConfig.merchantId = this.merchantId;
+ this.clientConfig.button = 0;
+ this.clientConfig.commit = true;
+
+ return this.clientConfig;
+ },
+
+ /**
+ * Adding logic to be triggered onClick action for smart buttons component
+ */
+ onClick: function () {
+ additionalValidators.validate();
+ this.selectPaymentMethod();
+ },
+
+ /**
+ * Adds error message
+ *
+ * @param {String} message
+ */
+ addError: function (message) {
+ messageList.addErrorMessage({
+ message: message
+ });
+ }
+ });
+});
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro/vault.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro/vault.js
index d0d72bf7dcd..a0f3d3867fe 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro/vault.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro/vault.js
@@ -2,12 +2,10 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-/*browser:true*/
-/*global define*/
+
define([
- 'jquery',
'Magento_Vault/js/view/payment/method-renderer/vault'
-], function ($, VaultComponent) {
+], function (VaultComponent) {
'use strict';
return VaultComponent.extend({
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-abstract.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-abstract.js
index d038f08c348..b01d0454b55 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-abstract.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-abstract.js
@@ -15,7 +15,7 @@ define([
return Component.extend({
defaults: {
- template: 'Magento_Paypal/payment/paypal-express-bml',
+ template: 'Magento_Paypal/payment/payflow-express-bml',
billingAgreement: ''
},
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-bml.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-bml.js
deleted file mode 100644
index 561b3c0e971..00000000000
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-bml.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-define([
- 'Magento_Paypal/js/view/payment/method-renderer/paypal-express-abstract'
-], function (Component) {
- 'use strict';
-
- return Component.extend({
- defaults: {
- template: 'Magento_Paypal/payment/paypal-express-bml'
- }
- });
-});
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/paypal-payments.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/paypal-payments.js
index 9eae0dfb45e..1628bbed8f1 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/paypal-payments.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/paypal-payments.js
@@ -19,10 +19,6 @@ define([
component: paypalExpress,
config: window.checkoutConfig.payment.paypalExpress.inContextConfig
},
- {
- type: 'paypal_express_bml',
- component: 'Magento_Paypal/js/view/payment/method-renderer/paypal-express-bml'
- },
{
type: 'payflow_express',
component: 'Magento_Paypal/js/view/payment/method-renderer/payflow-express'
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/review/actions/iframe.js b/app/code/Magento/Paypal/view/frontend/web/js/view/review/actions/iframe.js
index e181faf56e3..09dffc73baa 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/review/actions/iframe.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/review/actions/iframe.js
@@ -8,9 +8,8 @@
*/
define([
'uiComponent',
- 'ko',
'Magento_Paypal/js/model/iframe'
-], function (Component, ko, iframe) {
+], function (Component, iframe) {
'use strict';
return Component.extend({
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html
deleted file mode 100644
index 0f042824fe8..00000000000
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
index 562243decaa..5f321832523 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
@@ -4,41 +4,32 @@
* See COPYING.txt for license details.
*/
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/app/code/Magento/Persistent/Block/Header/Additional.php b/app/code/Magento/Persistent/Block/Header/Additional.php
index c740f5a3469..dfde2adf1e6 100644
--- a/app/code/Magento/Persistent/Block/Header/Additional.php
+++ b/app/code/Magento/Persistent/Block/Header/Additional.php
@@ -5,6 +5,10 @@
*/
namespace Magento\Persistent\Block\Header;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Persistent\Helper\Data;
+
/**
* Remember Me block
*
@@ -30,20 +34,37 @@ class Additional extends \Magento\Framework\View\Element\Html\Link
protected $customerRepository;
/**
- * Constructor
- *
+ * @var string
+ */
+ protected $_template = 'Magento_Persistent::additional.phtml';
+
+ /**
+ * @var Json
+ */
+ private $jsonSerializer;
+
+ /**
+ * @var Data
+ */
+ private $persistentHelper;
+
+ /**
* @param \Magento\Framework\View\Element\Template\Context $context
* @param \Magento\Customer\Helper\View $customerViewHelper
* @param \Magento\Persistent\Helper\Session $persistentSessionHelper
* @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
* @param array $data
+ * @param Json|null $jsonSerializer
+ * @param Data|null $persistentHelper
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
\Magento\Customer\Helper\View $customerViewHelper,
\Magento\Persistent\Helper\Session $persistentSessionHelper,
\Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
- array $data = []
+ array $data = [],
+ Json $jsonSerializer = null,
+ Data $persistentHelper = null
) {
$this->isScopePrivate = true;
$this->_customerViewHelper = $customerViewHelper;
@@ -51,6 +72,8 @@ public function __construct(
$this->customerRepository = $customerRepository;
parent::__construct($context, $data);
$this->_isScopePrivate = true;
+ $this->jsonSerializer = $jsonSerializer ?: ObjectManager::getInstance()->get(Json::class);
+ $this->persistentHelper = $persistentHelper ?: ObjectManager::getInstance()->get(Data::class);
}
/**
@@ -64,17 +87,26 @@ public function getHref()
}
/**
- * Render additional header html
+ * Get customer id.
*
- * @return string
+ * @return int
*/
- protected function _toHtml()
+ public function getCustomerId(): int
{
- if ($this->_persistentSessionHelper->getSession()->getCustomerId()) {
- return 'getLinkAttributes() . ' >' . __('Not you?')
- . '';
- }
+ return $this->_persistentSessionHelper->getSession()->getCustomerId();
+ }
- return '';
+ /**
+ * Get persistent config.
+ *
+ * @return string
+ */
+ public function getConfig(): string
+ {
+ return $this->jsonSerializer->serialize(
+ [
+ 'expirationLifetime' => $this->persistentHelper->getLifeTime(),
+ ]
+ );
}
}
diff --git a/app/code/Magento/Persistent/CustomerData/Persistent.php b/app/code/Magento/Persistent/CustomerData/Persistent.php
new file mode 100644
index 00000000000..5800e4e7aee
--- /dev/null
+++ b/app/code/Magento/Persistent/CustomerData/Persistent.php
@@ -0,0 +1,72 @@
+persistentSession = $persistentSession;
+ $this->customerViewHelper = $customerViewHelper;
+ $this->customerRepository = $customerRepository;
+ }
+
+ /**
+ * Get data.
+ *
+ * @return array
+ */
+ public function getSectionData(): array
+ {
+ if (!$this->persistentSession->isPersistent()) {
+ return [];
+ }
+
+ $customerId = $this->persistentSession->getSession()->getCustomerId();
+ if (!$customerId) {
+ return [];
+ }
+
+ $customer = $this->customerRepository->getById($customerId);
+
+ return [
+ 'fullname' => $this->customerViewHelper->getCustomerName($customer),
+ ];
+ }
+}
diff --git a/app/code/Magento/Persistent/Model/Observer.php b/app/code/Magento/Persistent/Model/Observer.php
index 53fe5f95531..81c2870071a 100644
--- a/app/code/Magento/Persistent/Model/Observer.php
+++ b/app/code/Magento/Persistent/Model/Observer.php
@@ -86,13 +86,8 @@ public function __construct(
*/
public function emulateWelcomeBlock($block)
{
- $customerName = $this->_customerViewHelper->getCustomerName(
- $this->customerRepository->getById($this->_persistentSession->getSession()->getCustomerId())
- );
+ $block->setWelcome(' ');
- $this->_applyAccountLinksPersistentData();
- $welcomeMessage = __('Welcome, %1!', $customerName);
- $block->setWelcome($welcomeMessage);
return $this;
}
diff --git a/app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php b/app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php
new file mode 100644
index 00000000000..be8998bc9be
--- /dev/null
+++ b/app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php
@@ -0,0 +1,43 @@
+persistentSession = $persistentSession;
+ }
+
+ /**
+ * Sets appropriate header if customer session is persistent.
+ *
+ * @param \Magento\Framework\App\Http\Context $subject
+ * @return mixed
+ */
+ public function beforeGetVaryString(\Magento\Framework\App\Http\Context $subject)
+ {
+ if ($this->persistentSession->isPersistent()) {
+ $subject->setValue('PERSISTENT', 1, 0);
+ }
+ }
+}
diff --git a/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
new file mode 100644
index 00000000000..293fa04d804
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Persistent/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Persistent/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
new file mode 100644
index 00000000000..c2220c33a60
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
new file mode 100644
index 00000000000..2b58e5c7bf6
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+ John1
+ Doe1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php b/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
index b88b02ab4cf..407dad05c3b 100644
--- a/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
@@ -34,44 +34,14 @@ class AdditionalTest extends \PHPUnit\Framework\TestCase
protected $contextMock;
/**
- * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $eventManagerMock;
+ private $jsonSerializerMock;
/**
- * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Persistent\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $scopeConfigMock;
-
- /**
- * @var \Magento\Framework\App\Cache\StateInterface|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $cacheStateMock;
-
- /**
- * @var \Magento\Framework\App\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $cacheMock;
-
- /**
- * @var \Magento\Framework\Session\SidResolverInterface|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $sidResolverMock;
-
- /**
- * @var \Magento\Framework\Session\SessionManagerInterface|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $sessionMock;
-
- /**
- * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $escaperMock;
-
- /**
- * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $urlBuilderMock;
+ private $persistentHelperMock;
/**
* @var \Magento\Persistent\Block\Header\Additional
@@ -93,17 +63,7 @@ protected function setUp()
{
$this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- $this->contextMock = $this->createPartialMock(\Magento\Framework\View\Element\Template\Context::class, [
- 'getEventManager',
- 'getScopeConfig',
- 'getCacheState',
- 'getCache',
- 'getInlineTranslation',
- 'getSidResolver',
- 'getSession',
- 'getEscaper',
- 'getUrlBuilder'
- ]);
+ $this->contextMock = $this->createPartialMock(\Magento\Framework\View\Element\Template\Context::class, []);
$this->customerViewHelperMock = $this->createMock(\Magento\Customer\Helper\View::class);
$this->persistentSessionHelperMock = $this->createPartialMock(
\Magento\Persistent\Helper\Session::class,
@@ -119,103 +79,14 @@ protected function setUp()
['getById']
);
- $this->eventManagerMock = $this->getMockForAbstractClass(
- \Magento\Framework\Event\ManagerInterface::class,
- [],
- '',
- false,
- true,
- true,
- ['dispatch']
- );
- $this->scopeConfigMock = $this->getMockForAbstractClass(
- \Magento\Framework\App\Config\ScopeConfigInterface::class,
- [],
- '',
- false,
- true,
- true,
- ['getValue']
- );
- $this->cacheStateMock = $this->getMockForAbstractClass(
- \Magento\Framework\App\Cache\StateInterface::class,
- [],
- '',
- false,
- true,
- true,
- ['isEnabled']
+ $this->jsonSerializerMock = $this->createPartialMock(
+ \Magento\Framework\Serialize\Serializer\Json::class,
+ ['serialize']
);
- $this->cacheMock = $this->getMockForAbstractClass(
- \Magento\Framework\App\CacheInterface::class,
- [],
- '',
- false,
- true,
- true,
- ['load']
+ $this->persistentHelperMock = $this->createPartialMock(
+ \Magento\Persistent\Helper\Data::class,
+ ['getLifeTime']
);
- $this->sidResolverMock = $this->getMockForAbstractClass(
- \Magento\Framework\Session\SidResolverInterface::class,
- [],
- '',
- false,
- true,
- true,
- ['getSessionIdQueryParam']
- );
- $this->sessionMock = $this->getMockForAbstractClass(
- \Magento\Framework\Session\SessionManagerInterface::class,
- [],
- '',
- false,
- true,
- true,
- ['getSessionId']
- );
- $this->escaperMock = $this->getMockForAbstractClass(
- \Magento\Framework\Escaper::class,
- [],
- '',
- false,
- true,
- true,
- ['escapeHtml']
- );
- $this->urlBuilderMock = $this->getMockForAbstractClass(
- \Magento\Framework\UrlInterface::class,
- [],
- '',
- false,
- true,
- true,
- ['getUrl']
- );
-
- $this->contextMock->expects($this->once())
- ->method('getEventManager')
- ->willReturn($this->eventManagerMock);
- $this->contextMock->expects($this->once())
- ->method('getScopeConfig')
- ->willReturn($this->scopeConfigMock);
- $this->contextMock->expects($this->once())
- ->method('getCacheState')
- ->willReturn($this->cacheStateMock);
- $this->contextMock->expects($this->once())
- ->method('getCache')
- ->willReturn($this->cacheMock);
- $this->contextMock->expects($this->once())
- ->method('getSidResolver')
- ->willReturn($this->sidResolverMock);
- $this->contextMock->expects($this->once())
- ->method('getSession')
- ->willReturn($this->sessionMock);
- $this->contextMock->expects($this->once())
- ->method('getEscaper')
- ->willReturn($this->escaperMock);
- $this->contextMock->expects($this->once())
- ->method('getUrlBuilder')
- ->willReturn($this->urlBuilderMock);
$this->additional = $this->objectManager->getObject(
\Magento\Persistent\Block\Header\Additional::class,
@@ -224,91 +95,48 @@ protected function setUp()
'customerViewHelper' => $this->customerViewHelperMock,
'persistentSessionHelper' => $this->persistentSessionHelperMock,
'customerRepository' => $this->customerRepositoryMock,
- 'data' => []
+ 'data' => [],
+ 'jsonSerializer' => $this->jsonSerializerMock,
+ 'persistentHelper' => $this->persistentHelperMock,
]
);
}
/**
- * Run test toHtml method
- *
- * @param bool $customerId
* @return void
- *
- * @dataProvider dataProviderToHtml
*/
- public function testToHtml($customerId)
+ public function testGetCustomerId(): void
{
- $cacheData = false;
- $idQueryParam = 'id-query-param';
- $sessionId = 'session-id';
-
- $this->additional->setData('cache_lifetime', 789);
- $this->additional->setData('cache_key', 'cache-key');
-
- $this->eventManagerMock->expects($this->at(0))
- ->method('dispatch')
- ->with('view_block_abstract_to_html_before', ['block' => $this->additional]);
- $this->eventManagerMock->expects($this->at(1))
- ->method('dispatch')
- ->with('view_block_abstract_to_html_after');
- $this->scopeConfigMock->expects($this->once())
- ->method('getValue')
- ->with(
- 'advanced/modules_disable_output/Magento_Persistent',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
- )->willReturn(false);
-
- // get cache
- $this->cacheStateMock->expects($this->at(0))
- ->method('isEnabled')
- ->with(\Magento\Persistent\Block\Header\Additional::CACHE_GROUP)
- ->willReturn(true);
- // save cache
- $this->cacheStateMock->expects($this->at(1))
- ->method('isEnabled')
- ->with(\Magento\Persistent\Block\Header\Additional::CACHE_GROUP)
- ->willReturn(false);
-
- $this->cacheMock->expects($this->once())
- ->method('load')
- ->willReturn($cacheData);
- $this->sidResolverMock->expects($this->never())
- ->method('getSessionIdQueryParam')
- ->with($this->sessionMock)
- ->willReturn($idQueryParam);
- $this->sessionMock->expects($this->never())
- ->method('getSessionId')
- ->willReturn($sessionId);
-
- // call protected _toHtml method
+ $customerId = 1;
+ /** @var \Magento\Persistent\Model\Session|\PHPUnit_Framework_MockObject_MockObject $sessionMock */
$sessionMock = $this->createPartialMock(\Magento\Persistent\Model\Session::class, ['getCustomerId']);
-
- $this->persistentSessionHelperMock->expects($this->atLeastOnce())
- ->method('getSession')
- ->willReturn($sessionMock);
-
- $sessionMock->expects($this->atLeastOnce())
+ $sessionMock->expects($this->once())
->method('getCustomerId')
->willReturn($customerId);
+ $this->persistentSessionHelperMock->expects($this->once())
+ ->method('getSession')
+ ->willReturn($sessionMock);
- if ($customerId) {
- $this->assertEquals('Not you?', $this->additional->toHtml());
- } else {
- $this->assertEquals('', $this->additional->toHtml());
- }
+ $this->assertEquals($customerId, $this->additional->getCustomerId());
}
/**
- * Data provider for dataProviderToHtml method
- *
- * @return array
+ * @return void
*/
- public function dataProviderToHtml()
+ public function testGetConfig(): void
{
- return [
- ['customerId' => 2],
- ['customerId' => null],
- ];
+ $lifeTime = 500;
+ $arrayToSerialize = ['expirationLifetime' => $lifeTime];
+ $serializedArray = '{"expirationLifetime":' . $lifeTime . '}';
+
+ $this->persistentHelperMock->expects($this->once())
+ ->method('getLifeTime')
+ ->willReturn($lifeTime);
+ $this->jsonSerializerMock->expects($this->once())
+ ->method('serialize')
+ ->with($arrayToSerialize)
+ ->willReturn($serializedArray);
+
+ $this->assertEquals($serializedArray, $this->additional->getConfig());
}
}
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php
index 7008a9eb25e..6d4db70adc6 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php
@@ -80,31 +80,18 @@ protected function setUp()
);
}
- public function testEmulateWelcomeBlock()
+ /**
+ * @return void
+ */
+ public function testEmulateWelcomeBlock(): void
{
- $customerId = 1;
- $customerName = 'Test Customer Name';
- $welcomeMessage = __('Welcome, %1!', $customerName);
- $customerMock = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
+ $welcomeMessage = __(' ');
$block = $this->getMockBuilder(\Magento\Framework\View\Element\AbstractBlock::class)
->disableOriginalConstructor()
->setMethods(['setWelcome'])
->getMock();
- $headerAdditionalBlock = $this->getMockBuilder(\Magento\Framework\View\Element\AbstractBlock::class)
- ->disableOriginalConstructor()
- ->getMock();
- $this->persistentSessionMock->expects($this->once())->method('getSession')->willReturn($this->sessionMock);
- $this->sessionMock->expects($this->once())->method('getCustomerId')->willReturn($customerId);
- $this->customerRepositoryMock
- ->expects($this->once())
- ->method('getById')
- ->with($customerId)->willReturn($customerMock);
- $this->customerViewHelperMock->expects($this->once())->method('getCustomerName')->willReturn($customerName);
- $this->layoutMock->expects($this->once())
- ->method('getBlock')
- ->with('header.additional')
- ->willReturn($headerAdditionalBlock);
$block->expects($this->once())->method('setWelcome')->with($welcomeMessage);
+
$this->observer->emulateWelcomeBlock($block);
}
}
diff --git a/app/code/Magento/Persistent/etc/di.xml b/app/code/Magento/Persistent/etc/di.xml
index f49d4361acb..c28426b4f25 100644
--- a/app/code/Magento/Persistent/etc/di.xml
+++ b/app/code/Magento/Persistent/etc/di.xml
@@ -12,4 +12,7 @@
+
+
diff --git a/app/code/Magento/Persistent/etc/frontend/di.xml b/app/code/Magento/Persistent/etc/frontend/di.xml
index f976f4de79c..3c33f8a51c4 100644
--- a/app/code/Magento/Persistent/etc/frontend/di.xml
+++ b/app/code/Magento/Persistent/etc/frontend/di.xml
@@ -35,4 +35,18 @@
+
+
+
+ - Magento\Persistent\CustomerData\Persistent
+
+
+
+
+
+
+ - persistent
+
+
+
diff --git a/app/code/Magento/Persistent/etc/frontend/sections.xml b/app/code/Magento/Persistent/etc/frontend/sections.xml
new file mode 100644
index 00000000000..16b44c502fc
--- /dev/null
+++ b/app/code/Magento/Persistent/etc/frontend/sections.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Persistent/view/frontend/requirejs-config.js b/app/code/Magento/Persistent/view/frontend/requirejs-config.js
new file mode 100644
index 00000000000..e30e07c454b
--- /dev/null
+++ b/app/code/Magento/Persistent/view/frontend/requirejs-config.js
@@ -0,0 +1,14 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+ config: {
+ mixins: {
+ 'Magento_Customer/js/customer-data': {
+ 'Magento_Persistent/js/view/customer-data-mixin': true
+ }
+ }
+ }
+};
diff --git a/app/code/Magento/Persistent/view/frontend/templates/additional.phtml b/app/code/Magento/Persistent/view/frontend/templates/additional.phtml
new file mode 100644
index 00000000000..28dce5dc23c
--- /dev/null
+++ b/app/code/Magento/Persistent/view/frontend/templates/additional.phtml
@@ -0,0 +1,21 @@
+
+getCustomerId()) :?>
+
+ getLinkAttributes()?>>escapeHtml(__('Not you?'));?>
+
+
+
+
diff --git a/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js b/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
new file mode 100644
index 00000000000..7ace6e60d1c
--- /dev/null
+++ b/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
@@ -0,0 +1,55 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'jquery',
+ 'mage/translate',
+ 'Magento_Customer/js/customer-data'
+], function ($, $t, customerData) {
+ 'use strict';
+
+ return {
+ /**
+ * Init.
+ */
+ init: function () {
+ var persistent = customerData.get('persistent');
+
+ if (persistent().fullname === undefined) {
+ customerData.get('persistent').subscribe(this.replacePersistentWelcome);
+ } else {
+ this.replacePersistentWelcome();
+ }
+ },
+
+ /**
+ * Replace welcome message for customer with persistent cookie.
+ */
+ replacePersistentWelcome: function () {
+ var persistent = customerData.get('persistent'),
+ welcomeElems;
+
+ if (persistent().fullname !== undefined) {
+ welcomeElems = $('li.greet.welcome > span.not-logged-in');
+
+ if (welcomeElems.length) {
+ $(welcomeElems).each(function () {
+ var html = $t('Welcome, %1!').replace('%1', persistent().fullname);
+
+ $(this).attr('data-bind', html);
+ $(this).html(html);
+ });
+ }
+ }
+ },
+
+ /**
+ * @constructor
+ */
+ 'Magento_Persistent/js/view/additional-welcome': function () {
+ this.init();
+ }
+ };
+});
diff --git a/app/code/Magento/Persistent/view/frontend/web/js/view/customer-data-mixin.js b/app/code/Magento/Persistent/view/frontend/web/js/view/customer-data-mixin.js
new file mode 100644
index 00000000000..855404c6f6f
--- /dev/null
+++ b/app/code/Magento/Persistent/view/frontend/web/js/view/customer-data-mixin.js
@@ -0,0 +1,51 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+ 'jquery',
+ 'mage/utils/wrapper'
+], function ($, wrapper) {
+ 'use strict';
+
+ var mixin = {
+
+ /**
+ * Check if persistent section is expired due to lifetime.
+ *
+ * @param {Function} originFn - Original method.
+ * @return {Array}
+ */
+ getExpiredSectionNames: function (originFn) {
+ var expiredSections = originFn(),
+ storage = $.initNamespaceStorage('mage-cache-storage').localStorage,
+ currentTimestamp = Math.floor(Date.now() / 1000),
+ persistentIndex = expiredSections.indexOf('persistent'),
+ persistentLifeTime = 0,
+ sectionData;
+
+ if (window.persistent !== undefined && window.persistent.expirationLifetime !== undefined) {
+ persistentLifeTime = window.persistent.expirationLifetime;
+ }
+
+ if (persistentIndex !== -1) {
+ sectionData = storage.get('persistent');
+
+ if (typeof sectionData === 'object' &&
+ sectionData['data_id'] + persistentLifeTime >= currentTimestamp
+ ) {
+ expiredSections.splice(persistentIndex, 1);
+ }
+ }
+
+ return expiredSections;
+ }
+ };
+
+ /**
+ * Override default customer-data.getExpiredSectionNames().
+ */
+ return function (target) {
+ return wrapper.extend(target, mixin);
+ };
+});
diff --git a/app/code/Magento/ProductAlert/Model/Email.php b/app/code/Magento/ProductAlert/Model/Email.php
index 7aee4ca0124..3351166aa6a 100644
--- a/app/code/Magento/ProductAlert/Model/Email.php
+++ b/app/code/Magento/ProductAlert/Model/Email.php
@@ -39,6 +39,8 @@
*
* @api
* @since 100.0.2
+ * @method int getStoreId()
+ * @method $this setStoreId()
*/
class Email extends AbstractModel
{
@@ -136,11 +138,6 @@ class Email extends AbstractModel
*/
protected $_customerHelper;
- /**
- * @var int
- */
- private $storeId = null;
-
/**
* @param Context $context
* @param Registry $registry
@@ -215,18 +212,6 @@ public function setWebsite(\Magento\Store\Model\Website $website)
return $this;
}
- /**
- * Set store id from product alert.
- *
- * @param int $storeId
- * @return $this
- */
- public function setStoreId(int $storeId)
- {
- $this->storeId = $storeId;
- return $this;
- }
-
/**
* Set website id
*
@@ -357,7 +342,7 @@ public function send()
return false;
}
- $storeId = $this->storeId ?: (int) $this->_customer->getStoreId();
+ $storeId = $this->getStoreId() ?: (int) $this->_customer->getStoreId();
$store = $this->getStore($storeId);
$this->_appEmulation->startEnvironmentEmulation($storeId);
diff --git a/app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.php b/app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.php
index 710ede8ecef..c7b3d59138e 100644
--- a/app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.php
+++ b/app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.php
@@ -5,6 +5,8 @@
*/
namespace Magento\ProductAlert\Model\ResourceModel;
+use Magento\Framework\Model\AbstractModel;
+
/**
* Product alert for back in abstract resource model
*
@@ -15,13 +17,13 @@ abstract class AbstractResource extends \Magento\Framework\Model\ResourceModel\D
/**
* Retrieve alert row by object parameters
*
- * @param \Magento\Framework\Model\AbstractModel $object
+ * @param AbstractModel $object
* @return array|false
*/
- protected function _getAlertRow(\Magento\Framework\Model\AbstractModel $object)
+ protected function _getAlertRow(AbstractModel $object)
{
$connection = $this->getConnection();
- if ($object->getCustomerId() && $object->getProductId() && $object->getWebsiteId()) {
+ if ($this->isExistAllBindIds($object)) {
$select = $connection->select()->from(
$this->getMainTable()
)->where(
@@ -30,24 +32,41 @@ protected function _getAlertRow(\Magento\Framework\Model\AbstractModel $object)
'product_id = :product_id'
)->where(
'website_id = :website_id'
+ )->where(
+ 'store_id = :store_id'
);
$bind = [
':customer_id' => $object->getCustomerId(),
':product_id' => $object->getProductId(),
':website_id' => $object->getWebsiteId(),
+ ':store_id' => $object->getStoreId()
];
return $connection->fetchRow($select, $bind);
}
return false;
}
+ /**
+ * Is exists all bind ids.
+ *
+ * @param AbstractModel $object
+ * @return bool
+ */
+ private function isExistAllBindIds(AbstractModel $object): bool
+ {
+ return ($object->getCustomerId()
+ && $object->getProductId()
+ && $object->getWebsiteId()
+ && $object->getStoreId());
+ }
+
/**
* Load object data by parameters
*
- * @param \Magento\Framework\Model\AbstractModel $object
+ * @param AbstractModel $object
* @return $this
*/
- public function loadByParam(\Magento\Framework\Model\AbstractModel $object)
+ public function loadByParam(AbstractModel $object)
{
$row = $this->_getAlertRow($object);
if ($row) {
@@ -59,13 +78,13 @@ public function loadByParam(\Magento\Framework\Model\AbstractModel $object)
/**
* Delete all customer alerts on website
*
- * @param \Magento\Framework\Model\AbstractModel $object
+ * @param AbstractModel $object
* @param int $customerId
* @param int $websiteId
* @return $this
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
- public function deleteCustomer(\Magento\Framework\Model\AbstractModel $object, $customerId, $websiteId = null)
+ public function deleteCustomer(AbstractModel $object, $customerId, $websiteId = null)
{
$connection = $this->getConnection();
$where = [];
diff --git a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
index ce1493b349a..42407ca6be0 100644
--- a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
+++ b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
@@ -19,6 +19,8 @@ class CreateHandler extends AbstractHandler
const ADDITIONAL_STORE_DATA_KEY = 'additional_store_data';
/**
+ * Execute before Plugin
+ *
* @param \Magento\Catalog\Model\Product\Gallery\CreateHandler $mediaGalleryCreateHandler
* @param \Magento\Catalog\Model\Product $product
* @param array $arguments
@@ -44,6 +46,8 @@ public function beforeExecute(
}
/**
+ * Execute plugin
+ *
* @param \Magento\Catalog\Model\Product\Gallery\CreateHandler $mediaGalleryCreateHandler
* @param \Magento\Catalog\Model\Product $product
* @return \Magento\Catalog\Model\Product
@@ -58,6 +62,9 @@ public function afterExecute(
);
if (!empty($mediaCollection)) {
+ if ($product->getIsDuplicate() === true) {
+ $mediaCollection = $this->makeAllNewVideos($product->getId(), $mediaCollection);
+ }
$newVideoCollection = $this->collectNewVideos($mediaCollection);
$this->saveVideoData($newVideoCollection, 0);
@@ -70,6 +77,8 @@ public function afterExecute(
}
/**
+ * Saves video data
+ *
* @param array $videoDataCollection
* @param int $storeId
* @return void
@@ -83,6 +92,8 @@ protected function saveVideoData(array $videoDataCollection, $storeId)
}
/**
+ * Saves additioanal video data
+ *
* @param array $videoDataCollection
* @return void
*/
@@ -99,6 +110,8 @@ protected function saveAdditionalStoreData(array $videoDataCollection)
}
/**
+ * Saves video data
+ *
* @param array $item
* @return void
*/
@@ -111,6 +124,8 @@ protected function saveVideoValuesItem(array $item)
}
/**
+ * Excludes current store data
+ *
* @param array $mediaCollection
* @param int $currentStoreId
* @return array
@@ -126,6 +141,8 @@ function ($item) use ($currentStoreId) {
}
/**
+ * Prepare video data for saving
+ *
* @param array $rowData
* @return array
*/
@@ -143,6 +160,8 @@ protected function prepareVideoRowDataForSave(array $rowData)
}
/**
+ * Loads video data
+ *
* @param array $mediaCollection
* @param int $excludedStore
* @return array
@@ -165,6 +184,8 @@ protected function loadStoreViewVideoData(array $mediaCollection, $excludedStore
}
/**
+ * Collect video data
+ *
* @param array $mediaCollection
* @return array
*/
@@ -182,6 +203,8 @@ protected function collectVideoData(array $mediaCollection)
}
/**
+ * Extract video data
+ *
* @param array $rowData
* @return array
*/
@@ -194,6 +217,8 @@ protected function extractVideoDataFromRowData(array $rowData)
}
/**
+ * Collect items for additional data adding
+ *
* @param array $mediaCollection
* @return array
*/
@@ -209,6 +234,8 @@ protected function collectVideoEntriesIdsToAdditionalLoad(array $mediaCollection
}
/**
+ * Add additional data
+ *
* @param array $mediaCollection
* @param array $data
* @return array
@@ -229,6 +256,8 @@ protected function addAdditionalStoreData(array $mediaCollection, array $data):
}
/**
+ * Creates additional video data
+ *
* @param array $storeData
* @param int $valueId
* @return array
@@ -247,6 +276,8 @@ protected function createAdditionalStoreDataCollection(array $storeData, $valueI
}
/**
+ * Collect new videos
+ *
* @param array $mediaCollection
* @return array
*/
@@ -262,6 +293,8 @@ private function collectNewVideos(array $mediaCollection): array
}
/**
+ * Checks if gallery item is video
+ *
* @param array $item
* @return bool
*/
@@ -273,6 +306,8 @@ private function isVideoItem(array $item): bool
}
/**
+ * Checks if video is new
+ *
* @param array $item
* @return bool
*/
@@ -282,4 +317,23 @@ private function isNewVideo(array $item): bool
|| empty($item['video_url_default'])
|| empty($item['video_title_default']);
}
+
+ /**
+ * Mark all videos as new
+ *
+ * @param int $entityId
+ * @param array $mediaCollection
+ * @return array
+ */
+ private function makeAllNewVideos($entityId, array $mediaCollection): array
+ {
+ foreach ($mediaCollection as $key => $video) {
+ if ($this->isVideoItem($video)) {
+ unset($video['video_url_default'], $video['video_title_default']);
+ $video['entity_id'] = $entityId;
+ $mediaCollection[$key] = $video;
+ }
+ }
+ return $mediaCollection;
+ }
}
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
index bd7cc0cdf5b..2b5f87f78d5 100644
--- a/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+
+
-
-
-
-
+
-
-
-
-
-
+
{{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html index bc7c079d7f2..b7411d80d2b 100644 --- a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html +++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html @@ -10,7 +10,7 @@ "var creditmemo.increment_id":"Credit Memo Id", "var billing.getName()":"Guest Customer Name", "var order.increment_id":"Order Id", -"var order.getStatusLabel()":"Order Status" +"var order.getFrontendStatusLabel()":"Order Status" } @--> {{template config_path="design/email/header_template"}} @@ -23,7 +23,7 @@ "Your order #%increment_id has been updated with a status of %order_status." increment_id=$order.increment_id - order_status=$order.getStatusLabel() + order_status=$order.getFrontendStatusLabel() |raw}}diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_update.html b/app/code/Magento/Sales/view/frontend/email/invoice_update.html index cafdd65ff52..4043e59f9d7 100644 --- a/app/code/Magento/Sales/view/frontend/email/invoice_update.html +++ b/app/code/Magento/Sales/view/frontend/email/invoice_update.html @@ -11,7 +11,7 @@ "var comment":"Invoice Comment", "var invoice.increment_id":"Invoice Id", "var order.increment_id":"Order Id", -"var order.getStatusLabel()":"Order Status" +"var order.getFrontendStatusLabel()":"Order Status" } @--> {{template config_path="design/email/header_template"}} @@ -24,7 +24,7 @@ "Your order #%increment_id has been updated with a status of %order_status." increment_id=$order.increment_id - order_status=$order.getStatusLabel() + order_status=$order.getFrontendStatusLabel() |raw}}
{{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html b/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html index fafb533301e..40cdec7fb4c 100644 --- a/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html +++ b/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html @@ -10,7 +10,7 @@ "var comment":"Invoice Comment", "var invoice.increment_id":"Invoice Id", "var order.increment_id":"Order Id", -"var order.getStatusLabel()":"Order Status" +"var order.getFrontendStatusLabel()":"Order Status" } @--> {{template config_path="design/email/header_template"}} @@ -23,7 +23,7 @@ "Your order #%increment_id has been updated with a status of %order_status." increment_id=$order.increment_id - order_status=$order.getStatusLabel() + order_status=$order.getFrontendStatusLabel() |raw}}diff --git a/app/code/Magento/Sales/view/frontend/email/order_update.html b/app/code/Magento/Sales/view/frontend/email/order_update.html index a709a9ed8a7..a8f0068b70e 100644 --- a/app/code/Magento/Sales/view/frontend/email/order_update.html +++ b/app/code/Magento/Sales/view/frontend/email/order_update.html @@ -10,7 +10,7 @@ "var order.getCustomerName()":"Customer Name", "var comment":"Order Comment", "var order.increment_id":"Order Id", -"var order.getStatusLabel()":"Order Status" +"var order.getFrontendStatusLabel()":"Order Status" } @--> {{template config_path="design/email/header_template"}} @@ -23,7 +23,7 @@ "Your order #%increment_id has been updated with a status of %order_status." increment_id=$order.increment_id - order_status=$order.getStatusLabel() + order_status=$order.getFrontendStatusLabel() |raw}}
{{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
diff --git a/app/code/Magento/Sales/view/frontend/email/order_update_guest.html b/app/code/Magento/Sales/view/frontend/email/order_update_guest.html index 5a39b01810c..749fa3b60ad 100644 --- a/app/code/Magento/Sales/view/frontend/email/order_update_guest.html +++ b/app/code/Magento/Sales/view/frontend/email/order_update_guest.html @@ -9,7 +9,7 @@ "var billing.getName()":"Guest Customer Name", "var comment":"Order Comment", "var order.increment_id":"Order Id", -"var order.getStatusLabel()":"Order Status" +"var order.getFrontendStatusLabel()":"Order Status" } @--> {{template config_path="design/email/header_template"}} @@ -22,7 +22,7 @@ "Your order #%increment_id has been updated with a status of %order_status." increment_id=$order.increment_id - order_status=$order.getStatusLabel() + order_status=$order.getFrontendStatusLabel() |raw}}diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_update.html b/app/code/Magento/Sales/view/frontend/email/shipment_update.html index 6d9efc37004..9d1c9328754 100644 --- a/app/code/Magento/Sales/view/frontend/email/shipment_update.html +++ b/app/code/Magento/Sales/view/frontend/email/shipment_update.html @@ -10,7 +10,7 @@ "var order.getCustomerName()":"Customer Name", "var comment":"Order Comment", "var order.increment_id":"Order Id", -"var order.getStatusLabel()":"Order Status", +"var order.getFrontendStatusLabel()":"Order Status", "var shipment.increment_id":"Shipment Id" } @--> {{template config_path="design/email/header_template"}} @@ -24,7 +24,7 @@ "Your order #%increment_id has been updated with a status of %order_status." increment_id=$order.increment_id - order_status=$order.getStatusLabel() + order_status=$order.getFrontendStatusLabel() |raw}}
{{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html index 4896a00b7bc..0d2dccd3377 100644 --- a/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html +++ b/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html @@ -9,7 +9,7 @@ "var billing.getName()":"Guest Customer Name", "var comment":"Order Comment", "var order.increment_id":"Order Id", -"var order.getStatusLabel()":"Order Status", +"var order.getFrontendStatusLabel()":"Order Status", "var shipment.increment_id":"Shipment Id" } @--> {{template config_path="design/email/header_template"}} @@ -23,7 +23,7 @@ "Your order #%increment_id has been updated with a status of %order_status." increment_id=$order.increment_id - order_status=$order.getStatusLabel() + order_status=$order.getFrontendStatusLabel() |raw}}
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
index 9f7146ab084..f1cd5f2b998 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
@@ -9,22 +9,23 @@
?>
getShipment() ?>
getOrder() ?>
-getAllTracks()): ?>
-
-
| escapeHtml($_item->getTitle()) ?>: | -escapeHtml($_item->getNumber()) ?> | -
-