From cd0a7b4ebbb0fc67dd03a77e9a5dbfa7de1ac1c4 Mon Sep 17 00:00:00 2001 From: Chirag Matholiya Date: Tue, 5 Jun 2018 09:41:04 +0530 Subject: [PATCH 01/21] 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/21] 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/21] 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/21] 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/21] 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 444fce24efe09c813654e0726f47f1ab3b01aa31 Mon Sep 17 00:00:00 2001 From: NamrataChangani Date: Tue, 5 Jun 2018 14:11:25 +0530 Subject: [PATCH 06/21] 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 e813739bf7e2fea633b1bb8183fb50f9e89a249b Mon Sep 17 00:00:00 2001 From: Chirag Matholiya Date: Wed, 6 Jun 2018 13:56:58 +0530 Subject: [PATCH 07/21] Frontport responsive footer issue. --- .../Magento_Theme/web/css/source/_module.less | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less index 83157281561c2..3676f88189fbc 100644 --- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less @@ -361,6 +361,29 @@ // _____________________________________________ .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { + html, + body { + height: 100%; // Stretch screen area for sticky footer + } + + header, + main, + footer { + flex-shrink: 0; + } + + .page-wrapper { + .lib-vendor-prefix-display(flex); + .lib-vendor-prefix-flex-direction(column); + align-items: stretch; + -webkit-align-items: stretch; + min-height: 100%; // Stretch content area for sticky footer + .page-main { + flex-grow: 1; + -webkit-flex-grow: 1; + } + } + .customer-name, .customer-welcome + .authorization-link { display: none; From 75932adf452b4f92d3bb0dee88e6ac7891731a8f Mon Sep 17 00:00:00 2001 From: Chirag Matholiya Date: Wed, 6 Jun 2018 14:00:56 +0530 Subject: [PATCH 08/21] Frontport footer responsive issue --- .../Magento_Theme/web/css/source/_module.less | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less index 3676f88189fbc..83157281561c2 100644 --- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less @@ -361,29 +361,6 @@ // _____________________________________________ .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { - html, - body { - height: 100%; // Stretch screen area for sticky footer - } - - header, - main, - footer { - flex-shrink: 0; - } - - .page-wrapper { - .lib-vendor-prefix-display(flex); - .lib-vendor-prefix-flex-direction(column); - align-items: stretch; - -webkit-align-items: stretch; - min-height: 100%; // Stretch content area for sticky footer - .page-main { - flex-grow: 1; - -webkit-flex-grow: 1; - } - } - .customer-name, .customer-welcome + .authorization-link { display: none; From 83202fa3ff5f244faa494d45b1c1e59d20442a7a Mon Sep 17 00:00:00 2001 From: Vincent MARMIESSE Date: Wed, 24 Jan 2018 19:03:47 +0100 Subject: [PATCH 09/21] #13354 - [Improvement] Add HTML attributes to containers --- lib/internal/Magento/Framework/View/Layout.php | 4 +++- .../Magento/Framework/View/Layout/Element.php | 2 ++ .../Framework/View/Layout/Reader/Container.php | 12 +++++++----- .../Magento/Framework/View/Layout/etc/elements.xsd | 8 ++++++++ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lib/internal/Magento/Framework/View/Layout.php b/lib/internal/Magento/Framework/View/Layout.php index bd94491537efe..99c4e26b96d89 100755 --- a/lib/internal/Magento/Framework/View/Layout.php +++ b/lib/internal/Magento/Framework/View/Layout.php @@ -599,9 +599,11 @@ protected function _renderContainer($name, $useCache = true) $htmlClass = ' class="' . $htmlClass . '"'; } + $htmlAttributes = $this->structure->getAttribute($name, Element::CONTAINER_OPT_HTML_ATTRIBUTES); + $htmlTag = $this->structure->getAttribute($name, Element::CONTAINER_OPT_HTML_TAG); - $html = sprintf('<%1$s%2$s%3$s>%4$s', $htmlTag, $htmlId, $htmlClass, $html); + $html = sprintf('<%1$s%2$s%3$s%4$s>%5$s', $htmlTag, $htmlId, $htmlClass, $htmlAttributes, $html); return $html; } diff --git a/lib/internal/Magento/Framework/View/Layout/Element.php b/lib/internal/Magento/Framework/View/Layout/Element.php index 203af4bf1553c..b97c2d4c5040d 100644 --- a/lib/internal/Magento/Framework/View/Layout/Element.php +++ b/lib/internal/Magento/Framework/View/Layout/Element.php @@ -54,6 +54,8 @@ class Element extends \Magento\Framework\Simplexml\Element const CONTAINER_OPT_HTML_ID = 'htmlId'; + const CONTAINER_OPT_HTML_ATTRIBUTES = 'htmlAttributes'; + const CONTAINER_OPT_LABEL = 'label'; /**#@-*/ diff --git a/lib/internal/Magento/Framework/View/Layout/Reader/Container.php b/lib/internal/Magento/Framework/View/Layout/Reader/Container.php index 850b340e985e1..1853a355613d0 100755 --- a/lib/internal/Magento/Framework/View/Layout/Reader/Container.php +++ b/lib/internal/Magento/Framework/View/Layout/Reader/Container.php @@ -25,6 +25,7 @@ class Container implements Layout\ReaderInterface const CONTAINER_OPT_HTML_TAG = 'htmlTag'; const CONTAINER_OPT_HTML_CLASS = 'htmlClass'; const CONTAINER_OPT_HTML_ID = 'htmlId'; + const CONTAINER_OPT_HTML_ATTRIBUTES = 'htmlAttributes'; const CONTAINER_OPT_LABEL = 'label'; const CONTAINER_OPT_DISPLAY = 'display'; /**#@-*/ @@ -113,11 +114,12 @@ protected function mergeContainerAttributes( } } else { $elementData['attributes'] = [ - self::CONTAINER_OPT_HTML_TAG => (string)$currentElement[self::CONTAINER_OPT_HTML_TAG], - self::CONTAINER_OPT_HTML_ID => (string)$currentElement[self::CONTAINER_OPT_HTML_ID], - self::CONTAINER_OPT_HTML_CLASS => (string)$currentElement[self::CONTAINER_OPT_HTML_CLASS], - self::CONTAINER_OPT_LABEL => (string)$currentElement[self::CONTAINER_OPT_LABEL], - self::CONTAINER_OPT_DISPLAY => (string)$currentElement[self::CONTAINER_OPT_DISPLAY], + self::CONTAINER_OPT_HTML_TAG => (string)$currentElement[self::CONTAINER_OPT_HTML_TAG], + self::CONTAINER_OPT_HTML_ID => (string)$currentElement[self::CONTAINER_OPT_HTML_ID], + self::CONTAINER_OPT_HTML_CLASS => (string)$currentElement[self::CONTAINER_OPT_HTML_CLASS], + self::CONTAINER_OPT_HTML_ATTRIBUTES => (string)$currentElement[self::CONTAINER_OPT_HTML_ATTRIBUTES], + self::CONTAINER_OPT_LABEL => (string)$currentElement[self::CONTAINER_OPT_LABEL], + self::CONTAINER_OPT_DISPLAY => (string)$currentElement[self::CONTAINER_OPT_DISPLAY], ]; } $scheduledStructure->setStructureElementData($containerName, $elementData); diff --git a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd index 39cdec05a65ea..ab69b357b3b95 100755 --- a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd +++ b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd @@ -116,6 +116,12 @@ + + + + + + @@ -165,6 +171,7 @@ + @@ -329,6 +336,7 @@ + From 0ace4adfaaede804b3790946006dfc1f495550bc Mon Sep 17 00:00:00 2001 From: Vincent MARMIESSE Date: Thu, 25 Jan 2018 00:36:00 +0100 Subject: [PATCH 10/21] #13354 - Fix unit test --- .../Test/Unit/Layout/Reader/ContainerTest.php | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php index e4834accbcc07..f1b12bd4e5168 100755 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php @@ -144,18 +144,19 @@ public function processDataProvider() ], 'referenceContainer' => [ 'elementCurrent' => $this->getElement( - '', + '', 'referenceContainer' ), 'containerName' => 'reference', 'structureElement' => [], 'expectedData' => [ 'attributes' => [ - Container::CONTAINER_OPT_HTML_TAG => 'span', - Container::CONTAINER_OPT_HTML_ID => 'id_add', - Container::CONTAINER_OPT_HTML_CLASS => 'new', - Container::CONTAINER_OPT_LABEL => 'Add', - Container::CONTAINER_OPT_DISPLAY => null, + Container::CONTAINER_OPT_HTML_TAG => 'span', + Container::CONTAINER_OPT_HTML_ID => 'id_add', + Container::CONTAINER_OPT_HTML_CLASS => 'new', + Container::CONTAINER_OPT_HTML_ATTRIBUTES => 'attribute', + Container::CONTAINER_OPT_LABEL => 'Add', + Container::CONTAINER_OPT_DISPLAY => null, ], ], 'getStructureCondition' => $this->once(), @@ -171,11 +172,12 @@ public function processDataProvider() 'structureElement' => [], 'expectedData' => [ 'attributes' => [ - Container::CONTAINER_OPT_HTML_TAG => null, - Container::CONTAINER_OPT_HTML_ID => null, - Container::CONTAINER_OPT_HTML_CLASS => null, - Container::CONTAINER_OPT_LABEL => null, - Container::CONTAINER_OPT_DISPLAY => null, + Container::CONTAINER_OPT_HTML_TAG => null, + Container::CONTAINER_OPT_HTML_ID => null, + Container::CONTAINER_OPT_HTML_CLASS => null, + Container::CONTAINER_OPT_HTML_ATTRIBUTES => null, + Container::CONTAINER_OPT_LABEL => null, + Container::CONTAINER_OPT_DISPLAY => null, ], ], 'getStructureCondition' => $this->once(), @@ -208,7 +210,7 @@ public function processDataProvider() ], 'referenceContainerDisplayFalse' => [ 'elementCurrent' => $this->getElement( - '', 'referenceContainer' ), @@ -216,11 +218,12 @@ public function processDataProvider() 'structureElement' => [], 'expectedData' => [ 'attributes' => [ - Container::CONTAINER_OPT_HTML_TAG => 'span', - Container::CONTAINER_OPT_HTML_ID => 'id_add', - Container::CONTAINER_OPT_HTML_CLASS => 'new', - Container::CONTAINER_OPT_LABEL => 'Add', - Container::CONTAINER_OPT_DISPLAY => 'true', + Container::CONTAINER_OPT_HTML_TAG => 'span', + Container::CONTAINER_OPT_HTML_ID => 'id_add', + Container::CONTAINER_OPT_HTML_CLASS => 'new', + Container::CONTAINER_OPT_HTML_ATTRIBUTES => 'attribute', + Container::CONTAINER_OPT_LABEL => 'Add', + Container::CONTAINER_OPT_DISPLAY => 'true', ], ], 'getStructureCondition' => $this->once(), From 402ccc4edada62fb0f81c7062f6dbd934cb4f639 Mon Sep 17 00:00:00 2001 From: Vincent MARMIESSE Date: Fri, 26 Jan 2018 14:32:09 +0100 Subject: [PATCH 11/21] #13354 - Fix htmlAttributes validation when using two data- --- lib/internal/Magento/Framework/View/Layout/etc/elements.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd index ab69b357b3b95..1a41dcb917106 100755 --- a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd +++ b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd @@ -118,7 +118,7 @@ - + From 1d20c98b948fffe49281e875a52c34b465d7d365 Mon Sep 17 00:00:00 2001 From: Vincent MARMIESSE Date: Sat, 27 Jan 2018 16:34:27 +0100 Subject: [PATCH 12/21] Fix failing tests because of lines length --- .../View/Test/Unit/Layout/Reader/ContainerTest.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php index f1b12bd4e5168..4841d20951121 100755 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php @@ -144,7 +144,8 @@ public function processDataProvider() ], 'referenceContainer' => [ 'elementCurrent' => $this->getElement( - '', + '', 'referenceContainer' ), 'containerName' => 'reference', @@ -210,8 +211,8 @@ public function processDataProvider() ], 'referenceContainerDisplayFalse' => [ 'elementCurrent' => $this->getElement( - '', + '', 'referenceContainer' ), 'containerName' => 'reference', From eee2e7ccd7aef585e973df28719b25941e7e401e Mon Sep 17 00:00:00 2001 From: Steven de Jong Date: Thu, 7 Jun 2018 16:07:17 +0200 Subject: [PATCH 13/21] #15308 extraneous margin removed extraneous margin and compensated padding and set both to 0, which creates the same effect --- .../luma/Magento_Catalog/web/css/source/module/_listings.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..ba118a21ab73e 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 @@ -167,11 +167,11 @@ .column.main { .product { &-items { - margin-left: -@indent__base; + margin-left: 0; } &-item { - padding-left: @indent__base; + padding-left: 0; } } } From af902ef8dc748f7f7aa4c02615d9e15b19925eed Mon Sep 17 00:00:00 2001 From: Tiago Sampaio Date: Fri, 8 Jun 2018 22:39:37 -0300 Subject: [PATCH 14/21] Changes: - Removed unnecessary menu item called Magento_Catalog::inventory. The title of the tab in browser no is set to "Products / Catalog / Magento Admin" rather than "Products / Inventory / Catalog / Magento Admin". --- app/code/Magento/Catalog/etc/adminhtml/menu.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Catalog/etc/adminhtml/menu.xml b/app/code/Magento/Catalog/etc/adminhtml/menu.xml index aa910e6d5ade4..3b4638acb8d73 100644 --- a/app/code/Magento/Catalog/etc/adminhtml/menu.xml +++ b/app/code/Magento/Catalog/etc/adminhtml/menu.xml @@ -8,11 +8,9 @@ - - + + - - From a9c6267dc1f35fd859aa0d2211720b605872f2ab Mon Sep 17 00:00:00 2001 From: Valerij Ivashchenko Date: Mon, 11 Jun 2018 15:47:43 +0300 Subject: [PATCH 15/21] small refactoring to better code readability --- .../Block/Widget/Form/Element/Dependence.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php index 723deab1e9f7e..c3f83e06858d8 100644 --- a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php +++ b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php @@ -124,14 +124,17 @@ protected function _toHtml() if (!$this->_depends) { return ''; } - return ''; + + $dependsJson = $this->_getDependsJson(); + $configOptions = $this->_configOptions ? $this->_jsonEncoder->encode($this->_configOptions) : null; + $configOptionsStr = $configOptions ? ', ' . $configOptions : ''; + $paramsStr = $dependsJson . $configOptionsStr; + + return ""; } /** From 75f869097ac5d198b2d3b6505c47b82ffbd643de Mon Sep 17 00:00:00 2001 From: Daniel Ruf Date: Mon, 11 Jun 2018 13:08:29 +0200 Subject: [PATCH 16/21] fix: change "My Dashboard" to "My Account" --- app/code/Magento/Customer/i18n/en_US.csv | 1 - .../Customer/view/frontend/layout/customer_account_index.xml | 2 +- .../Test/Constraint/AssertCustomerRedirectToDashboard.php | 2 +- .../Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv index 5d7d8b2bf30a4..61bc5742221a1 100644 --- a/app/code/Magento/Customer/i18n/en_US.csv +++ b/app/code/Magento/Customer/i18n/en_US.csv @@ -534,7 +534,6 @@ Addresses,Addresses "Account Dashboard","Account Dashboard" "Edit Account Information","Edit Account Information" "Password forgotten","Password forgotten" -"My Dashboard","My Dashboard" "You are signed out","You are signed out" "Associate to Website","Associate to Website" "Prefix","Prefix" diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml index 6384ee9c6562c..4494a5dd67103 100644 --- a/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml +++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml @@ -10,7 +10,7 @@ - My Dashboard + My Account diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php index da8f49485d634..61e42e3dd60c5 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php @@ -17,7 +17,7 @@ class AssertCustomerRedirectToDashboard extends AbstractConstraint /** * Dashboard Message on account index page. */ - const DASHBOARD_MESSAGE = 'My Dashboard'; + const DASHBOARD_MESSAGE = 'My Account'; /** * Constraint severeness diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php index 02a439deb856b..22cd5bd13e94c 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php @@ -49,7 +49,7 @@ public function run() { $this->customerAccount->open(); $this->cmsIndex->getCmsPageBlock()->waitPageInit(); - if ($this->cmsIndex->getTitleBlock()->getTitle() === 'My Dashboard') { + if ($this->cmsIndex->getTitleBlock()->getTitle() === 'My Account') { $this->cmsIndex->getLinksBlock()->openLink('Sign Out'); $this->cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible('Home Page'); $this->cmsIndex->getCmsPageBlock()->waitPageInit(); From d7e77e617e54d586a162ef0d63d74eba33d0efdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karla=20Saarem=C3=A4e?= Date: Mon, 11 Jun 2018 16:04:54 +0300 Subject: [PATCH 17/21] added new variables --- lib/web/css/source/lib/variables/_buttons.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/web/css/source/lib/variables/_buttons.less b/lib/web/css/source/lib/variables/_buttons.less index 82f618faa1d0f..8c31c16143859 100644 --- a/lib/web/css/source/lib/variables/_buttons.less +++ b/lib/web/css/source/lib/variables/_buttons.less @@ -47,6 +47,9 @@ @button__active__gradient-color-end: false; // Primary button +@button-primary__font-family: @button__font-family; +@button-primary__font-size: @button__font-size; +@button-primary__font-weight: @button__font-weight; @button-primary__line-height: false; @button-primary__width: false; @button-primary__margin: false; From c4de267a7bf32adf50d188531689de9cf75f0f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karla=20Saarem=C3=A4e?= Date: Mon, 11 Jun 2018 16:06:50 +0300 Subject: [PATCH 18/21] added new primary button variables --- lib/web/css/source/lib/_buttons.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/web/css/source/lib/_buttons.less b/lib/web/css/source/lib/_buttons.less index 679c4b11fbaac..a92093b742902 100644 --- a/lib/web/css/source/lib/_buttons.less +++ b/lib/web/css/source/lib/_buttons.less @@ -276,6 +276,9 @@ // --------------------------------------------- .lib-button-primary( + @_button-font-family: @button-primary__font-family, + @_button-font-size: @button-primary__font-size, + @_button-font-weight: @button-primary__font-weight, @_button-line-height: @button-primary__line-height, @_button-width: @button-primary__width, @_button-margin: @button-primary__margin, @@ -299,6 +302,9 @@ @_button-gradient-direction: @button-primary__gradient-direction ) { .lib-button( + @_button-font-family: @_button-font-family, + @_button-font-size: @_button-font-size, + @_button-font-weight: @_button-font-weight, @_button-line-height: @_button-line-height, @_button-width: @_button-width, @_button-margin: @_button-margin, From f7aaa7c0e5deb4f01633799c6e5e97c146dfd574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karla=20Saarem=C3=A4e?= Date: Mon, 11 Jun 2018 11:41:48 +0300 Subject: [PATCH 19/21] checkout page cart icon color fix --- .../web/css/source/module/checkout/_estimated-total.less | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less index 86df8d870552b..85c65bd0ff2d7 100644 --- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less +++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less @@ -35,7 +35,11 @@ .action { &.showcart { &:before { - .lib-css(color, @primary__color); + .lib-css(color, @button__color); + } + + &:hover:before { + .lib-css(color, @button__hover__color); } } } From 7ba03bf8a5fe66f606df0c4ed009e5498987097b Mon Sep 17 00:00:00 2001 From: Saurabh Parekh Date: Mon, 11 Jun 2018 12:41:30 +0530 Subject: [PATCH 20/21] Correct return type of methods and typo correction. --- .../Controller/Adminhtml/Promo/Widget/CategoriesJson.php | 3 ++- app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php | 2 +- app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php | 2 +- app/code/Magento/User/Model/Backend/Config/ObserverConfig.php | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php index 3d9dcd05f8fac..c055bbedbd23e 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php @@ -8,6 +8,7 @@ use Magento\Backend\App\Action\Context; use Magento\Catalog\Model\Category; +use Magento\Customer\Model\Attribute\Data\Boolean; use Magento\Framework\Registry; class CategoriesJson extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget @@ -32,7 +33,7 @@ public function __construct(Context $context, Registry $coreRegistry) /** * Initialize category object in registry * - * @return Category + * @return Category|Boolean */ protected function _initCategory() { diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php index ffba417eb3ac7..fac8c4d2a47f6 100644 --- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php +++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php @@ -120,7 +120,7 @@ public function processAttributeValue($attribute, $value) * * @param array $index * @param string $separator - * @return string + * @return array */ public function prepareEntityIndex($index, $separator = ' ') { diff --git a/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php b/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php index 195c0fc10dc07..38025f21cdab1 100644 --- a/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php +++ b/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php @@ -79,7 +79,7 @@ public function getUrlRewriteId() /** * @param int $urlRewriteId - * @return int + * @return $this */ public function setUrlRewriteId($urlRewriteId) { diff --git a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php index c1b7e6a1110f7..6d921dfdcdd65 100644 --- a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php +++ b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php @@ -72,7 +72,7 @@ public function getAdminPasswordLifetime() } /** - * Get admin maxiumum security failures from config + * Get admin maximum security failures from config * * @return int */ From 14977654d588ce1db2c2591995082200faaaa5f3 Mon Sep 17 00:00:00 2001 From: Chirag Matholiya Date: Thu, 14 Jun 2018 15:11:22 +0530 Subject: [PATCH 21/21] Fix incorrect type hinting in PHPDocs for Forwordport2.3. --- app/code/Magento/Sales/Model/Order/Shipment/Item.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Item.php b/app/code/Magento/Sales/Model/Order/Shipment/Item.php index 0da936e74ca6c..5d1fc9057fff4 100644 --- a/app/code/Magento/Sales/Model/Order/Shipment/Item.php +++ b/app/code/Magento/Sales/Model/Order/Shipment/Item.php @@ -144,8 +144,7 @@ public function getOrderItem() * Declare qty * * @param float $qty - * @return \Magento\Sales\Model\Order\Shipment\Item - * @throws \Magento\Framework\Exception\LocalizedException + * @return $this */ public function setQty($qty) { @@ -157,7 +156,6 @@ public function setQty($qty) * Applying qty to order item * * @return $this - * @throws \Magento\Framework\Exception\LocalizedException */ public function register() {