From 3e90069c0f65e2e672379b82bd3684145ede9820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Ca=C3=A7ador?= Date: Fri, 15 Mar 2019 16:47:36 +0000 Subject: [PATCH 1/5] Multishipping checkout agreements now are the same as default checkout agreements --- .../multishipping_checkout_overview.xml | 2 +- .../templates/multishipping_agreements.phtml | 49 ------------------- 2 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml b/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml index 3f742de0177da..122160f1a10cd 100644 --- a/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml +++ b/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml deleted file mode 100644 index 3400770f5cee8..0000000000000 --- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml +++ /dev/null @@ -1,49 +0,0 @@ - - -getAgreements()) { - return; -} ?> -
    - - getAgreements() as $agreement): ?> -
  1. -
    getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '') ?>> - getIsHtml()):?> - getContent() ?> - - escapeHtml($agreement->getContent())) ?> - -
    - getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?> -
    - - -
    - getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO): ?> -
    - getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?> -
    - -
    2. - -
From 7d998a75d37f1098ab0528e7d5d50736584941cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Ca=C3=A7ador?= Date: Sat, 16 Mar 2019 17:26:49 +0000 Subject: [PATCH 2/5] Restore multishipping_agreements file for backward compatibility --- .../templates/multishipping_agreements.phtml | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml new file mode 100644 index 0000000000000..2d0667ee27cf8 --- /dev/null +++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml @@ -0,0 +1,49 @@ + + +getAgreements()) { + return; +} ?> +
    + + getAgreements() as $agreement): ?> +
  1. +
    getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '') ?>> + getIsHtml()):?> + getContent() ?> + + escapeHtml($agreement->getContent())) ?> + +
    + getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?> +
    + + +
    + getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO): ?> +
    + getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?> +
    + +
    2. + +
\ No newline at end of file From f4be1612bd4ba6d492cf920e7fdb9514fd5ebe56 Mon Sep 17 00:00:00 2001 From: Dmytro Cheshun Date: Mon, 18 Mar 2019 20:59:08 +0200 Subject: [PATCH 3/5] Fix phpcs issue: restore new line at the end of file --- .../view/frontend/templates/multishipping_agreements.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2d0667ee27cf8..3400770f5cee8 100644 --- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml +++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml @@ -46,4 +46,4 @@ - \ No newline at end of file + From 9b83593fab1f5dcbf351a8ae2fb6e88c815cecb8 Mon Sep 17 00:00:00 2001 From: Dmytro Cheshun Date: Mon, 18 Mar 2019 21:01:44 +0200 Subject: [PATCH 4/5] Add deprecated tag for legacy template --- .../view/frontend/templates/multishipping_agreements.phtml | 1 + 1 file changed, 1 insertion(+) 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 3400770f5cee8..33227f0cdce3c 100644 --- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml +++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml @@ -4,6 +4,7 @@ * See COPYING.txt for license details. */ +// @deprecated // @codingStandardsIgnoreFile ?> From 6fba6865685a41753fce0631bc9461e6632df8c9 Mon Sep 17 00:00:00 2001 From: nmalevanec Date: Fri, 22 Mar 2019 14:09:49 +0200 Subject: [PATCH 5/5] Fix functional test. --- app/code/Magento/Multishipping/view/frontend/web/js/overview.js | 2 +- .../Test/Page/MultishippingCheckoutOverview.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Multishipping/view/frontend/web/js/overview.js b/app/code/Magento/Multishipping/view/frontend/web/js/overview.js index 9b867cd7217b1..3a6d73e304974 100644 --- a/app/code/Magento/Multishipping/view/frontend/web/js/overview.js +++ b/app/code/Magento/Multishipping/view/frontend/web/js/overview.js @@ -15,7 +15,7 @@ define([ opacity: 0.5, // CSS opacity for the 'Place Order' button when it's clicked and then disabled. pleaseWaitLoader: 'span.please-wait', // 'Submitting order information...' Ajax loader. placeOrderSubmit: 'button[type="submit"]', // The 'Place Order' button. - agreements: '#checkout-agreements' // Container for all of the checkout agreements and terms/conditions + agreements: '.checkout-agreements' // Container for all of the checkout agreements and terms/conditions }, /** diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml index d304d305a7265..a266b09278ddb 100644 --- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml +++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml @@ -7,6 +7,6 @@ --> - +