From 2e33a0bc5ca333e6846fd8e483faa398f85788f4 Mon Sep 17 00:00:00 2001 From: Magento EngCom Team Date: Tue, 23 Jan 2018 10:49:29 -0600 Subject: [PATCH 01/10] :arrow_double_up: Forwardport of magento/magento2#11127 to 2.3-develop branch Applied pull request patch https://github.com/magento/magento2/pull/11127.patch (created by @niccifor) based on commit(s): 1. 7d5fc2512cd21bd8e017ad94e4fbd1a04c3257ac --- app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php b/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php index 8c018ecee544b..f600c65e05f52 100644 --- a/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php +++ b/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php @@ -43,6 +43,7 @@ public function getOrderItemId() public function setOrderItemId($orderItemId) { $this->orderItemId = $orderItemId; + return $this; } /** @@ -59,6 +60,7 @@ public function getQty() public function setQty($qty) { $this->qty = $qty; + return $this; } /** From 6ff253472a7f3cf8d262b1bccf76f70f38b01db2 Mon Sep 17 00:00:00 2001 From: Magento EngCom Team Date: Tue, 23 Jan 2018 10:49:38 -0600 Subject: [PATCH 02/10] :arrow_double_up: Forwardport of magento/magento2#11138 to 2.3-develop branch Applied pull request patch https://github.com/magento/magento2/pull/11138.patch (created by @jokeputs) based on commit(s): 1. 58d96ae476668625d285d88f77fa9b8f29799a33 --- .../Magento/Store/Model/Address/Renderer.php | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Store/Model/Address/Renderer.php b/app/code/Magento/Store/Model/Address/Renderer.php index 1f44b9dcec3e3..1d0fdd7284848 100644 --- a/app/code/Magento/Store/Model/Address/Renderer.php +++ b/app/code/Magento/Store/Model/Address/Renderer.php @@ -15,6 +15,12 @@ */ class Renderer { + const DEFAULT_TEMPLATE = "{{var name}}\n" . + "{{var street_line1}}\n" . + "{{depend street_line2}}{{var street_line2}}\n{{/depend}}" . + "{{depend city}}{{var city}},{{/depend}} {{var region}} {{depend postcode}}{{var postcode}},{{/depend}}\n" . + "{{var country}}"; + /** * @var EventManager */ @@ -25,18 +31,26 @@ class Renderer */ protected $filterManager; + /** + * @var string + */ + private $template; + /** * Constructor * * @param EventManager $eventManager * @param FilterManager $filterManager + * @param string $template */ public function __construct( EventManager $eventManager, - FilterManager $filterManager + FilterManager $filterManager, + $template = self::DEFAULT_TEMPLATE ) { $this->eventManager = $eventManager; $this->filterManager = $filterManager; + $this->template = $template; } /** @@ -50,9 +64,7 @@ public function format(DataObject $storeInfo, $type = 'html') { $this->eventManager->dispatch('store_address_format', ['type' => $type, 'store_info' => $storeInfo]); $address = $this->filterManager->template( - "{{var name}}\n{{var street_line1}}\n{{depend street_line2}}{{var street_line2}}\n{{/depend}}" . - "{{depend city}}{{var city}},{{/depend}} {{var region}} {{depend postcode}}{{var postcode}},{{/depend}}\n" . - "{{var country}}", + $this->template, ['variables' => $storeInfo->getData()] ); From 2817416f0a46608c3de49ae3d3b118c9818ec70c Mon Sep 17 00:00:00 2001 From: Magento EngCom Team Date: Tue, 23 Jan 2018 10:49:47 -0600 Subject: [PATCH 03/10] :arrow_double_up: Forwardport of magento/magento2#11134 to 2.3-develop branch Applied pull request patch https://github.com/magento/magento2/pull/11134.patch (created by @Zifius) based on commit(s): 1. 70379e3017df257cff1b418fd7c3bbfe123078a8 Fixed GitHub Issues in 2.3-develop branch: - magento/magento2#10775: 404 Forbidden sounds not right (reported by @irinikp) --- app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php index e8251b5be6030..ce59d2fd48e5a 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php @@ -34,7 +34,7 @@ public function execute() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); - $resultPage->setStatusHeader(404, '1.1', 'Forbidden'); + $resultPage->setStatusHeader(404, '1.1', 'Not Found'); $resultPage->setHeader('Status', '404 File not found'); $resultPage->addHandle('adminhtml_noroute'); return $resultPage; From 9701bb7dafc44e5717596607deedb583d25be537 Mon Sep 17 00:00:00 2001 From: Magento EngCom Team Date: Tue, 23 Jan 2018 10:49:56 -0600 Subject: [PATCH 04/10] :arrow_double_up: Forwardport of magento/magento2#11246 to 2.3-develop branch Applied pull request patch https://github.com/magento/magento2/pull/11246.patch (created by @crissanclick) based on commit(s): 1. 79f9c8ae294263386b08aaf0b84c293dae64f585 2. 154dd01fc8015ec3493e957f6e9f4584e04c9ff5 3. c17b3ebfd2ac922776def21eca730fd5ac57f353 Fixed GitHub Issues in 2.3-develop branch: - magento/magento2#11231: Can't close mobile search bar once typed (reported by @BenSpace48) --- .../Search/view/frontend/web/form-mini.js | 80 ++++++++++--------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/app/code/Magento/Search/view/frontend/web/form-mini.js b/app/code/Magento/Search/view/frontend/web/form-mini.js index 7b2c7003074cb..e8598f46eb5be 100644 --- a/app/code/Magento/Search/view/frontend/web/form-mini.js +++ b/app/code/Magento/Search/view/frontend/web/form-mini.js @@ -286,46 +286,50 @@ define([ $.getJSON(this.options.url, { q: value }, $.proxy(function (data) { - $.each(data, function (index, element) { - var html; - - element.index = index; - html = template({ - data: element + if (data.length) { + $.each(data, function (index, element) { + var html; + + element.index = index; + html = template({ + data: element + }); + dropdown.append(html); }); - dropdown.append(html); - }); - this.responseList.indexList = this.autoComplete.html(dropdown) - .css(clonePosition) - .show() - .find(this.options.responseFieldElements + ':visible'); - - this._resetResponseList(false); - this.element.removeAttr('aria-activedescendant'); - - if (this.responseList.indexList.length) { - this._updateAriaHasPopup(true); - } else { - this._updateAriaHasPopup(false); - } - this.responseList.indexList - .on('click', function (e) { - this.responseList.selected = $(e.currentTarget); - this.searchForm.trigger('submit'); - }.bind(this)) - .on('mouseenter mouseleave', function (e) { - this.responseList.indexList.removeClass(this.options.selectClass); - $(e.target).addClass(this.options.selectClass); - this.responseList.selected = $(e.target); - this.element.attr('aria-activedescendant', $(e.target).attr('id')); - }.bind(this)) - .on('mouseout', function (e) { - if (!this._getLastElement() && this._getLastElement().hasClass(this.options.selectClass)) { - $(e.target).removeClass(this.options.selectClass); - this._resetResponseList(false); - } - }.bind(this)); + this.responseList.indexList = this.autoComplete.html(dropdown) + .css(clonePosition) + .show() + .find(this.options.responseFieldElements + ':visible'); + + this._resetResponseList(false); + this.element.removeAttr('aria-activedescendant'); + + if (this.responseList.indexList.length) { + this._updateAriaHasPopup(true); + } else { + this._updateAriaHasPopup(false); + } + + this.responseList.indexList + .on('click', function (e) { + this.responseList.selected = $(e.currentTarget); + this.searchForm.trigger('submit'); + }.bind(this)) + .on('mouseenter mouseleave', function (e) { + this.responseList.indexList.removeClass(this.options.selectClass); + $(e.target).addClass(this.options.selectClass); + this.responseList.selected = $(e.target); + this.element.attr('aria-activedescendant', $(e.target).attr('id')); + }.bind(this)) + .on('mouseout', function (e) { + if (!this._getLastElement() && + this._getLastElement().hasClass(this.options.selectClass)) { + $(e.target).removeClass(this.options.selectClass); + this._resetResponseList(false); + } + }.bind(this)); + } }, this)); } else { this._resetResponseList(true); From ed5d239b463a6d4469bc29a5d258738ec9ecb028 Mon Sep 17 00:00:00 2001 From: Magento EngCom Team Date: Tue, 23 Jan 2018 10:50:10 -0600 Subject: [PATCH 05/10] :arrow_double_up: Forwardport of magento/magento2#11084 to 2.3-develop branch Applied pull request patch https://github.com/magento/magento2/pull/11084.patch (created by @rubenRP) based on commit(s): 1. 6e5c8f0e1d1b2cd157cdc4cd4751ae7c29cffd31 2. 6be876957f0746e825ca94ad3045e2cdd32ff6c9 Fixed GitHub Issues in 2.3-develop branch: - magento/magento2#9920: stripped-min-length Validation via UI Component Fails with "special" characters (reported by @bap14) --- app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c7fb51f813ba0..76b00f56e780c 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 @@ -244,7 +244,7 @@ define([ ], 'stripped-min-length': [ function (value, param) { - return $(value).text().length >= param; + return _.isUndefined(value) || value.length === 0 || utils.stripHtml(value).length >= param; }, $.mage.__('Please enter at least {0} characters') ], From c739ef6f6917adec2ad8db143da2e3cf9c036b58 Mon Sep 17 00:00:00 2001 From: Magento EngCom Team Date: Tue, 23 Jan 2018 10:50:21 -0600 Subject: [PATCH 06/10] :arrow_double_up: Forwardport of magento/magento2#11254 to 2.3-develop branch Applied pull request patch https://github.com/magento/magento2/pull/11254.patch (created by @romainruaud) based on commit(s): 1. 43cfc7427dd2b7dc03633a4dcd6b170cb521ae9c Fixed GitHub Issues in 2.3-develop branch: - magento/magento2#10317: Region is being overridden when changing from a required-state country to one that is not required (reported by @nei) --- .../Magento/Checkout/view/frontend/web/js/region-updater.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js index 82033590b1135..79050ca087740 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js @@ -206,7 +206,7 @@ define([ regionInput.removeClass('required-entry'); } - regionList.removeClass('required-entry').hide(); + regionList.removeClass('required-entry').prop('disabled', 'disabled').hide(); regionInput.show(); label.attr('for', regionInput.attr('id')); } From 3238020aa6092f2c551df1dad7941de7c385fa8e Mon Sep 17 00:00:00 2001 From: Magento EngCom Team Date: Tue, 23 Jan 2018 10:50:32 -0600 Subject: [PATCH 07/10] :arrow_double_up: Forwardport of magento/magento2#11297 to 2.3-develop branch Applied pull request patch https://github.com/magento/magento2/pull/11297.patch (created by @michielgerritsen) based on commit(s): 1. 60d66282d5c0bfcd04cd2110b378357b7e3dab98 Fixed GitHub Issues in 2.3-develop branch: - magento/magento2#5105: Error While send Invoice with Grouped Products (reported by @srbarba) --- .../view/frontend/templates/email/items/invoice/default.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml index 20c2c1869fedb..1fca65932b0b0 100644 --- a/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml +++ b/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml @@ -31,6 +31,6 @@ getQty() * 1 ?> - getItemPrice($_item) ?> + getItemPrice($_item->getOrderItem()) ?> From b9df95d3e281ceb232056777ff24ad2705f87b87 Mon Sep 17 00:00:00 2001 From: Magento EngCom Team Date: Tue, 23 Jan 2018 10:50:41 -0600 Subject: [PATCH 08/10] :arrow_double_up: Forwardport of magento/magento2#11165 to 2.3-develop branch Applied pull request patch https://github.com/magento/magento2/pull/11165.patch (created by @bka) based on commit(s): 1. 33dcc36b1f5214929f281c5618a31bbc6bded27b Fixed GitHub Issues in 2.3-develop branch: - magento/magento2#7582: Payment methods in payments title in wrong language (reported by @Bartlomiejsz) --- app/code/Magento/Quote/Model/QuoteRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Quote/Model/QuoteRepository.php b/app/code/Magento/Quote/Model/QuoteRepository.php index 01c21bbbe50a7..d3967794b300a 100644 --- a/app/code/Magento/Quote/Model/QuoteRepository.php +++ b/app/code/Magento/Quote/Model/QuoteRepository.php @@ -212,7 +212,7 @@ protected function loadQuote($loadMethod, $loadField, $identifier, array $shared if ($sharedStoreIds) { $quote->setSharedStoreIds($sharedStoreIds); } - $quote->setStoreId($this->storeManager->getStore()->getId())->$loadMethod($identifier); + $quote->$loadMethod($identifier)->setStoreId($this->storeManager->getStore()->getId()); if (!$quote->getId()) { throw NoSuchEntityException::singleField($loadField, $identifier); } From b68a790fca90e576702f4ae98c162bcc553c2a22 Mon Sep 17 00:00:00 2001 From: Magento EngCom Team Date: Tue, 23 Jan 2018 10:50:52 -0600 Subject: [PATCH 09/10] :arrow_double_up: Forwardport of magento/magento2#11205 to 2.3-develop branch Applied pull request patch https://github.com/magento/magento2/pull/11205.patch (created by @Tomasz-Silpion) based on commit(s): 1. d98858e59b0fab496d7bc5b359f09f0792a4ade7 Fixed GitHub Issues in 2.3-develop branch: - magento/magento2#11163: Magento 2.2.0 Pages showing error: Data key is missing: code-entity (reported by @kfaer) --- .../view/adminhtml/ui_component/cms_page_form.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/GoogleOptimizer/view/adminhtml/ui_component/cms_page_form.xml b/app/code/Magento/GoogleOptimizer/view/adminhtml/ui_component/cms_page_form.xml index 735de2bd7b177..cc9249b2d3d38 100644 --- a/app/code/Magento/GoogleOptimizer/view/adminhtml/ui_component/cms_page_form.xml +++ b/app/code/Magento/GoogleOptimizer/view/adminhtml/ui_component/cms_page_form.xml @@ -13,7 +13,12 @@ - + + + Magento\GoogleOptimizer\Block\Adminhtml\Cms\Page\EntityCmsPage + cms_page_form + + From b8e7c76b2ff2d84c3780ee5486a82b4ca1374691 Mon Sep 17 00:00:00 2001 From: Magento EngCom Team Date: Tue, 23 Jan 2018 10:51:01 -0600 Subject: [PATCH 10/10] :arrow_double_up: Forwardport of magento/magento2#11390 to 2.3-develop branch Applied pull request patch https://github.com/magento/magento2/pull/11390.patch (created by @jahvi) based on commit(s): 1. 51e0867597d4e0fc590afff51345fcd10ba12ef9 Fixed GitHub Issues in 2.3-develop branch: - magento/magento2#8958: Hint mistake in english language (reported by @MighT-W315H31T) --- .../Backend/view/adminhtml/web/template/dynamic-rows/grid.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html index 74621806fa5fb..891ad48b33eff 100644 --- a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html +++ b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html @@ -85,7 +85,7 @@
+ translate="'Search strings are either normal strings or regular expressions (PCRE). They are matched in the same order as entered.'">
: