From 6d1c7a7fd3ffb82254f2126ed102c132ec2ad67d Mon Sep 17 00:00:00 2001 From: Andrii Lugovyi Date: Tue, 3 Nov 2015 23:58:39 +0200 Subject: [PATCH 01/24] MAGETWO-45422: "Does this have a weight?" Yes / No Product field is available for bundle product --- .../product/edit/bundle/option.phtml | 7 ++++ .../view/adminhtml/web/catalog/type-events.js | 3 +- .../web/js/product/weight-handler.js | 39 ++++++++++--------- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml index ebb9ac5206896..6c754d5661b65 100644 --- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml +++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml @@ -306,3 +306,10 @@ jQuery(window).load(function() { }); + diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/type-events.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/type-events.js index 38e5ea31f051b..6412f1169c75a 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/type-events.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/type-events.js @@ -16,7 +16,8 @@ define([ */ init: function () { - if (weight.productHasWeight()) { + //not weight switcher giftcard, bundle + if (weight.productHasWeightBySwitcher() && weight.hasWeightSwither()) { this.type = { virtual: 'virtual', real: this.$type.val() //simple, configurable diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js b/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js index 69b916ee7309f..83a4b462f62ab 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js @@ -13,13 +13,6 @@ define([ $weightSwitcher: $('[data-role=weight-switcher]'), $weight: $('#weight'), - /** - * Hide weight switcher - */ - hideWeightSwitcher: function () { - this.$weightSwitcher.hide(); - }, - /** * Is locked * @returns {*} @@ -47,23 +40,30 @@ define([ * @returns {*} */ switchWeight: function () { - return this.productHasWeight() ? this.enabled() : this.disabled(); + return this.productHasWeightBySwitcher() ? this.enabled() : this.disabled(); }, /** - * Product has weight - * @returns {Bool} + * Hide weight switcher */ - productHasWeight: function () { - return $('input:checked', this.$weightSwitcher).val() === '1'; + hideWeightSwitcher: function () { + this.$weightSwitcher.hide(); }, /** - * Notify product weight is changed - * @returns {*|jQuery} + * Has weight swither + * @returns {*} */ - notifyProductWeightIsChanged: function () { - return $('input:checked', this.$weightSwitcher).trigger('change'); + hasWeightSwither: function () { + return this.$weightSwitcher.is(':visible'); + }, + + /** + * Product has weight + * @returns {Bool} + */ + productHasWeightBySwitcher: function () { + return $('input:checked', this.$weightSwitcher).val() === '1'; }, /** @@ -71,7 +71,7 @@ define([ * @param {String} data */ change: function (data) { - var value = data !== undefined ? +data : !this.productHasWeight(); + var value = data !== undefined ? +data : !this.productHasWeightBySwitcher(); $('input[value=' + value + ']', this.$weightSwitcher).prop('checked', true); }, @@ -81,7 +81,10 @@ define([ */ 'Magento_Catalog/js/product/weight-handler': function () { this.bindAll(); - this.switchWeight(); + + if (this.hasWeightSwither()) { + this.switchWeight(); + } }, /** From 8d904052dfec14894001a85fd1cff7401a86c226 Mon Sep 17 00:00:00 2001 From: Andrii Lugovyi Date: Fri, 13 Nov 2015 14:36:44 +0200 Subject: [PATCH 02/24] MAGETWO-45422: "Does this have a weight?" Yes / No Product field is available for bundle product --- .../view/adminhtml/web/js/product/weight-handler.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js b/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js index 83a4b462f62ab..fa1a78f96211d 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js @@ -10,9 +10,16 @@ define([ return { - $weightSwitcher: $('[data-role=weight-switcher]'), $weight: $('#weight'), + /** + * Weight Switcher + * @returns {*|jQuery|HTMLElement} + */ + $weightSwitcher: function () { + return $('[data-role=weight-switcher]'); + }, + /** * Is locked * @returns {*} From 48b406251208ee502722f8cbd255cafeaedf15d4 Mon Sep 17 00:00:00 2001 From: Oleksandr Dubovyk Date: Mon, 16 Nov 2015 17:36:46 +0200 Subject: [PATCH 03/24] MAGETWO-45443: Date range conditions in Admin are displayed not aligned --- app/design/adminhtml/Magento/backend/web/css/styles-old.less | 2 +- .../Magento/Framework/Data/Form/Element/AbstractElement.php | 4 ++-- lib/internal/Magento/Framework/Data/Form/Element/Date.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less index d1e80c2be6e3f..7d0abac4d4b9f 100644 --- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less +++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less @@ -3779,7 +3779,7 @@ .rule-chooser { border: solid 1px #CCC; margin: 20px; - padding: 15px 10px 5px; + padding: 15px 10px; overflow: auto; } diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php index 44f0fd5cde196..f3d029454c21d 100644 --- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php +++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php @@ -443,10 +443,10 @@ public function getDefaultHtml() { $html = $this->getData('default_html'); if ($html === null) { - $html = $this->getNoSpan() === true ? '' : '' . "\n"; + $html = $this->getNoSpan() === true ? '' : '
' . "\n"; $html .= $this->getLabelHtml(); $html .= $this->getElementHtml(); - $html .= $this->getNoSpan() === true ? '' : '' . "\n"; + $html .= $this->getNoSpan() === true ? '' : '
' . "\n"; } return $html; } diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Date.php b/lib/internal/Magento/Framework/Data/Form/Element/Date.php index ed2579789900e..2d2ad1ef80018 100644 --- a/lib/internal/Magento/Framework/Data/Form/Element/Date.php +++ b/lib/internal/Magento/Framework/Data/Form/Element/Date.php @@ -147,7 +147,7 @@ public function getValueInstance() */ public function getElementHtml() { - $this->addClass('input-text'); + $this->addClass('admin__control-text'); $dateFormat = $this->getDateFormat() ?: $this->getFormat(); $timeFormat = $this->getTimeFormat(); if (empty($dateFormat)) { From 5666558519f3bf5cd83da6b258edbef3c1a0ad65 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Thu, 26 Nov 2015 11:58:23 +0200 Subject: [PATCH 04/24] MAGETWO-45877: "Remove Product from Mini Shopping Cart" Storefront pop-up contains an overlap --- .../Magento/blank/web/css/source/components/_modals_extend.less | 2 +- .../Magento/luma/web/css/source/components/_modals_extend.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less index 907be81bf00e5..bf2785cbeff0c 100644 --- a/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less +++ b/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less @@ -75,7 +75,7 @@ } .action-close { - padding: @modal-popup__padding; + padding: @indent__s; } } diff --git a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less index 4df2fcd6f2977..98c4c45cd072f 100644 --- a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less +++ b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less @@ -75,7 +75,7 @@ } .action-close { - padding: @modal-popup__padding; + padding: @indent__base; } } From d0bffa7c50c61aa6bcb2bbe647be6e069d70c6cb Mon Sep 17 00:00:00 2001 From: Oleksandr Dubovyk Date: Fri, 27 Nov 2015 16:05:03 +0200 Subject: [PATCH 05/24] MAGETWO-45443: Date range conditions in Admin are displayed not aligned --- lib/internal/Magento/Framework/Data/Form/Element/Date.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Date.php b/lib/internal/Magento/Framework/Data/Form/Element/Date.php index 2d2ad1ef80018..aff7b41115263 100644 --- a/lib/internal/Magento/Framework/Data/Form/Element/Date.php +++ b/lib/internal/Magento/Framework/Data/Form/Element/Date.php @@ -147,7 +147,7 @@ public function getValueInstance() */ public function getElementHtml() { - $this->addClass('admin__control-text'); + $this->addClass('admin__control-text input-text'); $dateFormat = $this->getDateFormat() ?: $this->getFormat(); $timeFormat = $this->getTimeFormat(); if (empty($dateFormat)) { From 68b819724fde0bfe998160d76658532e9383c870 Mon Sep 17 00:00:00 2001 From: Oleksandr Dubovyk Date: Fri, 27 Nov 2015 18:30:21 +0200 Subject: [PATCH 06/24] MAGETWO-45443: Date range conditions in Admin are displayed not aligned - Changed unit-test --- .../Test/Unit/Form/Element/AbstractElementTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php index b601ed21a9e20..4fb4662ef138e 100644 --- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php +++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php @@ -328,8 +328,8 @@ public function testGetHtmlWithoutRenderer() $this->_model->setForm( $this->getMock('Magento\Framework\Data\Form\AbstractForm', [], [], '', false) ); - $expectedHtml = '' . "\n" - . '' . "\n"; + $expectedHtml = '
' . "\n" + . '
' . "\n"; $this->assertEquals($expectedHtml, $this->_model->getHtml()); $this->assertEquals(' required-entry _required', $this->_model->getClass()); @@ -529,8 +529,8 @@ public function testGetDefaultHtmlDataProvider() return [ [ [], - '' . "\n" - . '' . "\n", + '
' . "\n" + . '
' . "\n", ], [ ['default_html' => 'some default html'], @@ -543,11 +543,11 @@ public function testGetDefaultHtmlDataProvider() 'name' => 'some-name', 'value' => 'some-value', ], - '' . "\n" + '
' . "\n" . '' . "\n" . '' - . '' . "\n" + . '
' . "\n" ], [ [ From 6a89cda704daa4744eb0b3bfec131451d0637b67 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Mon, 30 Nov 2015 18:49:30 +0200 Subject: [PATCH 07/24] MAGETWO-46186: Wizard heading is displayed broken while creating Configurable Product --- .../Ui/view/base/templates/stepswizard.phtml | 12 +- .../module/components/_steps-wizard.less | 17 +- .../navigation-bar/_navigation-bar.less | 147 +++++++++--------- 3 files changed, 98 insertions(+), 78 deletions(-) diff --git a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml index d7ab4160a2c9c..8f7d1b9bebec2 100644 --- a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml +++ b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml @@ -23,10 +23,10 @@
-
+
@@ -36,10 +36,10 @@
-
+
diff --git a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_steps-wizard.less b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_steps-wizard.less index aca0e8ecb1783..ab47c57c2ca6d 100644 --- a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_steps-wizard.less +++ b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_steps-wizard.less @@ -5,14 +5,14 @@ // // Variables -// --------------------------------------------- +// _____________________________________________ @steps-wizard-section-title__border-color: @color-gray89; @steps-wizard-section-title__font-size: 1.8rem; // // Common -// --------------------------------------------- +// _____________________________________________ .product-create-configuration { &:extend(.abs-clearfix all); @@ -50,6 +50,7 @@ border-top: 1px solid @page-main-actions__border-color; margin: 0 0 @indent__base; padding: @page-main-actions__padding; + text-align: center; } .steps-wizard-title { @@ -79,3 +80,15 @@ } } } + +// +// Desktop +// _____________________________________________ + +.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) { + .steps-wizard { + .steps-wizard-navigation { + text-align: left; + } + } +} diff --git a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/navigation-bar/_navigation-bar.less b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/navigation-bar/_navigation-bar.less index 070b5ec5ea6d8..d0019702cf11b 100644 --- a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/navigation-bar/_navigation-bar.less +++ b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/navigation-bar/_navigation-bar.less @@ -57,11 +57,10 @@ // Buttons panel .nav-bar-outer-actions { - float: right; margin-bottom: @nav-bar-items__indent-bottom; .action-wrap { - float: right; + display: inline-block; margin-left: .5rem; margin-right: .5rem; } @@ -185,6 +184,7 @@ position: relative; text-align: center; text-overflow: ellipsis; + &:hover { text-decoration: none; } @@ -228,39 +228,27 @@ } // -// Desktop -// _____________________________________________ - -.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__l) { - .nav { - padding-bottom: @nav-bar__height__base + @nav-bar-items__indent-bottom; - padding-left: 1.5rem; - text-align: center; - } +// Steps +// --------------------------------------------- +.steps-wizard { .nav-bar { - display: inline-block; - float: none; - margin-right: 0; - vertical-align: top; - } + margin: @indent__xs 0 0; - .nav .btn-group, - .nav-bar-outer-actions { - display: inline-block; - float: none; - margin-top: -(@nav-bar__indent-top + @nav-bar__height__base + @nav-bar-items__indent-bottom + .1rem); - text-align: center; - vertical-align: top; - width: 100%; + a { + text-overflow: initial; + white-space: normal; + } + + :after, + :before { + box-sizing: content-box; + } } .nav-bar-outer-actions { + margin-top: @indent__s; padding-right: 0; - - .outer-actions-inner-wrap { - display: inline-block; - } } } @@ -268,6 +256,37 @@ // Mobile // _____________________________________________ +.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__xs) { + .nav-bar { + width: @nav-bar-step__width * .75 * 3; + + > li { + width: @nav-bar-step__width - .3; + } + } + + .nav .btn-group, + .nav-bar-outer-actions { + .btn-wrap-try-again { + clear: both; + display: block; + float: none; + margin-left: auto; + margin-right: auto; + margin-top: 1rem; + padding-top: 1rem; + } + } +} + +.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { + .nav-bar { + &:before { + display: none; + } + } +} + .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { .nav { padding-bottom: 0; @@ -285,11 +304,7 @@ margin-bottom: 0; margin-left: auto; margin-right: auto; - width: @nav-bar-step__width * 3; - - &:before { - display: none; - } + width: @nav-bar-step__width * 4; > li { float: left; @@ -298,10 +313,6 @@ &:after { display: none; } - - &:nth-child(4n) { - clear: both; - } } a { @@ -310,50 +321,46 @@ } } -.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__xs) { - .nav-bar { - width: @nav-bar-step__width * .75 * 3; +// +// Desktop +// _____________________________________________ - > li { - width: @nav-bar-step__width * .75; - } +.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__l) { + .nav { + padding-bottom: @nav-bar__height__base + @nav-bar-items__indent-bottom; + padding-left: 1.5rem; + text-align: center; + } + + .nav-bar { + display: inline-block; + float: none; + margin-right: 0; + vertical-align: top; } .nav .btn-group, .nav-bar-outer-actions { - .btn-wrap-try-again { - clear: both; - display: block; - float: none; - margin-left: auto; - margin-right: auto; - margin-top: 1rem; - padding-top: 1rem; - } + display: inline-block; + float: none; + margin-top: -(@nav-bar__indent-top + @nav-bar__height__base + @nav-bar-items__indent-bottom + .1rem); + text-align: center; + vertical-align: top; + width: 100%; } -} - -.steps-wizard { - .nav-bar { - margin: @indent__xs 0 0; - > li { - width: 12rem; - } - - a { - text-overflow: initial; - white-space: normal; - } + .nav-bar-outer-actions { + padding-right: 0; - :after, - :before { - box-sizing: content-box; + .outer-actions-inner-wrap { + display: inline-block; } } +} +.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) { + // Buttons panel .nav-bar-outer-actions { - margin-top: @indent__s; - padding-right: 0; + float: right; } } From be2e05695a3826bc9a8a9cfa5cc80cb45b375f63 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Tue, 1 Dec 2015 10:28:08 +0200 Subject: [PATCH 08/24] MAGETWO-46210: Wish Lists listing is displayed not aligned on "View Product" Storefront page if responsive --- .../luma/Magento_MultipleWishlist/web/css/source/_module.less | 1 + 1 file changed, 1 insertion(+) diff --git a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less index 3facd56f726e8..990a653f6dc32 100644 --- a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less @@ -34,6 +34,7 @@ .items { padding: 6px 0; + text-align: left; } &:extend(.abs-dropdown-items-new all); From 366831beeea25db7bee32613942ca61477afe726 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Tue, 1 Dec 2015 12:35:16 +0200 Subject: [PATCH 09/24] MAGETWO-46208: "Create New Wish List" Storefront pop-up doesn't fit the view-port if responsive --- .../blank/Magento_MultipleWishlist/web/css/source/_module.less | 2 ++ .../luma/Magento_MultipleWishlist/web/css/source/_module.less | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less index dbb862b95b8a7..9d31fd385fb37 100644 --- a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less @@ -104,7 +104,9 @@ } &.window.popup { + box-sizing: border-box; .lib-popup(); + &.active { display: block; } diff --git a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less index 3facd56f726e8..83d3a7f271a6a 100644 --- a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less @@ -118,7 +118,9 @@ // Wish list popup &.window.popup { + box-sizing: border-box; .lib-popup(); + &.active { display: block; } From bb2086a7e2b4abd9f9cbad686bd6cf04e6d3b647 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Tue, 1 Dec 2015 13:38:22 +0200 Subject: [PATCH 10/24] MAGETWO-46235: "Copy Selected" drop-down is displayed outside the visible view-port on "Edit Wish List" Storefront page --- .../web/css/source/_module.less | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less index 3facd56f726e8..2ddf71f5d3a93 100644 --- a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less @@ -236,6 +236,22 @@ margin-right: @indent__base; } + .copy { + .dropdown { + right: 0; + + &:before { + left: auto; + right: 11px; + } + + &:after { + left: auto; + right: 10px; + } + } + } + &-actions { } } From 6bb65c15c79f627c3528e0a0c7fadc6ddd31b2ea Mon Sep 17 00:00:00 2001 From: Oleksandr Dubovyk Date: Tue, 8 Dec 2015 19:36:20 +0200 Subject: [PATCH 11/24] MAGETWO-46662: [UI] Assistance with Accept Credit Card Payments using Braintree for StoreFront and Backend - Refactored html/css code --- .../view/adminhtml/templates/form/cc.phtml | 24 +++- .../view/adminhtml/web/css/styles.css | 57 --------- .../view/adminhtml/web/images/cards.png | Bin 5879 -> 0 bytes .../view/frontend/web/css/styles.css | 98 ---------------- .../frontend/web/template/payment/form.html | 28 ++--- .../web/css/source/_module.less | 109 ++++++++++++++++++ .../web/css/source/_module.less | 100 ++++++++++++++++ lib/web/images/cards.png | Bin 0 -> 10444 bytes 8 files changed, 242 insertions(+), 174 deletions(-) delete mode 100644 app/code/Magento/BraintreeTwo/view/adminhtml/web/css/styles.css delete mode 100644 app/code/Magento/BraintreeTwo/view/adminhtml/web/images/cards.png delete mode 100644 app/code/Magento/BraintreeTwo/view/frontend/web/css/styles.css create mode 100644 app/design/adminhtml/Magento/backend/Magento_Braintree/web/css/source/_module.less create mode 100644 app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less create mode 100644 lib/web/images/cards.png diff --git a/app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/cc.phtml index 9e85496ad65c6..8eb77bc890bbe 100644 --- a/app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/cc.phtml +++ b/app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/cc.phtml @@ -36,9 +36,12 @@ $ccType = $block->getInfoData('cc_type'); escapeHtml(__('Credit Card Number')); ?>
-
+
+
+ escapeHtml(__('Please, enter valid Credit Card Number')); ?> +
@@ -47,9 +50,15 @@ $ccType = $block->getInfoData('cc_type'); escapeHtml(__('Expiration Date')); ?>
-
- / -
+
+
+ +
+ +
escapeHtml(__('Please, enter valid Expiration Date')); ?>
+
hasVerification()): ?> @@ -58,7 +67,12 @@ $ccType = $block->getInfoData('cc_type'); escapeHtml(__('Card Verification Number')); ?>
-
+
+ +
+ escapeHtml(__('Please, enter valid Card Verification Number')); ?> +
diff --git a/app/code/Magento/BraintreeTwo/view/adminhtml/web/css/styles.css b/app/code/Magento/BraintreeTwo/view/adminhtml/web/css/styles.css deleted file mode 100644 index d46b52fcf846a..0000000000000 --- a/app/code/Magento/BraintreeTwo/view/adminhtml/web/css/styles.css +++ /dev/null @@ -1,57 +0,0 @@ -/** - * Copyright © 2015 Magento. All rights reserved. - * See COPYING.txt for license details. - */ -.control-container { - height: 2.4em; - background-color: #ffffff; - border-radius: 1px; - border: 1px solid #adadad; - color: #303030; - font-size: 1.4rem; - font-weight: 400; - line-height: 1.36; - padding: 0.6rem 1rem 0.6rem; - transition: border-color 0.1s linear; - vertical-align: baseline; -} -.control-container.select-date { - width: 30%; - display: inline-block; -} -.inline-separator { - display: inline-block; - margin: 0 10px; -} -.braintree-hosted-fields-focused { - border-color: #007bdb; -} -.braintree-hosted-fields-invalid{ - border-bottom-color: #D0021B; - border-bottom-width: 2px; -} -.icon-type { - position: absolute; - right: 5px; - top: 26px; - width: 40px; - height: 28px; - background-image: url('../images/cards.png'); - background-position: -1000px 0; - background-repeat: no-repeat; -} -.icon-type-discover { - background-position: 0 0; -} -.icon-type-visa { - background-position: 0 -28px; -} -.icon-type-master-card { - background-position: 0 -56px; -} -.icon-type-maestro { - background-position: 0 -85px; -} -.icon-type-american-express { - background-position: 0 -114px; -} \ No newline at end of file diff --git a/app/code/Magento/BraintreeTwo/view/adminhtml/web/images/cards.png b/app/code/Magento/BraintreeTwo/view/adminhtml/web/images/cards.png deleted file mode 100644 index 866756fe8b9f92b04ab024fb3c91afd4ae9164e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5879 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 -
+
-
+
+
@@ -69,17 +70,14 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+ +
+ +
@@ -89,7 +87,9 @@
-
+
+
+
$tj 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 Date: Wed, 9 Dec 2015 09:52:31 +0200 Subject: [PATCH 12/24] MAGETWO-46662: [UI] Assistance with Accept Credit Card Payments using Braintree for StoreFront and Backend - Sorted alphabetically --- .../Magento/blank/Magento_Braintree/web/css/source/_module.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less index b672474d547e5..a1c69c4a2f6a4 100644 --- a/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less @@ -63,8 +63,8 @@ &:after { content: '/'; display: inline; - padding-top: inherit; padding-bottom: inherit; + padding-top: inherit; position: absolute; right: -@distance / 2; top: 5px; From 977373bc222629b03e34b1e71cf14c62a6425928 Mon Sep 17 00:00:00 2001 From: Oleksandr Dubovyk Date: Wed, 9 Dec 2015 15:17:55 +0200 Subject: [PATCH 13/24] MAGETWO-46662: [UI] Assistance with Accept Credit Card Payments using Braintree for StoreFront and Backend - Added styles for Validation --- .../view/adminhtml/layout/sales_order_create_index.xml | 3 --- .../BraintreeTwo/view/adminhtml/templates/form/cc.phtml | 6 +++--- .../view/frontend/layout/checkout_index_index.xml | 3 --- .../backend/Magento_Braintree/web/css/source/_module.less | 3 ++- .../blank/Magento_Braintree/web/css/source/_module.less | 3 +++ 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/code/Magento/BraintreeTwo/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/BraintreeTwo/view/adminhtml/layout/sales_order_create_index.xml index 2b1afd2ec71d2..c3191421f12b3 100644 --- a/app/code/Magento/BraintreeTwo/view/adminhtml/layout/sales_order_create_index.xml +++ b/app/code/Magento/BraintreeTwo/view/adminhtml/layout/sales_order_create_index.xml @@ -6,9 +6,6 @@ */ --> - - - diff --git a/app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/cc.phtml index 8eb77bc890bbe..983e88e28c74a 100644 --- a/app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/cc.phtml +++ b/app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/cc.phtml @@ -39,7 +39,7 @@ $ccType = $block->getInfoData('cc_type');
-
+
escapeHtml(__('Please, enter valid Credit Card Number')); ?>
@@ -57,7 +57,7 @@ $ccType = $block->getInfoData('cc_type');
-
escapeHtml(__('Please, enter valid Expiration Date')); ?>
+
escapeHtml(__('Please, enter valid Expiration Date')); ?>
@@ -70,7 +70,7 @@ $ccType = $block->getInfoData('cc_type');
-
+
escapeHtml(__('Please, enter valid Card Verification Number')); ?>
diff --git a/app/code/Magento/BraintreeTwo/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/BraintreeTwo/view/frontend/layout/checkout_index_index.xml index f7016a767d8be..e73e0553475bc 100644 --- a/app/code/Magento/BraintreeTwo/view/frontend/layout/checkout_index_index.xml +++ b/app/code/Magento/BraintreeTwo/view/frontend/layout/checkout_index_index.xml @@ -6,9 +6,6 @@ */ --> - - - diff --git a/app/design/adminhtml/Magento/backend/Magento_Braintree/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Braintree/web/css/source/_module.less index b2cae0a42992f..321ce28a9c311 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Braintree/web/css/source/_module.less +++ b/app/design/adminhtml/Magento/backend/Magento_Braintree/web/css/source/_module.less @@ -40,6 +40,7 @@ @distance: 50px; float: left; + margin-bottom: .2rem; width: 5rem; &:first-of-type { @@ -51,7 +52,7 @@ padding-bottom: inherit; padding-top: inherit; position: absolute; - right: -@distance / 2; + right: -@distance * (2 / 3.5); top: 0; } } diff --git a/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less index a1c69c4a2f6a4..fa288e3e57b79 100644 --- a/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less @@ -55,6 +55,7 @@ @distance: 50px; float: left; + margin-bottom: 7px; width: 6rem; &:first-of-type { @@ -80,6 +81,8 @@ .hosted-error { clear: both; color: @braintree-error__color; + font-size: 1.2rem; + margin-top: 7px; height: 0; opacity: 0; } From 2b111811e4d2fc7ebb5c8cac72b5e99f3410d514 Mon Sep 17 00:00:00 2001 From: Oleksandr Dubovyk Date: Wed, 9 Dec 2015 15:21:51 +0200 Subject: [PATCH 14/24] MAGETWO-46662: [UI] Assistance with Accept Credit Card Payments using Braintree for StoreFront and Backend - Sorted --- .../Magento/blank/Magento_Braintree/web/css/source/_module.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less index fa288e3e57b79..652c516f93925 100644 --- a/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less @@ -82,8 +82,8 @@ clear: both; color: @braintree-error__color; font-size: 1.2rem; - margin-top: 7px; height: 0; + margin-top: 7px; opacity: 0; } } From fd7fc68a0f1acfede56b29cb95c4d472fef8e836 Mon Sep 17 00:00:00 2001 From: Michail Slabko Date: Thu, 10 Dec 2015 14:19:44 +0200 Subject: [PATCH 15/24] MAGETWO-46663: Most of category fields dont have Use Default Value option in Store/StoreView scope --- .../Magento/Catalog/Block/Adminhtml/Category/Tab/Attributes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Attributes.php index 06a77c8af6023..f73dda6152d1f 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Attributes.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Attributes.php @@ -11,7 +11,7 @@ */ namespace Magento\Catalog\Block\Adminhtml\Category\Tab; -class Attributes extends \Magento\Backend\Block\Widget\Form\Generic +class Attributes extends \Magento\Catalog\Block\Adminhtml\Form { /** * Retrieve Category object From db6cd8ef1163b2eff14a877608b08681eedddf90 Mon Sep 17 00:00:00 2001 From: "Lugovyi, Andrii(alugovyi)" Date: Fri, 13 Nov 2015 17:29:44 +0200 Subject: [PATCH 16/24] MAGETWO-45422: "Does this have a weight?" Yes / No Product field is available for bundle product --- .../web/js/product/weight-handler.js | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js b/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js index fa1a78f96211d..43abd2fe77933 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js @@ -10,7 +10,13 @@ define([ return { - $weight: $('#weight'), + /** + * Get weight + * @returns {*|jQuery|HTMLElement} + */ + $weight: function () { + return $('#weight'); + }, /** * Weight Switcher @@ -25,21 +31,21 @@ define([ * @returns {*} */ isLocked: function () { - return this.$weight.is('[data-locked]'); + return this.$weight().is('[data-locked]'); }, /** * Disabled */ disabled: function () { - this.$weight.addClass('ignore-validate').prop('disabled', true); + this.$weight().addClass('ignore-validate').prop('disabled', true); }, /** * Enabled */ enabled: function () { - this.$weight.removeClass('ignore-validate').prop('disabled', false); + this.$weight().removeClass('ignore-validate').prop('disabled', false); }, /** @@ -54,7 +60,7 @@ define([ * Hide weight switcher */ hideWeightSwitcher: function () { - this.$weightSwitcher.hide(); + this.$weightSwitcher().hide(); }, /** @@ -62,7 +68,7 @@ define([ * @returns {*} */ hasWeightSwither: function () { - return this.$weightSwitcher.is(':visible'); + return this.$weightSwitcher().is(':visible'); }, /** @@ -70,7 +76,7 @@ define([ * @returns {Bool} */ productHasWeightBySwitcher: function () { - return $('input:checked', this.$weightSwitcher).val() === '1'; + return $('input:checked', this.$weightSwitcher()).val() === '1'; }, /** @@ -80,7 +86,7 @@ define([ change: function (data) { var value = data !== undefined ? +data : !this.productHasWeightBySwitcher(); - $('input[value=' + value + ']', this.$weightSwitcher).prop('checked', true); + $('input[value=' + value + ']', this.$weightSwitcher()).prop('checked', true); }, /** @@ -98,7 +104,7 @@ define([ * Bind all */ bindAll: function () { - this.$weightSwitcher.find('input').on('change', this.switchWeight.bind(this)); + this.$weightSwitcher().find('input').on('change', this.switchWeight.bind(this)); } }; }); From 60a94e1700c20b7796ef88b46796d103e20531a3 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Thu, 10 Dec 2015 17:18:35 +0200 Subject: [PATCH 17/24] MAGETWO-46232: "Wish List actions" drop-down items are highlighted invalidly on Storefront in Blank Theme --- .../blank/Magento_MultipleWishlist/web/css/source/_module.less | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less index 6280c42f5eadb..59aa694f13268 100644 --- a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less @@ -36,8 +36,6 @@ text-align: left; .item { &:last-child { - background: @color-gray-darken1; - &:hover { .lib-css(background, @dropdown-list-item__hover); } From 98f540a5eba4a18696d5bc57cf8c04a90d003324 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Fri, 11 Dec 2015 12:38:48 +0200 Subject: [PATCH 18/24] MAGETWO-46057: "Remove row" buttons aren't centered vertically --- .../Magento_AdvancedCheckout/web/css/source/_module.less | 5 +++-- .../Magento_AdvancedCheckout/web/css/source/_module.less | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/design/frontend/Magento/blank/Magento_AdvancedCheckout/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_AdvancedCheckout/web/css/source/_module.less index 9d2890d2e2dcc..a737bc72a80ae 100644 --- a/app/design/frontend/Magento/blank/Magento_AdvancedCheckout/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_AdvancedCheckout/web/css/source/_module.less @@ -123,7 +123,8 @@ .lib-button-icon( @_icon-font-content: @icon-remove, @_icon-font-text-hide: true, - @_icon-font-size: 28px + @_icon-font-size: 28px, + @_icon-font-margin: 1px 0 0 ); .lib-button-reset(); } @@ -139,7 +140,7 @@ &.remove { .lib-button-reset(); .lib-button-as-link(); - margin-top: 4px; + margin-top: 2px; } } } diff --git a/app/design/frontend/Magento/luma/Magento_AdvancedCheckout/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_AdvancedCheckout/web/css/source/_module.less index 905fe653e21c3..37e16b98936ee 100644 --- a/app/design/frontend/Magento/luma/Magento_AdvancedCheckout/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_AdvancedCheckout/web/css/source/_module.less @@ -134,7 +134,8 @@ @_icon-font-content: @icon-trash, @_icon-font-text-hide: true, @_icon-font-size: 18px, - @_icon-font-color: @minicart-icons-color + @_icon-font-color: @minicart-icons-color, + @_icon-font-margin: -4px 0 0 ); .lib-button-reset(); } @@ -158,7 +159,7 @@ &.remove { .lib-button-reset(); .lib-button-as-link(); - margin-top: 4px; + margin-top: -4px; } } } From 5663d26c8b7059715ab9a2ff542331266ee04d75 Mon Sep 17 00:00:00 2001 From: Oleksandr Dubovyk Date: Fri, 11 Dec 2015 18:54:11 +0200 Subject: [PATCH 19/24] MAGETWO-46662: [UI] Assistance with Accept Credit Card Payments using Braintree for StoreFront and Backend - Refactored - Corrected Spelling --- .../view/adminhtml/templates/form/cc.phtml | 6 +++--- .../view/frontend/web/template/payment/form.html | 6 +++--- .../Magento_Braintree/web/css/source/_module.less | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/cc.phtml index 983e88e28c74a..d62624fd02b0d 100644 --- a/app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/cc.phtml +++ b/app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/cc.phtml @@ -40,7 +40,7 @@ $ccType = $block->getInfoData('cc_type');
- escapeHtml(__('Please, enter valid Credit Card Number')); ?> + escapeHtml(__('Please enter valid Credit Card Number')); ?>
@@ -57,7 +57,7 @@ $ccType = $block->getInfoData('cc_type');
-
escapeHtml(__('Please, enter valid Expiration Date')); ?>
+
escapeHtml(__('Please enter valid Expiration Date')); ?>
@@ -71,7 +71,7 @@ $ccType = $block->getInfoData('cc_type'); class="admin__control-text hosted-control hosted-cid">
- escapeHtml(__('Please, enter valid Card Verification Number')); ?> + escapeHtml(__('Please enter valid Card Verification Number')); ?>
diff --git a/app/code/Magento/BraintreeTwo/view/frontend/web/template/payment/form.html b/app/code/Magento/BraintreeTwo/view/frontend/web/template/payment/form.html index ee25e1fc97e5b..1531ceb73f23e 100644 --- a/app/code/Magento/BraintreeTwo/view/frontend/web/template/payment/form.html +++ b/app/code/Magento/BraintreeTwo/view/frontend/web/template/payment/form.html @@ -62,7 +62,7 @@
-
+
@@ -77,7 +77,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
Date: Mon, 14 Dec 2015 12:59:54 +0200 Subject: [PATCH 20/24] MAGETWO-45422: "Does this have a weight?" Yes / No Product field is available for bundle product --- .../Catalog/view/adminhtml/web/js/product/weight-handler.js | 1 + .../view/adminhtml/web/downloadable-type-handler.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js b/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js index 43abd2fe77933..5767480c81622 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js @@ -87,6 +87,7 @@ define([ var value = data !== undefined ? +data : !this.productHasWeightBySwitcher(); $('input[value=' + value + ']', this.$weightSwitcher()).prop('checked', true); + this.switchWeight(); }, /** diff --git a/app/code/Magento/Downloadable/view/adminhtml/web/downloadable-type-handler.js b/app/code/Magento/Downloadable/view/adminhtml/web/downloadable-type-handler.js index d76b7ba45d758..24e5b4ea9a450 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/web/downloadable-type-handler.js +++ b/app/code/Magento/Downloadable/view/adminhtml/web/downloadable-type-handler.js @@ -61,7 +61,7 @@ define([ _initType: function () { if (productType.type.current === 'downloadable') { weight.change(false); - weight.$weightSwitcher.one('change', function () { + weight.$weightSwitcher().one('change', function () { $(document).trigger('setTypeProduct', null); }); this.show(); From d54c058683c3e39ff77c83d736fe2da3dc783c54 Mon Sep 17 00:00:00 2001 From: Michail Slabko Date: Mon, 14 Dec 2015 15:02:37 +0200 Subject: [PATCH 21/24] MAGETWO-45610: [Create Virtual Product] Invalid Test variation --- ...ductTierPriceOnProductPageWithCustomer.php | 68 +++++++++++++++++++ .../Test/Repository/Product/TierPrice.xml | 9 +++ .../CreateVirtualProductEntityTest.xml | 15 +++- 3 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPageWithCustomer.php diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPageWithCustomer.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPageWithCustomer.php new file mode 100644 index 0000000000000..8ce42fb0a28d5 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPageWithCustomer.php @@ -0,0 +1,68 @@ +persist(); + $this->loginCustomer($customer); + + $productTierPriceAssert = $this->objectManager->get( + 'Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage' + ); + $productTierPriceAssert->processAssert($browser, $catalogProductView, $product); + } + + /** + * Login customer + * + * @param Customer $customer + * + * @return void + */ + protected function loginCustomer($customer) + { + $this->objectManager->create( + 'Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep', + ['customer' => $customer] + )->run(); + } + + /** + * Returns a string representation of the object + * + * @return string + */ + public function toString() + { + return 'Tier price is displayed on the product page for specific customer.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/TierPrice.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/TierPrice.xml index 805c784847fed..ed80a0648244e 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/TierPrice.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/TierPrice.xml @@ -30,5 +30,14 @@ ALL GROUPS + + + + 80 + All Websites [USD] + 2 + General + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml index 077a819c35984..dbe7f420d7339 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml @@ -35,6 +35,7 @@ + Create product with out of stock @@ -52,17 +53,24 @@ - Create product with group price + Create product with tier price for "General" group virtual-product-%isolation% VirtualProduct %isolation% virtual_sku_%isolation% - 10 + 100 + None + 999 No category_%isolation% - Catalog + general + Yes + In Stock + Catalog, Search + default + Create product with custom options suite and import options @@ -70,6 +78,7 @@ VirtualProduct %isolation% virtual_sku_%isolation% 9000 + 999 No options_suite catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option From d145602e650e4828bcfd5f78feb030debd8e05b9 Mon Sep 17 00:00:00 2001 From: Serhiy Shkolyarenko Date: Thu, 17 Dec 2015 17:54:26 +0200 Subject: [PATCH 22/24] MAGETWO-46968: Upgrade data issues fixed upgrade script --- .../Magento/Customer/Setup/UpgradeData.php | 91 ++++++++++--------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/app/code/Magento/Customer/Setup/UpgradeData.php b/app/code/Magento/Customer/Setup/UpgradeData.php index 3b2489cb62692..d19765b99a43b 100644 --- a/app/code/Magento/Customer/Setup/UpgradeData.php +++ b/app/code/Magento/Customer/Setup/UpgradeData.php @@ -60,6 +60,52 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface /** @var CustomerSetup $customerSetup */ $customerSetup = $this->customerSetupFactory->create(['setup' => $setup]); + if (version_compare($context->getVersion(), '2.0.6', '<')) { + $customerSetup->updateEntityType( + \Magento\Customer\Model\Customer::ENTITY, + 'entity_model', + 'Magento\Customer\Model\ResourceModel\Customer' + ); + $customerSetup->updateEntityType( + \Magento\Customer\Model\Customer::ENTITY, + 'increment_model', + 'Magento\Eav\Model\Entity\Increment\NumericValue' + ); + $customerSetup->updateEntityType( + \Magento\Customer\Model\Customer::ENTITY, + 'entity_attribute_collection', + 'Magento\Customer\Model\ResourceModel\Attribute\Collection' + ); + $customerSetup->updateEntityType( + 'customer_address', + 'entity_model', + 'Magento\Customer\Model\ResourceModel\Address' + ); + $customerSetup->updateEntityType( + 'customer_address', + 'entity_attribute_collection', + 'Magento\Customer\Model\ResourceModel\Address\Attribute\Collection' + ); + $customerSetup->updateAttribute( + 'customer_address', + 'country_id', + 'source_model', + 'Magento\Customer\Model\ResourceModel\Address\Attribute\Source\Country' + ); + $customerSetup->updateAttribute( + 'customer_address', + 'region', + 'backend_model', + 'Magento\Customer\Model\ResourceModel\Address\Attribute\Backend\Region' + ); + $customerSetup->updateAttribute( + 'customer_address', + 'region_id', + 'source_model', + 'Magento\Customer\Model\ResourceModel\Address\Attribute\Source\Region' + ); + } + if (version_compare($context->getVersion(), '2.0.1', '<')) { $entityAttributes = [ 'customer' => [ @@ -240,51 +286,6 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface ]; $this->upgradeAttributes($entityAttributes, $customerSetup); } - if (version_compare($context->getVersion(), '2.0.6', '<')) { - $customerSetup->updateEntityType( - \Magento\Customer\Model\Customer::ENTITY, - 'entity_model', - 'Magento\Customer\Model\ResourceModel\Customer' - ); - $customerSetup->updateEntityType( - \Magento\Customer\Model\Customer::ENTITY, - 'increment_model', - 'Magento\Eav\Model\Entity\Increment\NumericValue' - ); - $customerSetup->updateEntityType( - \Magento\Customer\Model\Customer::ENTITY, - 'entity_attribute_collection', - 'Magento\Customer\Model\ResourceModel\Attribute\Collection' - ); - $customerSetup->updateEntityType( - 'customer_address', - 'entity_model', - 'Magento\Customer\Model\ResourceModel\Address' - ); - $customerSetup->updateEntityType( - 'customer_address', - 'entity_attribute_collection', - 'Magento\Customer\Model\ResourceModel\Address\Attribute\Collection' - ); - $customerSetup->updateAttribute( - 'customer_address', - 'country_id', - 'source_model', - 'Magento\Customer\Model\ResourceModel\Address\Attribute\Source\Country' - ); - $customerSetup->updateAttribute( - 'customer_address', - 'region', - 'backend_model', - 'Magento\Customer\Model\ResourceModel\Address\Attribute\Backend\Region' - ); - $customerSetup->updateAttribute( - 'customer_address', - 'region_id', - 'source_model', - 'Magento\Customer\Model\ResourceModel\Address\Attribute\Source\Region' - ); - } if (version_compare($context->getVersion(), '2.0.6', '<')) { $setup->getConnection()->delete( From 16855f0ef37041cb418d77f84989da397aab140e Mon Sep 17 00:00:00 2001 From: Michail Slabko Date: Fri, 18 Dec 2015 17:23:19 +0200 Subject: [PATCH 23/24] MAGETWO-43771: There is no reliable way to refer Attribute Group from EAV Setup --- .../Magento/Catalog/Setup/InstallData.php | 14 ++++---- .../ResourceModel/Entity/Attribute/Group.php | 7 ---- app/code/Magento/Eav/Setup/EavSetup.php | 33 ++++++++++++------- .../ProductVideo/Setup/UpgradeData.php | 2 +- .../Test/Legacy/_files/obsolete_constants.php | 4 ++- 5 files changed, 32 insertions(+), 28 deletions(-) diff --git a/app/code/Magento/Catalog/Setup/InstallData.php b/app/code/Magento/Catalog/Setup/InstallData.php index 535d99c56fed7..0b86b819d0962 100644 --- a/app/code/Magento/Catalog/Setup/InstallData.php +++ b/app/code/Magento/Catalog/Setup/InstallData.php @@ -89,13 +89,13 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $categorySetup->updateAttributeGroup($entityTypeId, $attributeSetId, $attributeGroupId, 'sort_order', '10'); $groups = [ - 'display' => ['name' => 'Display Settings', 'sort' => 20, 'id' => null], - 'design' => ['name' => 'Custom Design', 'sort' => 30, 'id' => null], + 'display' => ['name' => 'Display Settings', 'code' => 'display-settings', 'sort' => 20, 'id' => null], + 'design' => ['name' => 'Custom Design', 'code' => 'custom-design', 'sort' => 30, 'id' => null], ]; foreach ($groups as $k => $groupProp) { $categorySetup->addAttributeGroup($entityTypeId, $attributeSetId, $groupProp['name'], $groupProp['sort']); - $groups[$k]['id'] = $categorySetup->getAttributeGroupId($entityTypeId, $attributeSetId, $groupProp['name']); + $groups[$k]['id'] = $categorySetup->getAttributeGroupId($entityTypeId, $attributeSetId, $groupProp['code']); } // update attributes group and sort @@ -183,25 +183,25 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $tabNames = [ 'General' => [ 'attribute_group_name' => $newGeneralTabName, - 'attribute_group_code' => preg_replace('/[^a-z0-9]+/', '-', strtolower($newGeneralTabName)), + 'attribute_group_code' => $categorySetup->convertToAttributeGroupCode($newGeneralTabName), 'tab_group_code' => 'basic', 'sort_order' => 10, ], 'Images' => [ 'attribute_group_name' => $newImagesTabName, - 'attribute_group_code' => preg_replace('/[^a-z0-9]+/', '-', strtolower($newImagesTabName)), + 'attribute_group_code' => $categorySetup->convertToAttributeGroupCode($newImagesTabName), 'tab_group_code' => 'basic', 'sort_order' => 20, ], 'Meta Information' => [ 'attribute_group_name' => $newMetaTabName, - 'attribute_group_code' => preg_replace('/[^a-z0-9]+/', '-', strtolower($newMetaTabName)), + 'attribute_group_code' => $categorySetup->convertToAttributeGroupCode($newMetaTabName), 'tab_group_code' => 'basic', 'sort_order' => 30, ], 'Prices' => [ 'attribute_group_name' => $newPriceTabName, - 'attribute_group_code' => preg_replace('/[^a-z0-9]+/', '-', strtolower($newPriceTabName)), + 'attribute_group_code' => $categorySetup->convertToAttributeGroupCode($newPriceTabName), 'tab_group_code' => 'advanced', 'sort_order' => 40, ], diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group.php index 6a4a8f0e70ffa..5f146390e89d1 100644 --- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group.php +++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group.php @@ -12,13 +12,6 @@ */ class Group extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb { - /** - * Constants for attribute group codes - */ - const TAB_GENERAL_CODE = 'product-details'; - - const TAB_IMAGE_MANAGEMENT_CODE = 'image-management'; - /** * Resource initialization * diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php index d1d0452fe7b77..93b0851d3a271 100644 --- a/app/code/Magento/Eav/Setup/EavSetup.php +++ b/app/code/Magento/Eav/Setup/EavSetup.php @@ -59,7 +59,7 @@ class EavSetup * * @var array */ - private $defaultGroupIdAssociations = ['General' => 1]; + private $defaultGroupIdAssociations = ['general' => 1]; /** * Default attribute group name @@ -134,12 +134,12 @@ public function cleanCache() public function installDefaultGroupIds() { $setIds = $this->getAllAttributeSetIds(); - foreach ($this->defaultGroupIdAssociations as $defaultGroupName => $defaultGroupId) { + foreach ($this->defaultGroupIdAssociations as $defaultGroupCode => $defaultGroupId) { foreach ($setIds as $set) { $groupId = $this->setup->getTableRow( 'eav_attribute_group', - 'attribute_group_name', - $defaultGroupName, + 'attribute_group_code', + $defaultGroupCode, 'attribute_group_id', 'attribute_set_id', $set @@ -511,16 +511,17 @@ public function addAttributeGroup($entityTypeId, $setId, $name, $sortOrder = nul { $setId = $this->getAttributeSetId($entityTypeId, $setId); $data = ['attribute_set_id' => $setId, 'attribute_group_name' => $name]; + $attributeGroupCode = $this->convertToAttributeGroupCode($name); - if (isset($this->defaultGroupIdAssociations[$name])) { - $data['default_id'] = $this->defaultGroupIdAssociations[$name]; + if (isset($this->defaultGroupIdAssociations[$attributeGroupCode])) { + $data['default_id'] = $this->defaultGroupIdAssociations[$attributeGroupCode]; } if ($sortOrder !== null) { $data['sort_order'] = $sortOrder; } - $groupId = $this->getAttributeGroup($entityTypeId, $setId, $name, 'attribute_group_id'); + $groupId = $this->getAttributeGroup($entityTypeId, $setId, $attributeGroupCode, 'attribute_group_id'); if ($groupId) { $this->updateAttributeGroup($entityTypeId, $setId, $groupId, $data); } else { @@ -528,7 +529,6 @@ public function addAttributeGroup($entityTypeId, $setId, $name, $sortOrder = nul $data['sort_order'] = $this->getAttributeGroupSortOrder($entityTypeId, $setId, $sortOrder); } if (empty($data['attribute_group_code'])) { - $attributeGroupCode = trim(preg_replace('/[^a-z0-9]+/', '-', strtolower($name)), '-'); if (empty($attributeGroupCode)) { // in the following code md5 is not used for security purposes $attributeGroupCode = md5($name); @@ -541,6 +541,15 @@ public function addAttributeGroup($entityTypeId, $setId, $name, $sortOrder = nul return $this; } + /** + * @param string $groupName + * @return string + */ + public function convertToAttributeGroupCode($groupName) + { + return trim(preg_replace('/[^a-z0-9]+/', '-', strtolower($groupName)), '-'); + } + /** * Update Attribute Group Data * @@ -577,22 +586,22 @@ public function updateAttributeGroup($entityTypeId, $setId, $id, $field, $value */ public function getAttributeGroup($entityTypeId, $setId, $id, $field = null) { - $searchId = $id; if (is_numeric($id)) { $searchField = 'attribute_group_id'; } else { + $id = $this->convertToAttributeGroupCode($id); if (isset($this->defaultGroupIdAssociations[$id])) { $searchField = 'default_id'; - $searchId = $this->defaultGroupIdAssociations[$id]; + $id = $this->defaultGroupIdAssociations[$id]; } else { - $searchField = 'attribute_group_name'; + $searchField = 'attribute_group_code'; } } return $this->setup->getTableRow( 'eav_attribute_group', $searchField, - $searchId, + $id, $field, 'attribute_set_id', $this->getAttributeSetId($entityTypeId, $setId) diff --git a/app/code/Magento/ProductVideo/Setup/UpgradeData.php b/app/code/Magento/ProductVideo/Setup/UpgradeData.php index b1e418c0f39df..056db24d4c76a 100644 --- a/app/code/Magento/ProductVideo/Setup/UpgradeData.php +++ b/app/code/Magento/ProductVideo/Setup/UpgradeData.php @@ -51,7 +51,7 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $attributeGroup = $categorySetup->getAttributeGroup( $entityTypeId, $attributeSetId, - 'Image Management' + 'image-management' ); if (isset($attributeGroup['attribute_group_name']) && $attributeGroup['attribute_group_name'] == 'Image Management' diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php index a6c1b3688018e..0b1d33e45a6a7 100644 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php @@ -949,5 +949,7 @@ 'DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR', 'Magento\CatalogImportExport\Model\Import\Product', 'Magento\ImportExport\Model\Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR' - ] + ], + ['TAB_GENERAL_CODE', 'Magento\Eav\Model\ResourceModel\Entity\Attribute\Group'], + ['TAB_IMAGE_MANAGEMENT_CODE', 'Magento\Eav\Model\ResourceModel\Entity\Attribute\Group'], ]; From fe76bca034663ef523d187b05319a2fa36bff92a Mon Sep 17 00:00:00 2001 From: Michail Slabko Date: Fri, 18 Dec 2015 18:53:44 +0200 Subject: [PATCH 24/24] MAGETWO-45422: "Does this have a weight?" Yes / No Product field is available for bundle product - fix static --- .../Magento/Catalog/view/adminhtml/web/catalog/type-events.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/type-events.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/type-events.js index 6412f1169c75a..abcdfd3065972 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/type-events.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/type-events.js @@ -16,7 +16,7 @@ define([ */ init: function () { - //not weight switcher giftcard, bundle + //not weight switcher for specific product if (weight.productHasWeightBySwitcher() && weight.hasWeightSwither()) { this.type = { virtual: 'virtual',