From 77a2260e0bba3e3df66cd5db560da78fe3413a64 Mon Sep 17 00:00:00 2001 From: Ievgenii Gryshkun Date: Fri, 18 Jan 2019 10:31:27 +0200 Subject: [PATCH 1/3] magento:magento2 -Backport. Success message is not showing when creating invoice & shipment simultaniously #19942 --- .../Sales/view/frontend/email/shipment_new.html | 2 +- .../view/frontend/email/shipment_new_guest.html | 2 +- .../layout/sales_email_order_shipment_track.xml | 13 +++++++++++++ .../luma/Magento_Sales/email/shipment_new.html | 2 +- .../Magento_Sales/email/shipment_new_guest.html | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new.html b/app/code/Magento/Sales/view/frontend/email/shipment_new.html index 8af49f322c682..84f5acb29ea3b 100644 --- a/app/code/Magento/Sales/view/frontend/email/shipment_new.html +++ b/app/code/Magento/Sales/view/frontend/email/shipment_new.html @@ -53,7 +53,7 @@

{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship {{/depend}} - {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}} + {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html index df1677f56a500..bb181126724da 100644 --- a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html +++ b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html @@ -51,7 +51,7 @@

{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship

{{/depend}} - {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}} + {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml new file mode 100644 index 0000000000000..91414663951d3 --- /dev/null +++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html index 8c4084fcaf496..e467aa843e2f4 100644 --- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html +++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html @@ -51,7 +51,7 @@

{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship

{{/depend}} - {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}} + {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html index 68f1886986c5b..385110f8f037e 100644 --- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html +++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html @@ -49,7 +49,7 @@

{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship

{{/depend}} - {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}} + {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
From 8e04a95b3a8e81464e91fd197c73b01b3b736118 Mon Sep 17 00:00:00 2001 From: Javier Villanueva Date: Fri, 22 Mar 2019 15:54:05 +0000 Subject: [PATCH 2/3] Trigger contentUpdate on reviews load --- app/code/Magento/Review/view/frontend/web/js/process-reviews.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Review/view/frontend/web/js/process-reviews.js b/app/code/Magento/Review/view/frontend/web/js/process-reviews.js index d1c40959e3ec2..88c61fa38af34 100644 --- a/app/code/Magento/Review/view/frontend/web/js/process-reviews.js +++ b/app/code/Magento/Review/view/frontend/web/js/process-reviews.js @@ -20,7 +20,7 @@ define([ showLoader: false, loaderContext: $('.product.data.items') }).done(function (data) { - $('#product-review-container').html(data); + $('#product-review-container').html(data).trigger('contentUpdated'); $('[data-role="product-review"] .pages a').each(function (index, element) { $(element).click(function (event) { //eslint-disable-line max-nested-callbacks processReviews($(element).attr('href'), true); From 0b0fc92a7e650dec0c94d56e01f7106304a4f67c Mon Sep 17 00:00:00 2001 From: Pieter Hoste Date: Sat, 15 Sep 2018 15:23:08 +0200 Subject: [PATCH 3/3] Backport for Magento 2.2 - Fixes variables in configuration not being replaced with actual values in the backend form fields. (cherry picked from commit a8f17290363aa157eb1ec77984b3df2201a97ea9) --- app/code/Magento/Config/Block/System/Config/Form.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php index a05151153daa2..63a2b811f93ec 100644 --- a/app/code/Magento/Config/Block/System/Config/Form.php +++ b/app/code/Magento/Config/Block/System/Config/Form.php @@ -423,6 +423,10 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie $backendModel = $field->getBackendModel(); // Backend models which implement ProcessorInterface are processed by ScopeConfigInterface if (!$backendModel instanceof ProcessorInterface) { + if (array_key_exists($path, $this->_configData)) { + $data = $this->_configData[$path]; + } + $backendModel->setPath($path) ->setValue($data) ->setWebsite($this->getWebsiteCode())