From cd0a7b4ebbb0fc67dd03a77e9a5dbfa7de1ac1c4 Mon Sep 17 00:00:00 2001 From: Chirag Matholiya Date: Tue, 5 Jun 2018 09:41:04 +0530 Subject: [PATCH 01/10] Removed unnecessary css. --- .../Magento/luma/web/css/source/_actions-toolbar.less | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less b/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less index 096b93675a92c..d81d0a8388a78 100644 --- a/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less +++ b/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less @@ -22,10 +22,6 @@ &:last-child { margin-bottom: 0; } - - &.primary { - // &:extend(.abs-button-l all); - } } &:last-child { From ed9b5677b8355b1c1ef09c791fcd6a91a13065ff Mon Sep 17 00:00:00 2001 From: Chirag Matholiya Date: Tue, 5 Jun 2018 10:07:54 +0530 Subject: [PATCH 02/10] Make necessary space. --- .../luma/Magento_Catalog/web/css/source/module/_listings.less | 1 + 1 file changed, 1 insertion(+) diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less index 01b8c7be93aec..d60f59c804cc9 100644 --- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less +++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less @@ -27,6 +27,7 @@ // _____________________________________________ & when (@media-common = true) { + // Product Lists .products { margin: @indent__l 0; From 3a2bda295f518956c3e1ea97d729281c334bf601 Mon Sep 17 00:00:00 2001 From: Chirag Matholiya Date: Tue, 5 Jun 2018 10:22:38 +0530 Subject: [PATCH 03/10] Removed unused class from forms less file. --- lib/web/css/source/lib/_forms.less | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/web/css/source/lib/_forms.less b/lib/web/css/source/lib/_forms.less index 800054e58c3dd..b1c7a49da4a7a 100644 --- a/lib/web/css/source/lib/_forms.less +++ b/lib/web/css/source/lib/_forms.less @@ -465,11 +465,9 @@ .lib-css(margin, @_margin); .lib-css(padding, @_padding); letter-spacing: -.31em; - //word-spacing: -.43em; > * { letter-spacing: normal; - //word-spacing: normal; } > .legend { From 2445b74bbdc1f3fd4bdaff84f53fca62b804ae7a Mon Sep 17 00:00:00 2001 From: Lewis Voncken Date: Wed, 31 Jan 2018 12:56:12 +0000 Subject: [PATCH 04/10] Added row_id to the flat action indexer so the value isn't set to 0 for new products when using index on save --- .../Catalog/Model/Indexer/Product/Flat/Action/Indexer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php index 9dd312e9da801..3a1611299288c 100644 --- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php +++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php @@ -175,6 +175,7 @@ public function write($storeId, $productId, $valueFieldSuffix = '') if (!empty($updateData)) { $updateData += ['entity_id' => $productId]; + $updateData += ['row_id' => $productId]; $updateFields = []; foreach ($updateData as $key => $value) { $updateFields[$key] = $key; From 58f4a481a00196af48e3645c80fad37981e79011 Mon Sep 17 00:00:00 2001 From: Lewis Voncken Date: Sat, 5 May 2018 19:34:28 +0200 Subject: [PATCH 05/10] Moved the indexAll after the product save in the Indexer Product Flat RowTest --- .../Catalog/Model/Indexer/Product/Flat/Action/RowTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php index 2b7c416f6be16..15c90891878a0 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php @@ -61,12 +61,13 @@ public function testProductUpdate() $this->_processor->getIndexer()->isScheduled(), 'Indexer is in scheduled mode when turned to update on save mode' ); - $this->_processor->reindexAll(); $this->_product->load(1); $this->_product->setName('Updated Product'); $this->_product->save(); + $this->_processor->reindexAll(); + $category = $categoryFactory->create()->load(9); $layer = $listProduct->getLayer(); $layer->setCurrentCategory($category); From 110ee7596e56ac1ac03f6250115d12027f279643 Mon Sep 17 00:00:00 2001 From: Yogesh Suhagiya Date: Thu, 3 May 2018 18:18:04 +0530 Subject: [PATCH 06/10] Format the javascript code --- .../Ui/view/base/templates/control/button/split.phtml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml index 1ff1722f944fb..a660f7e592331 100644 --- a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml +++ b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml @@ -42,10 +42,10 @@ From 3994790216af0ec9d37233d7b046a753a3bb4699 Mon Sep 17 00:00:00 2001 From: Yogesh Suhagiya Date: Fri, 4 May 2018 15:02:23 +0530 Subject: [PATCH 07/10] Refactor JS code and added JS component file --- .../base/templates/control/button/split.phtml | 18 ++++++++---------- .../base/web/js/grid/controls/button/split.js | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 app/code/Magento/Ui/view/base/web/js/grid/controls/button/split.js diff --git a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml index a660f7e592331..757b1d3a4e425 100644 --- a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml +++ b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml @@ -17,7 +17,7 @@ hasSplit()): ?> getDisabled()): ?> @@ -40,12 +40,10 @@ - - + \ No newline at end of file diff --git a/app/code/Magento/Ui/view/base/web/js/grid/controls/button/split.js b/app/code/Magento/Ui/view/base/web/js/grid/controls/button/split.js new file mode 100644 index 0000000000000..d5a198052fd0c --- /dev/null +++ b/app/code/Magento/Ui/view/base/web/js/grid/controls/button/split.js @@ -0,0 +1,17 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + +define([ + 'jquery' +], function ($) { + 'use strict'; + + return function (data, element) { + + $(element).on('click.splitDefault', '.action-default', function () { + $(this).siblings('.dropdown-menu').find('.item-default').trigger('click'); + }); + }; +}); \ No newline at end of file From 8281b383991686fed64c33860854b85c02f3d57a Mon Sep 17 00:00:00 2001 From: Yogesh Suhagiya Date: Fri, 4 May 2018 16:25:21 +0530 Subject: [PATCH 08/10] Fixed issue of line feed at end of the file --- .../Magento/Ui/view/base/web/js/grid/controls/button/split.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/js/grid/controls/button/split.js b/app/code/Magento/Ui/view/base/web/js/grid/controls/button/split.js index d5a198052fd0c..d37e80213f650 100644 --- a/app/code/Magento/Ui/view/base/web/js/grid/controls/button/split.js +++ b/app/code/Magento/Ui/view/base/web/js/grid/controls/button/split.js @@ -14,4 +14,4 @@ define([ $(this).siblings('.dropdown-menu').find('.item-default').trigger('click'); }); }; -}); \ No newline at end of file +}); From 444fce24efe09c813654e0726f47f1ab3b01aa31 Mon Sep 17 00:00:00 2001 From: NamrataChangani Date: Tue, 5 Jun 2018 14:11:25 +0530 Subject: [PATCH 09/10] Fixed set template syntax issue --- .../Product/Composite/Fieldset/Options/Type/Checkbox.php | 2 +- .../Catalog/Product/Composite/Fieldset/Options/Type/Multi.php | 2 +- .../Catalog/Product/Composite/Fieldset/Options/Type/Radio.php | 2 +- .../Catalog/Product/Composite/Fieldset/Options/Type/Select.php | 2 +- .../Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php | 2 +- .../Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php | 2 +- .../Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php | 2 +- .../Catalog/Product/Edit/Tab/Bundle/Option/Selection.php | 2 +- .../Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php | 2 +- .../Block/Catalog/Product/View/Type/Bundle/Option/Multi.php | 2 +- .../Block/Catalog/Product/View/Type/Bundle/Option/Radio.php | 2 +- .../Block/Catalog/Product/View/Type/Bundle/Option/Select.php | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php index 0b3a938255de1..b220e2c98d77c 100644 --- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php +++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php @@ -17,7 +17,7 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op /** * @var string */ - protected $_template = 'product/composite/fieldset/options/type/checkbox.phtml'; + protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/checkbox.phtml'; /** * @param string $elementId diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php index 304b3a5cf34ed..a4b8c6bde73aa 100644 --- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php +++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php @@ -17,7 +17,7 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio /** * @var string */ - protected $_template = 'product/composite/fieldset/options/type/multi.phtml'; + protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/multi.phtml'; /** * @param string $elementId diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php index e011ab36e8029..1519b3a67ac97 100644 --- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php +++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php @@ -17,7 +17,7 @@ class Radio extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio /** * @var string */ - protected $_template = 'product/composite/fieldset/options/type/radio.phtml'; + protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/radio.phtml'; /** * @param string $elementId diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php index f1206db359b5c..502dfa32044a3 100644 --- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php +++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php @@ -17,7 +17,7 @@ class Select extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Opti /** * @var string */ - protected $_template = 'product/composite/fieldset/options/type/select.phtml'; + protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/select.phtml'; /** * @param string $elementId diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php index f124740a766ab..8be512a3e6348 100644 --- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php +++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php @@ -20,7 +20,7 @@ class Bundle extends \Magento\Backend\Block\Widget implements \Magento\Backend\B /** * @var string */ - protected $_template = 'product/edit/bundle.phtml'; + protected $_template = 'Magento_Bundle::product/edit/bundle.phtml'; /** * Core registry diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php index 13c5dcc81afb3..19da6bc6244e5 100644 --- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php +++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php @@ -26,7 +26,7 @@ class Option extends \Magento\Backend\Block\Widget /** * @var string */ - protected $_template = 'product/edit/bundle/option.phtml'; + protected $_template = 'Magento_Bundle::product/edit/bundle/option.phtml'; /** * Core registry diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php index 5b73c22b5781a..cf4814d3cd778 100644 --- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php +++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php @@ -15,7 +15,7 @@ class Search extends \Magento\Backend\Block\Widget /** * @var string */ - protected $_template = 'product/edit/bundle/option/search.phtml'; + protected $_template = 'Magento_Bundle::product/edit/bundle/option/search.phtml'; /** * @return void diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php index 353808dc66a72..cf88f9b93d32f 100644 --- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php +++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php @@ -15,7 +15,7 @@ class Selection extends \Magento\Backend\Block\Widget /** * @var string */ - protected $_template = 'product/edit/bundle/option/selection.phtml'; + protected $_template = 'Magento_Bundle::product/edit/bundle/option/selection.phtml'; /** * Catalog data diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php index 8ca0cf8a5159e..83730d4eae2bd 100644 --- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php +++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php @@ -16,5 +16,5 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op /** * @var string */ - protected $_template = 'catalog/product/view/type/bundle/option/checkbox.phtml'; + protected $_template = 'Magento_Bundle::catalog/product/view/type/bundle/option/checkbox.phtml'; } diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php index 3319db8cff1d5..79e94a18a789e 100644 --- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php +++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php @@ -16,7 +16,7 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio /** * @var string */ - protected $_template = 'catalog/product/view/type/bundle/option/multi.phtml'; + protected $_template = 'Magento_Bundle::catalog/product/view/type/bundle/option/multi.phtml'; /** * @inheritdoc diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php index 84a619dafab52..07c113bd8e4bb 100644 --- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php +++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php @@ -16,5 +16,5 @@ class Radio extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio /** * @var string */ - protected $_template = 'catalog/product/view/type/bundle/option/radio.phtml'; + protected $_template = 'Magento_Bundle::catalog/product/view/type/bundle/option/radio.phtml'; } diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php index d7f1cf41057a8..63f0d35bda0f0 100644 --- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php +++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php @@ -16,5 +16,5 @@ class Select extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Opti /** * @var string */ - protected $_template = 'catalog/product/view/type/bundle/option/select.phtml'; + protected $_template = 'Magento_Bundle::catalog/product/view/type/bundle/option/select.phtml'; } From bdbafb46499c03e20d3a8d3b124befd10a3bf60f Mon Sep 17 00:00:00 2001 From: Chirag Matholiya Date: Wed, 6 Jun 2018 10:41:41 +0530 Subject: [PATCH 10/10] Frontport placeholder image resize. --- app/code/Magento/Wishlist/CustomerData/Wishlist.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/code/Magento/Wishlist/CustomerData/Wishlist.php b/app/code/Magento/Wishlist/CustomerData/Wishlist.php index 85aff60ac6370..7a677b5932f71 100644 --- a/app/code/Magento/Wishlist/CustomerData/Wishlist.php +++ b/app/code/Magento/Wishlist/CustomerData/Wishlist.php @@ -155,11 +155,7 @@ protected function getImageData($product) $template = 'Magento_Catalog/product/image_with_borders'; - try { - $imagesize = $helper->getResizedImageInfo(); - } catch (NotLoadInfoImageException $exception) { - $imagesize = [$helper->getWidth(), $helper->getHeight()]; - } + $imagesize = [$helper->getWidth(), $helper->getHeight()]; $width = $helper->getFrame() ? $helper->getWidth()