From d25a3abe02baa7e58f43d36a98609c4e9ecfa807 Mon Sep 17 00:00:00 2001 From: Natalia Momotenko Date: Wed, 8 Jul 2015 17:35:13 +0300 Subject: [PATCH 01/24] MAGETWO-17312: Incorrect message after confirmation account while register during checkout --- app/code/Magento/Paypal/Model/Express/Checkout.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php index b9062fa0de934..27fe9d672cd19 100644 --- a/app/code/Magento/Paypal/Model/Express/Checkout.php +++ b/app/code/Magento/Paypal/Model/Express/Checkout.php @@ -1158,11 +1158,8 @@ protected function _involveNewCustomer() $customer = $this->_quote->getCustomer(); $confirmationStatus = $this->_accountManagement->getConfirmationStatus($customer->getId()); if ($confirmationStatus === AccountManagement::ACCOUNT_CONFIRMATION_REQUIRED) { - $url = $this->_customerUrl->getEmailConfirmationUrl($customer->getEmail()); $this->_messageManager->addSuccess( - // @codingStandardsIgnoreStart - __('Account confirmation is required. Please check your email for confirmation link. To resend confirmation email please click here.', $url) - // @codingStandardsIgnoreEnd + __('Thank you for registering with Main Website Store.') ); } else { $this->getCustomerSession()->regenerateId(); From bfdd89c65b5f17ad6990ad358f71640af55f89e8 Mon Sep 17 00:00:00 2001 From: Dubovyk Oleksandr Date: Fri, 14 Aug 2015 19:07:55 +0300 Subject: [PATCH 02/24] MAGETWO-38970: "and above" statement is displayed not readable for "Tier Price Qty" section on "create Product" Backend page - Fixed element width to display entire text statement --- .../Magento/Catalog/view/adminhtml/web/product/product.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/product.css b/app/code/Magento/Catalog/view/adminhtml/web/product/product.css index fce4af6f57f8f..9e402b0eda85d 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/product/product.css +++ b/app/code/Magento/Catalog/view/adminhtml/web/product/product.css @@ -326,8 +326,8 @@ overflow: hidden; } -.admin__scope-old .tiers_table .col-price { - width: 16%; +.admin__scope-old .tiers_table .col-price .input-text { + width: 90px; } .admin__scope-old .new-variation-set { From 0ec7cc88f57ac63fa66bb6861bb0026ea9dc391d Mon Sep 17 00:00:00 2001 From: Dubovyk Oleksandr Date: Tue, 18 Aug 2015 13:04:31 +0300 Subject: [PATCH 03/24] MAGETWO-39725: [IE] "Save" split button is displayed broken on "create/edit Product" Admin page - Fixed "Save" split-button [IE]. --- .../backend/web/css/source/actions/_actions-split.less | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-split.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-split.less index 59c603217790a..92015e5843c3c 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-split.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-split.less @@ -111,3 +111,13 @@ &:extend(.abs-action-menu all); } } + +.ie9 { + .catalog-product-new { + .page-main-actions { + .action-default { + margin-right: 0; + } + } + } +} From d7a8b2af504088b22f717f654eee38fc6acf0fd3 Mon Sep 17 00:00:00 2001 From: Dubovyk Oleksandr Date: Tue, 18 Aug 2015 15:33:13 +0300 Subject: [PATCH 04/24] MAGETWO-39725: [IE] "Save" split button is displayed broken on "create/edit Product" Admin page - Fixed "Save" split-button [IE]. --- .../Magento_Catalog/web/css/source/_module.less | 10 ++++++++++ .../backend/web/css/source/actions/_actions-split.less | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less index 8fdf8ecbf2e87..ef5c02687b63b 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less +++ b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less @@ -17,3 +17,13 @@ div.removed, .field.removed { display: none !important; } + +.ie9 { + .catalog-product-new { + .page-main-actions { + .action-default { + margin-right: 0; + } + } + } +} diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-split.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-split.less index 92015e5843c3c..59c603217790a 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-split.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-split.less @@ -111,13 +111,3 @@ &:extend(.abs-action-menu all); } } - -.ie9 { - .catalog-product-new { - .page-main-actions { - .action-default { - margin-right: 0; - } - } - } -} From b8f069bd153e0d8b032dacd317a77fe6b7f9e272 Mon Sep 17 00:00:00 2001 From: Dubovyk Oleksandr Date: Tue, 18 Aug 2015 18:39:14 +0300 Subject: [PATCH 05/24] MAGETWO-38970: "and above" statement is displayed not readable for "Tier Price Qty" section on "create Product" Backend page - Fixed element width to display entire text statement --- .../catalog/product/edit/price/tier.phtml | 4 +++- .../view/adminhtml/web/product/product.css | 17 +++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml index e869eb86981ee..c0afb547ce13e 100644 --- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml +++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml @@ -66,7 +66,9 @@ var tierPriceRowTemplate = '' + '' + '' - + '">' + + '' + + '' + + '">' + '' + '' + '' diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/product.css b/app/code/Magento/Catalog/view/adminhtml/web/product/product.css index 9e402b0eda85d..fddf5173b8148 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/product/product.css +++ b/app/code/Magento/Catalog/view/adminhtml/web/product/product.css @@ -87,6 +87,10 @@ user-select: none; } +.admin__scope-old .image .actions [class^="action-"] { + z-index: 10; +} + .admin__scope-old .image .actions [class^="action-"], .admin__scope-old .image .image-label, .admin__scope-old .image[data-image-hidden] .actions [class^="action-"], @@ -308,22 +312,23 @@ /* Tier Price Table -------------------------------------- */ + +.admin__scope-old .tiers_table td { + vertical-align: top; +} + .admin__scope-old .tiers_table .col-qty { text-align: left; width: 150px; } .admin__scope-old .tiers_table .col-qty > input[type="text"] { - width: 40%; + width: 60px; margin-right: 5px; } .admin__scope-old .tiers_table .col-qty > .nobr { - width: 50%; - float: right; - margin-top: 6px; - text-overflow: ellipsis; - overflow: hidden; + font-size: 1rem; } .admin__scope-old .tiers_table .col-price .input-text { From e1550abd67630e6167efd1ee82cec97b2d2dd993 Mon Sep 17 00:00:00 2001 From: Dubovyk Oleksandr Date: Wed, 19 Aug 2015 09:59:42 +0300 Subject: [PATCH 06/24] MAGETWO-38970: "and above" statement is displayed not readable for "Tier Price Qty" section on "create Product" Backend page - Removed deprecated ".nobr" on span element - Removed title on span element - Added html escape functions --- .../templates/catalog/product/edit/price/tier.phtml | 6 +++--- .../Magento/Catalog/view/adminhtml/web/product/product.css | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml index c0afb547ce13e..de80333ac1b38 100644 --- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml +++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml @@ -68,12 +68,12 @@ var tierPriceRowTemplate = '' + '' + '' + '' - + '">' + + 'escapeHtml("and above") ?>' + '' + '' + '' - + '' + + '' + ''; var tierPriceControl = { diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/product.css b/app/code/Magento/Catalog/view/adminhtml/web/product/product.css index fddf5173b8148..443d6ebc0375c 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/product/product.css +++ b/app/code/Magento/Catalog/view/adminhtml/web/product/product.css @@ -327,7 +327,7 @@ margin-right: 5px; } -.admin__scope-old .tiers_table .col-qty > .nobr { +.admin__scope-old .tiers_table .col-qty span { font-size: 1rem; } From a940fcaaf3a67081c17d853fd6838649edd4bead Mon Sep 17 00:00:00 2001 From: Dubovyk Oleksandr Date: Wed, 19 Aug 2015 10:59:13 +0300 Subject: [PATCH 07/24] MAGETWO-38970: "and above" statement is displayed not readable for "Tier Price Qty" section on "create Product" Backend page - Removed unnecessary html escape functions from tags --- .../adminhtml/templates/catalog/product/edit/price/tier.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml index de80333ac1b38..b9115e17a58a8 100644 --- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml +++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml @@ -68,12 +68,12 @@ var tierPriceRowTemplate = '' + '' + '' + '' - + 'escapeHtml("and above") ?>' + + '' + '' + '' + '' + '' + + '' + ''; var tierPriceControl = { From e30ceb2e4ba1f3b3b61c5ab825664bf519952a57 Mon Sep 17 00:00:00 2001 From: Dubovyk Oleksandr Date: Wed, 19 Aug 2015 12:29:30 +0300 Subject: [PATCH 08/24] MAGETWO-38970: "and above" statement is displayed not readable for "Tier Price Qty" section on "create Product" Backend page - Set proper argument for "escapeHtml" function --- .../adminhtml/templates/catalog/product/edit/price/tier.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml index b9115e17a58a8..5ecb586b4b057 100644 --- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml +++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml @@ -72,7 +72,7 @@ var tierPriceRowTemplate = '' + '' + '' + '' - + '' + ''; From 1548cfd1b6240f266b2f8dd2428c7bf977254ba9 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Thu, 20 Aug 2015 12:29:15 +0300 Subject: [PATCH 09/24] MAGETWO-41842: [GitHub] Checkout "place order" button styles affect all primary buttons in the block --- .../web/css/source/module/checkout/_payments.less | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less index b880027e5493d..9b72563092e83 100644 --- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less +++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less @@ -37,9 +37,16 @@ display: block; } } - .action { - &.primary { - &:extend(.abs-button-l all); + } + + .payment-method-content { + > .actions-toolbar { + > .primary { + .action { + &.primary { + &:extend(.abs-button-l all); + } + } } } } From 0d429a3608f2715c6b2f6a15865a193d955cc540 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Wed, 26 Aug 2015 09:10:58 +0300 Subject: [PATCH 10/24] MAGETWO-42060: Checkout Agreement Content overlaps if use "Content Height (css)" --- .../frontend/templates/additional_agreements.phtml | 2 +- .../view/frontend/templates/agreements.phtml | 2 +- .../templates/multishipping_agreements.phtml | 2 +- .../view/frontend/templates/form/banktransfer.phtml | 2 +- .../source/module/checkout/_checkout-agreements.less | 12 +++++++++++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml index ff24b86894802..d46b69c8b6f25 100644 --- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml +++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml @@ -18,7 +18,7 @@
    getAgreements() as $_a): ?>
  1. -
    getContentHeight() ? ' style="height:' . $_a->getContentHeight() . '"' : '')?>> +
    getContentHeight() ? ' style="height:' . $_a->getContentHeight() . '"' : '')?>> getIsHtml()):?> getContent() ?> diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml index 99e5ccbfd37ea..99f1460b47107 100644 --- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml +++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml @@ -18,7 +18,7 @@
      getAgreements() as $_a): ?>
    1. -
      getContentHeight() ? ' style="height:' . $_a->getContentHeight() . '"' : '')?>> +
      getContentHeight() ? ' style="height:' . $_a->getContentHeight() . '"' : '')?>> getIsHtml()):?> getContent() ?> diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml index 99b046ade37fc..cf67ee8a244f0 100644 --- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml +++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml @@ -18,7 +18,7 @@
        getAgreements() as $_a): ?>
      1. -
        getContentHeight() ? ' style="height:' . $_a->getContentHeight() . '"' : '')?>> +
        getContentHeight() ? ' style="height:' . $_a->getContentHeight() . '"' : '')?>> getIsHtml()):?> getContent() ?> diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml index cb456c2ead452..7b33bde322b87 100644 --- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml +++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml @@ -8,7 +8,7 @@ ?> getInstructions()): ?> -