From 8fea04c0f923675376df3807dc38835d3ede3866 Mon Sep 17 00:00:00 2001 From: Mastiuhin Olexandr Date: Wed, 12 Sep 2018 18:25:41 +0300 Subject: [PATCH 1/4] MAGETWO-94887: [2.3] B2B currency switcher causes duplicating of button --- .../Sales/view/adminhtml/web/order/create/scripts.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js index b61f4617e1be0..e653ed2a955ec 100644 --- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js +++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js @@ -48,7 +48,7 @@ define([ if (typeof controlButtonArea != 'undefined') { var buttons = controlButtonArea.childElements(); for (var i = 0; i < buttons.length; i++) { - if (buttons[i].innerHTML.include(button.label)) { + if (buttons[i].innerHTML.include(button.getLabel())) { return; } } @@ -1432,6 +1432,10 @@ define([ node.update('' + this._label + ''); content[position] = node; Element.insert(element, content); + }, + + getLabel: function(){ + return this._label; } }; From 00e9c4b16d7e127da6e315304866dc0070fa2a8f Mon Sep 17 00:00:00 2001 From: Mastiuhin Olexandr Date: Mon, 24 Sep 2018 16:13:48 +0300 Subject: [PATCH 2/4] MAGETWO-94848: [2.3] Cannot change attribute set --- .../Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php index ed737df708ab8..d0c0b8c487e27 100644 --- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php +++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php @@ -289,6 +289,7 @@ protected function customizeCategoriesField(array $meta) 'source' => 'product_details', 'displayArea' => 'insideGroup', 'sortOrder' => 20, + 'dataScope' => $fieldCode, ], ], ] From edbef061212c379678ae3cff30c063f7932ff584 Mon Sep 17 00:00:00 2001 From: Mastiuhin Olexandr Date: Mon, 24 Sep 2018 16:41:56 +0300 Subject: [PATCH 3/4] MAGETWO-94848: [2.3] Cannot change attribute set --- .../Ui/DataProvider/Product/Form/Modifier/Categories.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php index d0c0b8c487e27..681435851fbde 100644 --- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php +++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php @@ -118,7 +118,7 @@ private function getCacheManager() } /** - * {@inheritdoc} + * @inheritdoc * @since 101.0.0 */ public function modifyMeta(array $meta) @@ -130,7 +130,7 @@ public function modifyMeta(array $meta) } /** - * {@inheritdoc} + * @inheritdoc * @since 101.0.0 */ public function modifyData(array $data) From 732538bef8cb1910a807eec14d9c0c83eba9274b Mon Sep 17 00:00:00 2001 From: Serhiy Yelahin Date: Tue, 25 Sep 2018 16:03:55 +0300 Subject: [PATCH 4/4] MAGETWO-94990: [2.3] Configurable product thumbnail images slow to generate when high number of thumbnails (14+) in vertical navigation --- lib/web/fotorama/fotorama.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web/fotorama/fotorama.js b/lib/web/fotorama/fotorama.js index 89cb315b0d2c4..0d12a4a7fdb69 100644 --- a/lib/web/fotorama/fotorama.js +++ b/lib/web/fotorama/fotorama.js @@ -2568,7 +2568,7 @@ fotoramaVersion = '4.6.4'; thisData.t > rightLimit : thisData.l > rightLimit; specialMeasures.w = thisData.w; - if (thisData.l + thisData.w < leftLimit + if ((opts.navdir !== 'vertical' && thisData.l + thisData.w < leftLimit) || exceedLimit || callFit(thisData.$img, specialMeasures)) return;