From 46d4116c8a7cc14a473fe23a1b22c92106404c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karla=20Saarem=C3=A4e?= Date: Thu, 31 May 2018 14:34:48 +0300 Subject: [PATCH 01/51] swatches LESS rewrite Rewrote LESS code to suit better with Magneto Blank theme --- .../web/css/source/_module.less | 576 ++++++++++-------- 1 file changed, 315 insertions(+), 261 deletions(-) diff --git a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less index 907180eb37444..0fcee34fda688 100644 --- a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less @@ -4,289 +4,343 @@ // */ // -// Common +// Variables // _____________________________________________ - & when (@media-common = true) { - .swatch-attribute-label { - font-weight: bold; - position: relative; - } - - .swatch-attribute-label.required { - padding-right: 10px; - } - - .swatch-attribute-label[data-required="1"]:after { - content: '*'; - color: red; - position: absolute; - right: -11px; - top: -2px; - font-weight: bold; - font-size: 1em; - } +@swatch-attribute-option__selected__color: #646464; - .swatch-attribute-selected-option { - color: #646464; - padding-left: 17px; - } +@swatch-option__background: @color-gray94; +@swatch-option__border: @border-width__base solid #dadada; - .swatch-attribute-options { - margin-top: 10px; - } +@swatch-option__hover__border: @border-width__base solid @color-white; +@swatch-option__hover__color: @color-gray20; +@swatch-option__hover__outline: 1px solid @color-gray60; - .swatch-option { - padding: 1px 2px; - min-width: 30px; - max-width: 90px; - height: 20px; - float: left; - margin: 0 10px 5px 0; - text-align: center; - cursor: pointer; - position: relative; - border: 1px solid rgb(218, 218, 218); - overflow: hidden; - text-overflow: ellipsis; - } +@swatch-option__selected__border: @swatch-option__hover__border; +@swatch-option__selected__color: @swatch-option__hover__color; +@swatch-option__selected__outline: 2px solid @color-orange-red1; - .swatch-option.text { - background: #F0F0F0; - color: #686868; - font-size: 12px; - font-weight: 700; - line-height: 20px; - padding: 4px 8px; - min-width: 22px; - margin-right: 7px; - } - - .swatch-option.selected { - outline: 2px solid #ff5501; - border: 1px solid #fff; - color: #333; - } - - .swatch-option.text.selected { - background-color: #FFF !important; - } - - .clearfix:after { - content: ''; - visibility: hidden; - display: block; - height: 0; - clear: both; - } +@swatch-option__disabled__background: @color-red10; - .swatch-attribute.size .swatch-option, - .swatch-attribute.manufacturer .swatch-option { - background: rgb(240, 240, 240); - color: rgb(148, 148, 148); - } +// Text attributes +@swatch-option-text__background: @swatch-option__background; +@swatch-option-text__color: #686868; - .swatch-attribute.size .swatch-option.selected, - .swatch-attribute.manufacturer .swatch-option.selected { - color: black; - background: #fff; - border: 1px solid #fff; - } +@swatch-option-text__selected__background-color: @color-white !important; - .swatch-option:not(.disabled):hover { - outline: 1px solid #999; - border: 1px solid #fff; - color: #333; - } +// Size and Manufacturer attributes +@attr-swatch-option__background: @swatch-option__background; +@attr-swatch-option__color: #949494; - .swatch-option.image:not(.disabled):hover, - .swatch-option.color:not(.disabled):hover { - outline: 2px solid #ee0000; - border: 1px solid #fff; - } +@attr-swatch-option__selected__background: @color-white; +@attr-swatch-option__selected__border: @border-width__base solid @color-white; +@attr-swatch-option__selected__color: @color-black; - .swatch-option.disabled { - cursor: default; - } +// Image and Color swatch +@img-color-swatch-option__hover__border: @swatch-option__hover__border; +@img-color-swatch-option__hover__outline: 2px solid #ee0000; - .swatch-option.disabled:after { - content: ''; - position: absolute; - left: 0; - right: 0; - top: 0; - bottom: 0; - background: -moz-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); - background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(42%, rgba(255, 255, 255, 0)), color-stop(43%, rgba(255, 255, 255, 1)), color-stop(46%, rgba(255, 255, 255, 1)), color-stop(47%, rgba(255, 82, 22, 1)), color-stop(53%, rgba(255, 82, 22, 1)), color-stop(54%, rgba(255, 255, 255, 1)), color-stop(57%, rgba(255, 255, 255, 1)), color-stop(58%, rgba(255, 255, 255, 0)), color-stop(100%, rgba(255, 255, 255, 0))); - background: -webkit-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); - background: -o-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); - background: -ms-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); - background: linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00ffffff', endColorstr='#00ffffff', GradientType=1); - } +// Tooltip +@swatch-option-tooltip__background: @color-white; +@swatch-option-tooltip__border: @swatch-option__border; +@swatch-option-tooltip__color: #949494; - .swatch-option-tooltip { - max-width: 140px; - max-height: 100%; - min-height: 20px; - min-width: 20px; - position: absolute; - padding: 5px; - background: #fff; - color: rgb(148, 148, 148); - border: 1px solid #adadad; - display: none; - z-index: 999; - text-align: center; - } +@swatch-option-tooltip-title__color: #282828; - .swatch-option-tooltip .corner, - .swatch-option-tooltip-layered .corner { - left: 40%; - position: absolute; - bottom: 0; - height: 8px; - } +@swatch-option-tooltip-layered__background: @swatch-option-tooltip__background; +@swatch-option-tooltip-layered__border: @swatch-option__border; +@swatch-option-tooltip-layered__color: @swatch-option-tooltip__color; - .swatch-option-tooltip .corner:after, - .swatch-option-tooltip-layered .corner:after { - content: ''; - position: relative; - top: 1px; - left: -15px; - width: 0; - height: 0; - border-style: solid; - border-width: 7px 7.5px 0 7.5px; - border-color: #fff transparent transparent transparent; - font-size: 1px; - } +@swatch-option-tooltip-layered-title__color: @swatch-option-tooltip-title__color; - .swatch-option-tooltip .corner:before, - .swatch-option-tooltip-layered .corner:before { - content: ''; - position: relative; - top: 2px; - left: 0; - width: 0; - height: 0; - border-style: solid; - border-width: 8px 8.5px 0 8.5px; - border-color: #adadad transparent transparent transparent; - font-size: 1px; - } +// Layered Features +@swatch-option-link-layered__focus__box-shadow: 0 0 3px 1px @color-sky-blue1; - .swatch-option-tooltip .image, - .swatch-option-tooltip-layered .image { - display: block; - height: 130px; - width: 130px; - margin: 0 auto; - } - - .swatch-option-tooltip .title { - max-width: 140px; - min-height: 20px; - max-height: 200px; - color: rgb(40, 40, 40); - text-align: center; - display: block; - overflow: hidden; - } - - .swatch-opt { - margin: 20px 0; - } - - .swatch-more { - display: inline-block; - margin: 2px 0; - text-decoration: none !important; - position: static; - z-index: 1; - } - - // Layered Features - .swatch-option-link-layered { - position: relative; - margin: 0 !important; - padding: 0 !important; - } - - .swatch-option-link-layered:focus>div { - box-shadow: 0 0 3px 1px #68a8e0; - } - - .swatch-option-tooltip-layered { - width: 140px; - position: absolute; - background: #fff; - color: rgb(148, 148, 148); - border: 1px solid #adadad; - display: none; - z-index: 999; - left: -47px; - } - - .swatch-visual-tooltip-layered { - height: 160px; - top: -170px; - } - - .swatch-textual-tooltip-layered { - height: 30px; - top: -40px; - } +// +// Common +// _____________________________________________ - .swatch-option-link-layered:hover>.swatch-option-tooltip-layered { - display: block; - } + & when (@media-common = true) { - .swatch-attribute-options .swatch-option-tooltip-layered .title { - width: 100%; - height: 20px; - position: absolute; - bottom: -5px; - left: 0; - color: rgb(40, 40, 40); - text-align: center; - margin-bottom: 10px; + .swatch { + &-attribute { + &-label { + font-weight: @font-weight__bold; + position: relative; + + &.required { + padding-right: @indent__s; + } + + &[data-required="1"]:after { + .lib-css(color, @form-field-label-asterisk__color); + content: '*'; + position: absolute; + right: -11px; + top: -2px; + font-weight: @font-weight__bold; + font-size: @font-size__base; + } + } + + &-selected-option { + .lib-css(color, @swatch-attribute-option__selected__color); + padding-left: 17px; + } + + &-options { + margin-top: @indent__s; + + .swatch-option-tooltip-layered .title { + .lib-css(color, @swatch-option-tooltip-layered-title__color); + width: 100%; + height: 20px; + position: absolute; + bottom: -5px; + left: 0; + text-align: center; + margin-bottom: @indent__s; + } + } + + &.size, + &.manufacturer { + .swatch-option { + .lib-css(background, @attr-swatch-option__background); + .lib-css(color, @attr-swatch-option__color); + + &.selected { + .lib-css(blackground, @attr-swatch-option__selected__background); + .lib-css(border, @attr-swatch-option__selected__border); + .lib-css(color, @attr-swatch-option__selected__color); + } + } + } + } + + &-option { + .lib-css(border, @swatch-option__border); + padding: 1px 2px; + min-width: 30px; + max-width: 90px; + height: 20px; + float: left; + margin: 0 @indent__s @indent__xs 0; + text-align: center; + cursor: pointer; + position: relative; + overflow: hidden; + text-overflow: ellipsis; + + &.text { + .lib-css(background, @swatch-option-text__background); + .lib-css(color, @swatch-option-text__color); + font-size: @font-size__s; + font-weight: @font-weight__bold; + line-height: 20px; + padding: 4px 8px; + min-width: 22px; + margin-right: 7px; + + &.selected { + .lib-css(background-color, @swatch-option-text__selected__background-color); + } + } + + &.selected { + .lib-css(outline, @swatch-option__selected__outline); + .lib-css(border, @swatch-option__selected__border); + .lib-css(color, @swatch-option__selected__color); + } + + &:not(.disabled):hover { + .lib-css(border, @swatch-option__hover__border); + .lib-css(color, @swatch-option__hover__color); + .lib-css(outline, @swatch-option__hover__outline); + } + + &.image, + &.color { + &:not(.disabled):hover { + .lib-css(border, @img-color-swatch-option__hover__border); + .lib-css(outline, @img-color-swatch-option__hover__outline); + } + } + + &.disabled { + cursor: default; + + &:after { + content: ''; + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; + + // ToDo: improve .lib-background-gradient() to support diagonal gradient + background: -moz-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); + background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(42%, rgba(255, 255, 255, 0)), color-stop(43%, rgba(255, 255, 255, 1)), color-stop(46%, rgba(255, 255, 255, 1)), color-stop(47%, rgba(255, 82, 22, 1)), color-stop(53%, rgba(255, 82, 22, 1)), color-stop(54%, rgba(255, 255, 255, 1)), color-stop(57%, rgba(255, 255, 255, 1)), color-stop(58%, rgba(255, 255, 255, 0)), color-stop(100%, rgba(255, 255, 255, 0))); + background: -webkit-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); + background: -o-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); + background: -ms-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); + background: linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00ffffff', endColorstr='#00ffffff', GradientType=1); + } + } + &-disabled { + outline: none !important; + cursor: default; + border: 0; + + &:after { + .lib-css(background, @swatch-option__disabled__background); + .lib-rotate(-30deg); + content: ''; + position: absolute; + width: 42px; + height: 2px; + z-index: 995; + left: -4px; + top: 10px; + } + } + + &-loading { + .lib-url('Magento_Swatches/images/loader-2.gif'); + content: url("@{url}"); + } + + &-tooltip { + .lib-css(background, @swatch-option-tooltip__background); + .lib-css(border, @swatch-option-tooltip__border); + .lib-css(color, @swatch-option-tooltip__color); + max-width: 140px; + max-height: 100%; + min-height: 20px; + min-width: 20px; + position: absolute; + padding: @indent__xs; + display: none; + z-index: 999; + text-align: center; + + &, + &-layered { + .corner { + left: 40%; + position: absolute; + bottom: 0; + height: 8px; + + &:before, + &:after { + content: ''; + position: relative; + width: 0; + height: 0; + border-style: solid; + font-size: 1px; + } + + &:before { + top: 2px; + left: 0; + border-width: 8px 8.5px 0 8.5px; + border-color: #adadad transparent transparent transparent; + } + + &:after { + top: 1px; + left: -15px; + border-width: 7px 7.5px 0 7.5px; + border-color: #fff transparent transparent transparent; + } + } + + .image { + display: block; + height: 130px; + width: 130px; + margin: 0 auto; + } + } + + &-layered { + .lib-css(background, @swatch-option-tooltip-layered__background); + .lib-css(border, @swatch-option-tooltip-layered__border); + .lib-css(color, @swatch-option-tooltip-layered__color); + width: 140px; + position: absolute; + display: none; + z-index: 999; + left: -47px; + } + + .title { + .lib-css(color, @swatch-option-tooltip-title__color); + max-width: 140px; + min-height: 20px; + max-height: 200px; + text-align: center; + display: block; + overflow: hidden; + } + } + + &-link-layered { + position: relative; + margin: 0 !important; + padding: 0 !important; + + &:focus > div { + .lib-css(box-shadow, @swatch-option-link-layered__focus__box-shadow); + } + + &:hover > .swatch-option-tooltip-layered { + display: block; + } + } + } + + &-opt { + margin: @indent__base 0; + + &-listing { + margin-bottom: @indent__s; + } + } + + &-more { + display: inline-block; + margin: 2px 0; + text-decoration: none !important; + position: static; + z-index: 1; + } + + &-visual-tooltip-layered { + height: 160px; + top: -170px; + } + + &-textual-tooltip-layered { + height: 30px; + top: -40px; + } + + &-input { + left: -1000px; + position: absolute; + visibility: hidden; + } } - .swatch-option-disabled:after { + .clearfix:after { content: ''; - position: absolute; - width: 42px; - height: 2px; - background: red; - transform: rotate(-30deg); - -o-transform: rotate(-30deg); - -moz-transform: rotate(-30deg); - -ms-transform: rotate(-30deg); - -webkit-transform: rotate(-30deg); - z-index: 995; - left: -4px; - top: 10px; - } - - .swatch-option-disabled { - outline: none !important; - cursor: default; - border: 0; - } - - // Bugfix for Add To Cart button - .swatch-opt-listing { - margin-bottom: 10px; - } - - .swatch-option-loading { - content: url(../Magento_Swatches/images/loader-2.gif); - } - - .swatch-input { - left: -1000px; - position: absolute; visibility: hidden; + display: block; + height: 0; + clear: both; } } From c52f79506f20d53e80ff505201107bc0b9823c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karla=20Saarem=C3=A4e?= Date: Thu, 7 Jun 2018 16:40:13 +0300 Subject: [PATCH 02/51] replaced loading gif Replaced loading gif with Theme loader gif. --- .../Magento/blank/Magento_Swatches/web/css/source/_module.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less index 0fcee34fda688..111d4d57d6212 100644 --- a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less @@ -207,8 +207,7 @@ } &-loading { - .lib-url('Magento_Swatches/images/loader-2.gif'); - content: url("@{url}"); + .lib-css(content, @loading__background-image); } &-tooltip { From b4098fe6f9ad679f00ee2e1c1ee5c45778355d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karla=20Saarem=C3=A4e?= Date: Thu, 7 Jun 2018 16:41:29 +0300 Subject: [PATCH 03/51] Deleting loader gif Replaced with Theme loader --- .../Magento_Swatches/web/images/loader-2.gif | Bin 2035 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/design/frontend/Magento/blank/Magento_Swatches/web/images/loader-2.gif diff --git a/app/design/frontend/Magento/blank/Magento_Swatches/web/images/loader-2.gif b/app/design/frontend/Magento/blank/Magento_Swatches/web/images/loader-2.gif deleted file mode 100644 index 362e2455f4be8a5ade24c3e41131533a4bc581b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2035 zcmYk7c~nzp8i(%2Z5+DR3 z0g+8WBmvo^6j@pd1d&CNK!K696(P#>xD=T)+S5Arl)0SgY5D%Se|-1c=XuZXecv0% z31EB{{~b^UyaRx(t*x%Eu7!mKqtV#c*C&_D>2x{>f;Kibqobo06%_)30N8Qtx3Ho9 zf(Tz0&)?IXW&%Q2_8;H~1oU*>er@}+O!yXVoO4&tcr(?%C8lZ;5^K-5wx_%qOm&@3 zzp$FwzL~YTHB^_%cC{`VZ@B#US0YZOSZ9{O+p`-#x9OLfIl0O_Repi`TA`+>_mmOO-=2c#TUUVC-Gl*_YB@2dN4dPI`;6<_~Qw~}lxU~G; z_fJ=zt*#lLzc`LD#jJ<$P>q1DKU)9F3v7Lf$MWh3CL0(2@-CCgn|BXk?nhWU2cw=F z%4nu(%@5{{dn$z%iSO$fTEf0K;D-V6Wtf(qTcGzxl26Qoc-L=KEu zKFBI`TAIKkoH1TU;n94=iQ{PGDbrLFxF|GEVd{FEm1(s@CIONm0Tz(VdE7WUoI_8( z>4OuAWinMwY!x|0O+85q_CMyP)HY{DO;&;VXY1Dm@ZBv@#p`DJ=Jj+1H^OZ(w4R!B zXq5-}ri5yoSgRRJ4(FQ7o`z)?_Rkzqb}k9#>Y^jRr&asm>uwB2yO}G!h}nB zRIpV~Z1Vikv##U}JJDLM6Zr>SOLa8~{JWjx&JR-TW?7Wnb412eM_Y)!rj!OXEZzkO zC&4^S+E6+7tz^J1HOy^46RhHElxL{iNA&8S&Q0|N6H`nt@ezkXsKh_^!2hxPA*>>` zcpIx0`+q=OKNFDXzMR@Nfr58fQMu2bJw4{&Em=P@QlOB7r|1>;e3D-U)D^8Idfd_+ z(6y&_=*{#tl1QQjOsCH1?w;xBB-+i6j=d~6z-qOj>Ozm8Z4(8`15r_VN{qJ}hCPO& zlCUmFqS*a}DM}5xn5qGUeD4me6yPXiX$xsdp(sY{7}*3VTcjed=h!J3XtH+j-wBf~ ze*0s9-5Z9hrK<fP&JzNn)1*QGdC0y5z?P9vrYhPFoihL%ipCPsN!lJ6 z6yrwx1)9Q9X47sE?e>s`a76)8=|`5R zt>964ws|`|;sDO?19Fz9^>yiGBp3Ffm%c``ic`*)6VA1o=ei^p#JdW$r+rCmD?{+v zm+4A&wNa-A*`UJEn3x357ULdo=)5qSXX5?V5*$O;nzgVtV3qk*NA7ArR_j>lp7z(h z=!5PVL<~Yn+JQa^_&^P@Jsz>Nng|*6zbY)`SB4WnT#e8p@~nuFsc0Qs2+{ z%?5|u!HWaDp|wPYco(1s6ll}5h2=wHD%TH}<#2i5B17cgX4X!xdm)7rC1T~gLpL8V zA7B46Ky{F*Aj(Tcu+JnTX| U!z@LYDOY)vhyxTQRN~S90WwAnga7~l From 75fb28c2ab25740977fc5f15fed33b80faaa25c3 Mon Sep 17 00:00:00 2001 From: Andreas Schrammel Date: Fri, 29 Jun 2018 09:54:50 +0200 Subject: [PATCH 04/51] :bug: Add missing showInStore attributes Add missing showInStore attributes on Braintree configuration as there are some values that are changeable on store view (Title, Descriptors, merchant name override) and are not accessible from store view level. --- app/code/Magento/Braintree/etc/adminhtml/system.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Braintree/etc/adminhtml/system.xml b/app/code/Magento/Braintree/etc/adminhtml/system.xml index f46da366b64a3..c49402070f0fd 100644 --- a/app/code/Magento/Braintree/etc/adminhtml/system.xml +++ b/app/code/Magento/Braintree/etc/adminhtml/system.xml @@ -44,7 +44,7 @@ http://docs.magento.com/m2/ce/user_guide/payment/braintree.html Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint - + 1 Magento\Config\Block\System\Config\Form\Fieldset @@ -77,7 +77,7 @@ Magento\Config\Model\Config\Backend\Encrypted - + Magento\Config\Block\System\Config\Form\Fieldset @@ -125,7 +125,7 @@ payment/braintree/sort_order - + Magento\Config\Block\System\Config\Form\Fieldset @@ -146,7 +146,7 @@ payment/braintree/countrycreditcard - + Magento\Config\Block\System\Config\Form\Fieldset @@ -215,7 +215,7 @@ payment/braintree_paypal/skip_order_review - + Magento\Config\Block\System\Config\Form\Fieldset @@ -239,7 +239,7 @@ payment/braintree/verify_specific_countries - + Date: Tue, 3 Jul 2018 12:24:47 +0930 Subject: [PATCH 05/51] Remove the timezone from the date when retrieving the current month from a UTC timestamp. --- .../Reports/Model/ResourceModel/Report/Collection.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php index d0fed6e1a0654..522bfa7bcf0bf 100644 --- a/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php +++ b/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php @@ -215,8 +215,11 @@ protected function _getMonthInterval(\DateTime $dateStart, \DateTime $dateEnd, $ ) ); } else { + // Transform the start date to UTC whilst preserving the date. This is required as getTimestamp() + // is in UTC which may result in a different month from the original start date due to time zones. + $dateStartUtc = (new \DateTime())->createFromFormat('d-m-Y g:i:s', $dateStart->format('d-m-Y 00:00:00')); $interval['end'] = $this->_localeDate->convertConfigTimeToUtc( - $dateStart->format('Y-m-' . date('t', $dateStart->getTimestamp()) . ' 23:59:59') + $dateStart->format('Y-m-' . date('t', $dateStartUtc->getTimestamp()) . ' 23:59:59') ); } From 7c9a5cb98b3e74c7fa956fa81ca194faf21ce8cf Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:04:43 +0530 Subject: [PATCH 06/51] Update AssignProducts.php Declare module namespace before template path --- .../Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php index 69618f04eb2af..c718563d7576e 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php @@ -13,7 +13,7 @@ class AssignProducts extends \Magento\Backend\Block\Template * * @var string */ - protected $_template = 'catalog/category/edit/assign_products.phtml'; + protected $_template = 'Magento_Catalog::catalog/category/edit/assign_products.phtml'; /** * @var \Magento\Catalog\Block\Adminhtml\Category\Tab\Product From c92b57fc5ae01c7a1ff92b01a900c0d157e10263 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:07:37 +0530 Subject: [PATCH 07/51] Update DefaultCaptcha.php --- app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php b/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php index c0a091ca2d0d9..027c9a9085b47 100644 --- a/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php +++ b/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php @@ -13,7 +13,7 @@ class DefaultCaptcha extends \Magento\Framework\View\Element\Template /** * @var string */ - protected $_template = 'default.phtml'; + protected $_template = 'Magento_Captcha::default.phtml'; /** * @var string From b8751c19ef752371f768ebbe01e75c58c4169ece Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:08:52 +0530 Subject: [PATCH 08/51] Update Tree.php Declare module namespace before template path --- app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php index 1c8a8d586bcb5..7e7f2825f1589 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php @@ -28,7 +28,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory /** * @var string */ - protected $_template = 'catalog/category/tree.phtml'; + protected $_template = 'Magento_Catalog::catalog/category/tree.phtml'; /** * @var \Magento\Backend\Model\Auth\Session From c1282aa992b0e284556a09f83a95f015d47eddb5 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:09:48 +0530 Subject: [PATCH 09/51] Update Chooser.php Declare module namespace before template path --- .../Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php index 5e98313f95f0f..da29b929f051c 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php @@ -24,7 +24,7 @@ class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Tree * * @var string */ - protected $_template = 'catalog/category/widget/tree.phtml'; + protected $_template = 'Magento_Catalog::catalog/category/widget/tree.phtml'; /** * @return void From 0d9967332c9467cdbf9f7d47d335e03d4d272114 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:11:58 +0530 Subject: [PATCH 10/51] Update Edit.php Declare module namespace before template path --- app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php index 1111e20188707..c6ec328bc3028 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php @@ -17,7 +17,7 @@ class Edit extends \Magento\Backend\Block\Widget /** * @var string */ - protected $_template = 'catalog/product/edit.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit.phtml'; /** * Core registry From 01efc65c98b08939670b08d648147ef576372040 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:13:33 +0530 Subject: [PATCH 11/51] Update Main.php Declare module namespace before template path --- .../Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php index 729f67b55fa13..2ee2696f903c5 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php @@ -21,7 +21,7 @@ class Main extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'catalog/product/attribute/set/main.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main.phtml'; /** * Core registry From c1040236993fbd71671ee9e55c043aae232b3745 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:14:15 +0530 Subject: [PATCH 12/51] Update Group.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php index cf8de44c3d9df..93c2dcc76263c 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php @@ -14,5 +14,5 @@ class Group extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'catalog/product/attribute/set/main/tree/group.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main/tree/group.phtml'; } From 78ef94762b356c12372fe51117ffef5bee555346 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:15:01 +0530 Subject: [PATCH 13/51] Update Add.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php index 329afa968307c..f69e58985bfc5 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php @@ -18,7 +18,7 @@ class Add extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'catalog/product/attribute/set/toolbar/add.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/attribute/set/toolbar/add.phtml'; /** * @return AbstractBlock From 0286a129d0921fc6733cbf18b54645568ebcdcda Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:15:50 +0530 Subject: [PATCH 14/51] Update Main.php --- .../Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php index 82dfad3fc2aff..9dfc3a90f4410 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php @@ -19,7 +19,7 @@ class Main extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'catalog/product/attribute/set/toolbar/main.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/attribute/set/toolbar/main.phtml'; /** * @return $this From 4310d507eec6005e776a79eebb50cd9df775a366 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:16:37 +0530 Subject: [PATCH 15/51] Update Configure.php Declare module namespace before template path --- .../Catalog/Block/Adminhtml/Product/Composite/Configure.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php index 1bc6ea39a0ec6..58eab8a178f81 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php @@ -21,7 +21,7 @@ class Configure extends \Magento\Backend\Block\Widget /** * @var string */ - protected $_template = 'catalog/product/composite/configure.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/composite/configure.phtml'; /** * Core registry From d27263f683f066190741b5f96e0cfff775efdef9 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:17:29 +0530 Subject: [PATCH 16/51] Update Alerts.php Declare module namespace before template path --- .../Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php index 4a3d7c4e14e30..d620cd5fee2b9 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php @@ -18,7 +18,7 @@ class Alerts extends \Magento\Backend\Block\Widget\Tab /** * @var string */ - protected $_template = 'catalog/product/tab/alert.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/tab/alert.phtml'; /** * @return $this From f9d50021069b335a3ddc5ba1dca3a575c75403f2 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:18:13 +0530 Subject: [PATCH 17/51] Update Inventory.php Declare module namespace before template path --- .../Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php index e52c1d3aa4985..20e12889cae0d 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php @@ -15,7 +15,7 @@ class Inventory extends \Magento\Backend\Block\Widget /** * @var string */ - protected $_template = 'catalog/product/tab/inventory.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/tab/inventory.phtml'; /** * @var \Magento\Framework\Module\Manager From 7fe831470db3dd5e5eaa011f01b7470749cbf36d Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:18:50 +0530 Subject: [PATCH 18/51] Update Options.php Declare module namespace before template path --- .../Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php index b9fee3823bd68..1e0fb8b5bf34b 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php @@ -15,7 +15,7 @@ class Options extends Widget /** * @var string */ - protected $_template = 'catalog/product/edit/options.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit/options.phtml'; /** * @return Widget From 3cfd5c40eb24da5ee925b8fad5b371c21e03c22c Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:19:58 +0530 Subject: [PATCH 19/51] Update Websites.php Declare module namespace before template path --- .../Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php index 6a3347b44512f..6189a97dbe761 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php @@ -21,7 +21,7 @@ class Websites extends \Magento\Backend\Block\Store\Switcher /** * @var string */ - protected $_template = 'catalog/product/edit/websites.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit/websites.phtml'; /** * Core registry From 4f6396a390ade837fb692e49e0762fd2aab7ca6e Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:20:34 +0530 Subject: [PATCH 20/51] Update Option.php Declare module namespace before template path --- .../Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php index 64856a5c69dc7..8521c721eeb4d 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php @@ -38,7 +38,7 @@ class Option extends Widget /** * @var string */ - protected $_template = 'catalog/product/edit/options/option.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit/options/option.phtml'; /** * Core registry From 43ee7dd8e12538b687666e7036324dc5c619bf40 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:21:03 +0530 Subject: [PATCH 21/51] Update Date.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php index babfc1b072bd2..a0bbc4ad033de 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php @@ -16,5 +16,5 @@ class Date extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Typ /** * @var string */ - protected $_template = 'catalog/product/edit/options/type/date.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit/options/type/date.phtml'; } From 4723db44dac501ba66bbb6da7cbd3628be047fe3 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:21:34 +0530 Subject: [PATCH 22/51] Update File.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php index 322aa02f97731..d3d5f08fa9eae 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php @@ -16,5 +16,5 @@ class File extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Typ /** * @var string */ - protected $_template = 'catalog/product/edit/options/type/file.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit/options/type/file.phtml'; } From 2f14719693dd539b695842e4cc59fd2d2aeb0393 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:22:52 +0530 Subject: [PATCH 23/51] Update Select.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php index 24de84958ef4a..f6ab5134ae6bd 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php @@ -16,7 +16,7 @@ class Select extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\T /** * @var string */ - protected $_template = 'catalog/product/edit/options/type/select.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit/options/type/select.phtml'; /** * Class constructor From 5a33ee5399aaa55b0518dc855e4df4012e6ac32c Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:23:29 +0530 Subject: [PATCH 24/51] Update Text.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php index 7241128fac3b4..e6f78dc3ed169 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php @@ -16,5 +16,5 @@ class Text extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Typ /** * @var string */ - protected $_template = 'catalog/product/edit/options/type/text.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit/options/type/text.phtml'; } From 153466edaa22d94af13727d666bf429245e42420 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:24:14 +0530 Subject: [PATCH 25/51] Update Tier.php Declare module namespace before template path --- .../Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php index a80ddd8c122a1..7cb1c2c9e4263 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php @@ -13,7 +13,7 @@ class Tier extends Group\AbstractGroup /** * @var string */ - protected $_template = 'catalog/product/edit/price/tier.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit/price/tier.phtml'; /** * Retrieve list of initial customer groups From 2b03b6818efdabf7a94ded88706c560a9f7ce786 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:24:51 +0530 Subject: [PATCH 26/51] Update Content.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Helper/Form/Gallery/Content.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php index 2ca0ad32ee2ee..ae87eb72556a2 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php @@ -23,7 +23,7 @@ class Content extends \Magento\Backend\Block\Widget /** * @var string */ - protected $_template = 'catalog/product/helper/gallery.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/helper/gallery.phtml'; /** * @var \Magento\Catalog\Model\Product\Media\Config From 69f5949f7b22bd5754e29219e08cb74bec0fddcb Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:25:22 +0530 Subject: [PATCH 27/51] Update Container.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Widget/Chooser/Container.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php index 19c1574d6e9a5..b8967f1f30e55 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php @@ -18,5 +18,5 @@ class Container extends Template /** * @var string */ - protected $_template = 'catalog/product/widget/chooser/container.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/widget/chooser/container.phtml'; } From 70f6fe017f48ed59346b9cbeb778ee2644ffedcf Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:26:42 +0530 Subject: [PATCH 28/51] Update Link.php Declare module namespace before template path --- app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php index dbeff93683bc0..2b9cad379a8bc 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php @@ -13,7 +13,7 @@ class Link extends \Magento\Framework\View\Element\Template /** * @var string */ - protected $_template = 'rss/grid/link.phtml'; + protected $_template = 'Magento_Catalog::rss/grid/link.phtml'; /** * @var \Magento\Framework\App\Rss\UrlBuilderInterface From c809d9f473ac50d6f17fd0a541495cd841ae87df Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:27:23 +0530 Subject: [PATCH 29/51] Update Toolbar.php Declare module namespace before template path --- app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php index 6be038ee00392..b698fc1514f73 100644 --- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php +++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php @@ -82,7 +82,7 @@ class Toolbar extends \Magento\Framework\View\Element\Template /** * @var string */ - protected $_template = 'product/list/toolbar.phtml'; + protected $_template = 'Magento_Catalog::product/list/toolbar.phtml'; /** * Catalog config From e5d89652fcf437fed1955803002bd9da20bdd9df Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:27:53 +0530 Subject: [PATCH 30/51] Update Additional.php Declare module namespace before template path --- app/code/Magento/Catalog/Block/Product/View/Additional.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Product/View/Additional.php b/app/code/Magento/Catalog/Block/Product/View/Additional.php index 598854a3e6bfe..4dd806d525d24 100644 --- a/app/code/Magento/Catalog/Block/Product/View/Additional.php +++ b/app/code/Magento/Catalog/Block/Product/View/Additional.php @@ -24,7 +24,7 @@ class Additional extends \Magento\Framework\View\Element\Template /** * @var string */ - protected $_template = 'product/view/additional.phtml'; + protected $_template = 'Magento_Catalog::product/view/additional.phtml'; /** * @return array From cb94ab3838d38125227422e7a8cd9609b55364b1 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:28:51 +0530 Subject: [PATCH 31/51] Update Conditions.php Declare module namespace before template path --- .../Magento/CatalogWidget/Block/Product/Widget/Conditions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php b/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php index 04ae7c6a2d750..ab089f105ccd5 100644 --- a/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php +++ b/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php @@ -51,7 +51,7 @@ class Conditions extends Template implements RendererInterface /** * @var string */ - protected $_template = 'product/widget/conditions.phtml'; + protected $_template = 'Magento_Catalog::product/widget/conditions.phtml'; /** * @param \Magento\Framework\Data\Form\Element\Factory $elementFactory From 17115ce7e5b1444f31a05b521015002c2d8eaa29 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:30:11 +0530 Subject: [PATCH 32/51] Update Conditions.php Declare module namespace before template path --- .../Magento/CatalogWidget/Block/Product/Widget/Conditions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php b/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php index ab089f105ccd5..9f7962301cab4 100644 --- a/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php +++ b/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php @@ -51,7 +51,7 @@ class Conditions extends Template implements RendererInterface /** * @var string */ - protected $_template = 'Magento_Catalog::product/widget/conditions.phtml'; + protected $_template = 'Magento_CatalogWidget::product/widget/conditions.phtml'; /** * @param \Magento\Framework\Data\Form\Element\Factory $elementFactory From a924cadba8d817ff4368235652c9a1e751ad027f Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:33:17 +0530 Subject: [PATCH 33/51] Update Created.php Declare module namespace before template path --- .../Product/Attribute/NewAttribute/Product/Created.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php index 33ea66b222420..96cc68cb9e314 100644 --- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php +++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php @@ -15,7 +15,7 @@ class Created extends \Magento\Backend\Block\Widget /** * @var string */ - protected $_template = 'catalog/product/attribute/new/created.phtml'; + protected $_template = 'Magento_ConfigurableProduct::catalog/product/attribute/new/created.phtml'; /** * Core registry From 24ec04fd9f8c146e53ebd56525babb8f423dbec8 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:34:01 +0530 Subject: [PATCH 34/51] Update Config.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Edit/Tab/Variations/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php index c02a922c71b5c..1c5d01da574cf 100644 --- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php +++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php @@ -18,7 +18,7 @@ class Config extends Widget implements TabInterface /** * @var string */ - protected $_template = 'catalog/product/edit/super/config.phtml'; + protected $_template = 'Magento_ConfigurableProduct::catalog/product/edit/super/config.phtml'; /** * Core registry From d5dbfb9ac366e2a5f9650cf72b6386bd8ff11edf Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:35:26 +0530 Subject: [PATCH 35/51] Update Currency.php Declare module namespace before template path --- .../Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php index 683c317d2ec74..55d42906b6119 100644 --- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php +++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php @@ -19,7 +19,7 @@ class Currency extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'system/currency/rates.phtml'; + protected $_template = 'Magento_CurrencySymbol::system/currency/rates.phtml'; /** * Prepare layout From d036eb2294e7c711b445a42cb210cfa2f53b4ce8 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:36:00 +0530 Subject: [PATCH 36/51] Update Matrix.php Declare module namespace before template path --- .../Block/Adminhtml/System/Currency/Rate/Matrix.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php index 80415c9486898..e20054a5a8084 100644 --- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php +++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php @@ -16,7 +16,7 @@ class Matrix extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'system/currency/rate/matrix.phtml'; + protected $_template = 'Magento_CurrencySymbol::system/currency/rate/matrix.phtml'; /** * @var \Magento\Directory\Model\CurrencyFactory From 3548a085839440dac34ed45d600390fea89460b9 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:36:41 +0530 Subject: [PATCH 37/51] Update Services.php Declare module namespace before template path --- .../Block/Adminhtml/System/Currency/Rate/Services.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php index 919a4d0ed6d7b..491ed93900bde 100644 --- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php +++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php @@ -16,7 +16,7 @@ class Services extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'system/currency/rate/services.phtml'; + protected $_template = 'Magento_CurrencySymbol::system/currency/rate/services.phtml'; /** * @var \Magento\Directory\Model\Currency\Import\Source\ServiceFactory From 5a8877f6b2eb226e4a94a5b6f56b1ca334fa3213 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:38:27 +0530 Subject: [PATCH 38/51] Update Newsletter.php Declare module namespace before template path --- app/code/Magento/Customer/Block/Newsletter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Customer/Block/Newsletter.php b/app/code/Magento/Customer/Block/Newsletter.php index 3ac3258dfe0de..0aebf0a5c954f 100644 --- a/app/code/Magento/Customer/Block/Newsletter.php +++ b/app/code/Magento/Customer/Block/Newsletter.php @@ -19,7 +19,7 @@ class Newsletter extends \Magento\Customer\Block\Account\Dashboard /** * @var string */ - protected $_template = 'form/newsletter.phtml'; + protected $_template = 'Magento_Customer::form/newsletter.phtml'; /** * @return bool From b83ebb5e13aed000d3a0efe895e7a9eee7616711 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:40:41 +0530 Subject: [PATCH 39/51] Update Newsletter.php Declare module namespace before template path --- .../Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php index 8506defbf9005..5eafd3a11871d 100644 --- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php +++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php @@ -17,7 +17,7 @@ class Newsletter extends \Magento\Backend\Block\Widget\Form\Generic implements T /** * @var string */ - protected $_template = 'tab/newsletter.phtml'; + protected $_template = 'Magento_Customer::tab/newsletter.phtml'; /** * @var \Magento\Newsletter\Model\SubscriberFactory From bee1aa498a326f815a97e0a7647495378b43de0d Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:41:17 +0530 Subject: [PATCH 40/51] Update Vat.php Declare module namespace before template path --- .../Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php index 4a0d0f66425bb..9ee856f6e0af9 100644 --- a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php +++ b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php @@ -24,7 +24,7 @@ class Vat extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element /** * @var string */ - protected $_template = 'sales/order/create/address/form/renderer/vat.phtml'; + protected $_template = 'Magento_Customer::sales/order/create/address/form/renderer/vat.phtml'; /** * @var \Magento\Framework\Json\EncoderInterface From 54e0a3b53503f39f81943ec34ff58ed8b24347b1 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:42:08 +0530 Subject: [PATCH 41/51] Update Downloadable.php Declare module namespace before template path --- .../Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php index 4019def9e0cd0..e2694b3b93bb9 100644 --- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php +++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php @@ -33,7 +33,7 @@ class Downloadable extends Widget implements TabInterface /** * @var string */ - protected $_template = 'product/edit/downloadable.phtml'; + protected $_template = 'Magento_Downloadable::product/edit/downloadable.phtml'; /** * Accordion block id From 6b97b70d41eb7f176f7b7e26fd1de20e2cfef37d Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:42:40 +0530 Subject: [PATCH 42/51] Update Links.php Declare module namespace before template path --- .../Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php index fab33673e182d..947e6dc1e8339 100644 --- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php +++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php @@ -30,7 +30,7 @@ class Links extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'product/edit/downloadable/links.phtml'; + protected $_template = 'Magento_Downloadable::product/edit/downloadable/links.phtml'; /** * Downloadable file From 8d8791b790dd6416d10d2b351cb9ede9bdcaf17c Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:43:33 +0530 Subject: [PATCH 43/51] Update Samples.php Declare module namespace before template path --- .../Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php index 8b808c6020c5b..3c86bfb2f8d00 100644 --- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php +++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php @@ -22,7 +22,7 @@ class Samples extends \Magento\Backend\Block\Widget /** * @var string */ - protected $_template = 'product/edit/downloadable/samples.phtml'; + protected $_template = 'Magento_Downloadable::product/edit/downloadable/samples.phtml'; /** * Downloadable file From fd4d8f5281e3d4091c28d9a80e973649052861f0 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:44:50 +0530 Subject: [PATCH 44/51] Update Js.php Declare module namespace before template path --- app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php index 3ddfe494c7fbc..2633b78c67c78 100644 --- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php +++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php @@ -17,5 +17,5 @@ class Js extends \Magento\Backend\Block\Template * * @var string */ - protected $_template = 'attribute/edit/js.phtml'; + protected $_template = 'Magento_Eav::attribute/edit/js.phtml'; } From a22995fcdd79701f4c1935ff0b85c21d26edb949 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:45:32 +0530 Subject: [PATCH 45/51] Update Template.php Declare module namespace before template path --- app/code/Magento/Email/Block/Adminhtml/Template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Email/Block/Adminhtml/Template.php b/app/code/Magento/Email/Block/Adminhtml/Template.php index b68c7ae4e8f78..1f9432fb7581d 100644 --- a/app/code/Magento/Email/Block/Adminhtml/Template.php +++ b/app/code/Magento/Email/Block/Adminhtml/Template.php @@ -21,7 +21,7 @@ class Template extends \Magento\Backend\Block\Template implements \Magento\Backe * * @var string */ - protected $_template = 'template/list.phtml'; + protected $_template = 'Magento_Email::template/list.phtml'; /** * @var \Magento\Backend\Block\Widget\Button\ButtonList From 7b18cefa859b170e1565dd06533deb55566968db Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:46:05 +0530 Subject: [PATCH 46/51] Update Edit.php Declare module namespace before template path --- app/code/Magento/Email/Block/Adminhtml/Template/Edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php index 4a3b65fb13c7c..9413265e7f90f 100644 --- a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php +++ b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php @@ -42,7 +42,7 @@ class Edit extends Widget implements ContainerInterface * * @var string */ - protected $_template = 'template/edit.phtml'; + protected $_template = 'Magento_Email::template/edit.phtml'; /** * @var \Magento\Framework\Json\EncoderInterface From 87e2f8c1c6b344ab1549bf45f63c80ecc02f99f0 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:46:52 +0530 Subject: [PATCH 47/51] Update Inline.php Declare module namespace before template path --- app/code/Magento/GiftMessage/Block/Message/Inline.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/GiftMessage/Block/Message/Inline.php b/app/code/Magento/GiftMessage/Block/Message/Inline.php index 9e2747cf97fc1..9f68199106cc7 100644 --- a/app/code/Magento/GiftMessage/Block/Message/Inline.php +++ b/app/code/Magento/GiftMessage/Block/Message/Inline.php @@ -33,7 +33,7 @@ class Inline extends \Magento\Framework\View\Element\Template /** * @var string */ - protected $_template = 'inline.phtml'; + protected $_template = 'Magento_GiftMessage::inline.phtml'; /** * Gift message message From 58e2e4bc3041100782c07f99ca693101cadbed90 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:47:29 +0530 Subject: [PATCH 48/51] Update State.php Declare module namespace before template path --- app/code/Magento/LayeredNavigation/Block/Navigation/State.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/LayeredNavigation/Block/Navigation/State.php b/app/code/Magento/LayeredNavigation/Block/Navigation/State.php index 93d99d3bc336b..7d061d057faaa 100644 --- a/app/code/Magento/LayeredNavigation/Block/Navigation/State.php +++ b/app/code/Magento/LayeredNavigation/Block/Navigation/State.php @@ -17,7 +17,7 @@ class State extends \Magento\Framework\View\Element\Template /** * @var string */ - protected $_template = 'layer/state.phtml'; + protected $_template = 'Magento_LayeredNavigation::layer/state.phtml'; /** * Catalog layer From 386438dcec0f260fb7135332bbb6eb5f03190d6c Mon Sep 17 00:00:00 2001 From: hitesh-wagento Date: Wed, 4 Jul 2018 12:53:15 +0530 Subject: [PATCH 49/51] [Changed password placeholder text in checkout page] --- app/code/Magento/Checkout/i18n/en_US.csv | 2 +- .../Checkout/view/frontend/web/template/form/element/email.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv index 8d297c4060abd..53fdebb8a2995 100644 --- a/app/code/Magento/Checkout/i18n/en_US.csv +++ b/app/code/Magento/Checkout/i18n/en_US.csv @@ -176,4 +176,4 @@ Payment,Payment "Not yet calculated","Not yet calculated" "We received your order!","We received your order!" "Thank you for your purchase!","Thank you for your purchase!" -"optional", "optional" +"Password", "Password" diff --git a/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html b/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html index 0dee6cb0708e6..bb68e24835b67 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html @@ -41,7 +41,7 @@ Date: Wed, 4 Jul 2018 13:04:58 +0300 Subject: [PATCH 50/51] Fixed _module.less file according Magento 2 LESS coding standard --- .../web/css/source/_module.less | 117 +++++++++--------- 1 file changed, 58 insertions(+), 59 deletions(-) diff --git a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less index 111d4d57d6212..0716137ed1bbd 100644 --- a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less @@ -38,7 +38,7 @@ // Image and Color swatch @img-color-swatch-option__hover__border: @swatch-option__hover__border; -@img-color-swatch-option__hover__outline: 2px solid #ee0000; +@img-color-swatch-option__hover__outline: 2px solid #e00; // Tooltip @swatch-option-tooltip__background: @color-white; @@ -53,14 +53,14 @@ @swatch-option-tooltip-layered-title__color: @swatch-option-tooltip-title__color; -// Layered Features +// Layered Features @swatch-option-link-layered__focus__box-shadow: 0 0 3px 1px @color-sky-blue1; // // Common // _____________________________________________ - & when (@media-common = true) { +& when (@media-common = true) { .swatch { &-attribute { @@ -72,14 +72,14 @@ padding-right: @indent__s; } - &[data-required="1"]:after { + &[data-required='1']:after { .lib-css(color, @form-field-label-asterisk__color); content: '*'; + font-size: @font-size__base; + font-weight: @font-weight__bold; position: absolute; right: -11px; top: -2px; - font-weight: @font-weight__bold; - font-size: @font-size__base; } } @@ -120,16 +120,16 @@ &-option { .lib-css(border, @swatch-option__border); - padding: 1px 2px; - min-width: 30px; - max-width: 90px; - height: 20px; + cursor: pointer; float: left; + height: 20px; margin: 0 @indent__s @indent__xs 0; - text-align: center; - cursor: pointer; - position: relative; + max-width: 90px; + min-width: 30px; overflow: hidden; + padding: 1px 2px; + position: relative; + text-align: center; text-overflow: ellipsis; &.text { @@ -171,38 +171,37 @@ cursor: default; &:after { + // ToDo: improve .lib-background-gradient() to support diagonal gradient + background: linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); + background: -moz-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); + background: -ms-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); + background: -o-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); + background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(42%, rgba(255, 255, 255, 0)), color-stop(43%, rgba(255, 255, 255, 1)), color-stop(46%, rgba(255, 255, 255, 1)), color-stop(47%, rgba(255, 82, 22, 1)), color-stop(53%, rgba(255, 82, 22, 1)), color-stop(54%, rgba(255, 255, 255, 1)), color-stop(57%, rgba(255, 255, 255, 1)), color-stop(58%, rgba(255, 255, 255, 0)), color-stop(100%, rgba(255, 255, 255, 0))); + background: -webkit-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); + bottom: 0; content: ''; - position: absolute; + filter: 'progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff, endColorstr=#00ffffff, GradientType=1)'; left: 0; + position: absolute; right: 0; top: 0; - bottom: 0; - - // ToDo: improve .lib-background-gradient() to support diagonal gradient - background: -moz-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); - background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(42%, rgba(255, 255, 255, 0)), color-stop(43%, rgba(255, 255, 255, 1)), color-stop(46%, rgba(255, 255, 255, 1)), color-stop(47%, rgba(255, 82, 22, 1)), color-stop(53%, rgba(255, 82, 22, 1)), color-stop(54%, rgba(255, 255, 255, 1)), color-stop(57%, rgba(255, 255, 255, 1)), color-stop(58%, rgba(255, 255, 255, 0)), color-stop(100%, rgba(255, 255, 255, 0))); - background: -webkit-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); - background: -o-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); - background: -ms-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); - background: linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00ffffff', endColorstr='#00ffffff', GradientType=1); } } &-disabled { - outline: none !important; - cursor: default; border: 0; + cursor: default; + outline: none !important; &:after { - .lib-css(background, @swatch-option__disabled__background); .lib-rotate(-30deg); content: ''; + height: 2px; + left: -4px; position: absolute; + top: 10px; width: 42px; - height: 2px; z-index: 995; - left: -4px; - top: 10px; + .lib-css(background, @swatch-option__disabled__background); } } @@ -211,86 +210,86 @@ } &-tooltip { - .lib-css(background, @swatch-option-tooltip__background); .lib-css(border, @swatch-option-tooltip__border); .lib-css(color, @swatch-option-tooltip__color); - max-width: 140px; + display: none; max-height: 100%; + max-width: 140px; min-height: 20px; min-width: 20px; - position: absolute; padding: @indent__xs; - display: none; - z-index: 999; + position: absolute; text-align: center; + z-index: 999; + .lib-css(background, @swatch-option-tooltip__background); &, - &-layered { + &-layered { .corner { - left: 40%; - position: absolute; bottom: 0; height: 8px; + left: 40%; + position: absolute; &:before, &:after { + border-style: solid; content: ''; + font-size: 1px; + height: 0; position: relative; width: 0; - height: 0; - border-style: solid; - font-size: 1px; } &:before { - top: 2px; - left: 0; + border-color: @color-gray68 transparent transparent transparent; border-width: 8px 8.5px 0 8.5px; - border-color: #adadad transparent transparent transparent; + left: 0; + top: 2px; } &:after { - top: 1px; - left: -15px; + border-color: @primary4 transparent transparent transparent; border-width: 7px 7.5px 0 7.5px; - border-color: #fff transparent transparent transparent; + left: -15px; + top: 1px; } } .image { display: block; height: 130px; - width: 130px; margin: 0 auto; + width: 130px; } } &-layered { - .lib-css(background, @swatch-option-tooltip-layered__background); .lib-css(border, @swatch-option-tooltip-layered__border); .lib-css(color, @swatch-option-tooltip-layered__color); - width: 140px; - position: absolute; + .lib-css(background, @swatch-option-tooltip-layered__background); display: none; - z-index: 999; left: -47px; + position: absolute; + width: 140px; + z-index: 999; } .title { .lib-css(color, @swatch-option-tooltip-title__color); + display: block; + max-height: 200px; max-width: 140px; min-height: 20px; - max-height: 200px; - text-align: center; - display: block; overflow: hidden; + text-align: center; } } &-link-layered { - position: relative; margin: 0 !important; padding: 0 !important; + position: relative; &:focus > div { .lib-css(box-shadow, @swatch-option-link-layered__focus__box-shadow); @@ -313,8 +312,8 @@ &-more { display: inline-block; margin: 2px 0; - text-decoration: none !important; position: static; + text-decoration: none !important; z-index: 1; } @@ -336,10 +335,10 @@ } .clearfix:after { + clear: both; content: ''; - visibility: hidden; display: block; height: 0; - clear: both; + visibility: hidden; } } From 8949985959002cb94bd9301707c4586c7421fe20 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Thu, 5 Jul 2018 15:50:14 +0300 Subject: [PATCH 51/51] ENGCOM-1816: [2.3] [improvement] Swatches LESS rewrite #15624 --- .../Magento/blank/Magento_Swatches/web/css/source/_module.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less index 0716137ed1bbd..b5d604597148a 100644 --- a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less @@ -249,7 +249,7 @@ } &:after { - border-color: @primary4 transparent transparent transparent; + border-color: @color-white transparent transparent transparent; border-width: 7px 7.5px 0 7.5px; left: -15px; top: 1px;