Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Multishipping checkout agreements now are the same as default checkout agreements #21778

Merged
merged 5 commits into from
Mar 26, 2019
Merged

Multishipping checkout agreements now are the same as default checkout agreements #21778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e90069
Multishipping checkout agreements now are the same as default checkou…
samuel27m Mar 15, 2019
7d998a7
Restore multishipping_agreements file for backward compatibility
samuel27m Mar 16, 2019
f4be161
Fix phpcs issue: restore new line at the end of file
dmytro-ch Mar 18, 2019
9b83593
Add deprecated tag for legacy template
dmytro-ch Mar 18, 2019
6fba686
Fix functional test.
nmalevanec Mar 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceBlock name="checkout_overview">
<block class="Magento\CheckoutAgreements\Block\Agreements" name="checkout.multishipping.agreements" as="agreements" template="Magento_CheckoutAgreements::multishipping_agreements.phtml"/>
<block class="Magento\CheckoutAgreements\Block\Agreements" name="checkout.multishipping.agreements" as="agreements" template="Magento_CheckoutAgreements::additional_agreements.phtml"/>
</referenceBlock>
</body>
</page>
1 change: 1 addition & 0 deletions app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* See COPYING.txt for license details.
*/

// @deprecated
// @codingStandardsIgnoreFile

?>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Multishipping/view/frontend/web/js/overview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},

/**
Expand Down
2 changes: 1 addition & 1 deletion ...nctional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
<page name="MultishippingCheckoutOverview" mca="multishipping/checkout/overview" module="Magento_Checkout">
<block name="agreementReview" class="Magento\CheckoutAgreements\Test\Block\Multishipping\MultishippingAgreementReview" locator="#checkout-agreements" strategy="css selector"/>
<block name="agreementReview" class="Magento\CheckoutAgreements\Test\Block\Multishipping\MultishippingAgreementReview" locator=".checkout-agreements" strategy="css selector"/>
</page>
</config>