Skip to content

J
joshine
Commit 416067f6 by lmf
Options

Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into developer

parents c8ca81e4 77f299d6
Showing with 401 additions and 743 deletions
app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
...@@ -16,7 +16,7 @@ $hasCouponCode = (bool) strlen($block->getCouponCode()); ...@@ -16,7 +16,7 @@ $hasCouponCode = (bool) strlen($block->getCouponCode());
data-mage-init='{"collapsible":{"active": <?= $hasCouponCode ? 'true' : 'false' ?>, "openedState": "active", "saveState": false}}' data-mage-init='{"collapsible":{"active": <?= $hasCouponCode ? 'true' : 'false' ?>, "openedState": "active", "saveState": false}}'
> >
<div class="title" data-role="title"> <div class="title" data-role="title">
<strong id="block-discount-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Apply Discount Code')) ?></strong> <strong id="block-discount-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Apply Discount Code')) ?>11</strong>
</div> </div>
<div class="content" data-role="content" aria-labelledby="block-discount-heading"> <div class="content" data-role="content" aria-labelledby="block-discount-heading">
<form id="discount-coupon-form" <form id="discount-coupon-form"
......
app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="payment-option _collapsible opc-payment-additional discount-code" <div class="payment-option _collapsible opc-payment-additional discount-code"
data-bind="mageInit: {'collapsible':{'active':true, 'openedState': '_active'}}" data-collapsible="true"> data-bind="mageInit: {'collapsible':{'active':true, 'openedState': '_active'}}" data-collapsible="true">
<div class="payment-option-title field choice" data-role="title"> <div class="payment-option-title field choice" data-role="title">
<span class="action action-toggle" id="block-discount-heading" role="heading" aria-level="2"> <span class="action action-toggle" id="block-discount-heading" role="heading" aria-level="2">2222
<!-- ko i18n: 'Apply Discount Code'--><!-- /ko --> <!-- ko i18n: 'Apply Discount Code'--><!-- /ko -->
</span> </span>
</div> </div>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/layout/checkout_cart_index.xml 0 → 100644
<?xml version="1.0"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<update handle="checkout_cart_item_renderers"/>
<body>
<referenceContainer name="header.container" remove="true"/>
<referenceBlock name="global_notices" remove="true" />
<referenceContainer name="page.bottom.container" remove="true"/>
<referenceContainer name="footer-container" remove="true"/>
<referenceContainer name="content">
<block class="Magento\Theme\Block\Html\Header\Logo" name="logo" before="checkout.cart">
<arguments>
<argument name="logoPathResolver" xsi:type="object">Magento\Theme\ViewModel\Block\Html\Header\LogoPathResolver</argument>
<argument name="logo_size_resolver" xsi:type="object">Magento\Theme\ViewModel\Block\Html\Header\LogoSizeResolver</argument>
</arguments>
</block>
<block class="Magento\Framework\View\Element\Template" name="checkout.cart.footer" template="Magento_Checkout::footer.phtml" />
</referenceContainer>
</body>
</page>
app/design/frontend/Joshine/breeze/Magento_Checkout/layout/checkout_index_index.xml
...@@ -7,445 +7,44 @@ ...@@ -7,445 +7,44 @@
--> -->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="checkout" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"> <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="checkout" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body> <body>
<referenceBlock name="page.bottom.container" remove="true"/> <referenceBlock name="global_notices" remove="true" />
<referenceContainer name="content"> <referenceContainer name="page.bottom.container" remove="true"/>
<block class="Magento\Checkout\Block\Onepage" name="checkout.root" template="Magento_Checkout::onepage.phtml" cacheable="false"> <referenceContainer name="footer-container" remove="true"/>
<referenceBlock name="checkout.root">
<arguments> <arguments>
<argument name="jsLayout" xsi:type="array"> <argument name="jsLayout" xsi:type="array">
<item name="types" xsi:type="array">
<item name="form.input" xsi:type="array">
<item name="component" xsi:type="string">Magento_Ui/js/form/element/abstract</item>
<item name="config" xsi:type="array">
<item name="provider" xsi:type="string">checkoutProvider</item>
<item name="deps" xsi:type="array">
<item name="0" xsi:type="string">checkoutProvider</item>
</item>
<item name="template" xsi:type="string">ui/form/field</item>
<item name="elementTmpl" xsi:type="string">ui/form/element/input</item>
</item>
</item>
</item>
<item name="components" xsi:type="array"> <item name="components" xsi:type="array">
<item name="checkout" xsi:type="array"> <item name="checkout" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="config" xsi:type="array">
<item name="template" xsi:type="string">Magento_Checkout/onepage</item>
</item>
<item name="children" xsi:type="array">
<item name="errors" xsi:type="array">
<item name="component" xsi:type="string">Magento_Ui/js/view/messages</item>
<item name="displayArea" xsi:type="string">messages</item>
</item>
<item name="authentication" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/authentication</item>
<item name="displayArea" xsi:type="string">authentication</item>
<item name="children" xsi:type="array"> <item name="children" xsi:type="array">
<!--Additional authentication fields-->
<item name="errors" xsi:type="array">
<item name="sortOrder" xsi:type="string">0</item>
<item name="component" xsi:type="string">Magento_Checkout/js/view/authentication-messages</item>
<item name="displayArea" xsi:type="string">messages</item>
</item>
</item>
</item>
<item name="progressBar" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/progress-bar</item>
<item name="displayArea" xsi:type="string">progressBar</item>
<item name="config" xsi:type="array">
<item name="deps" xsi:type="array">
<item name="0" xsi:type="string">checkout.steps.shipping-step.shippingAddress</item>
<item name="1" xsi:type="string">checkout.steps.billing-step.payment</item>
</item>
</item>
</item>
<item name="estimation" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/estimation</item>
<item name="displayArea" xsi:type="string">estimation</item>
<item name="config" xsi:type="array">
<item name="template" xsi:type="string">Magento_Checkout/estimation</item>
<item name="deps" xsi:type="array">
<item name="0" xsi:type="string">checkout.sidebar</item>
</item>
</item>
</item>
<item name="steps" xsi:type="array"> <item name="steps" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="displayArea" xsi:type="string">steps</item>
<item name="children" xsi:type="array"> <item name="children" xsi:type="array">
<item name="shipping-step" xsi:type="array"> <item name="shipping-step" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="sortOrder" xsi:type="string">1</item>
<item name="children" xsi:type="array">
<item name="step-config" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="children" xsi:type="array">
<item name="shipping-rates-validation" xsi:type="array">
<item name="children" xsi:type="array"> <item name="children" xsi:type="array">
<!--Step configuration components-->
</item>
</item>
</item>
</item>
<item name="shippingAddress" xsi:type="array"> <item name="shippingAddress" xsi:type="array">
<item name="config" xsi:type="array">
<item name="deps" xsi:type="array">
<item name="0" xsi:type="string">checkout.steps.shipping-step.step-config</item>
<item name="1" xsi:type="string">checkoutProvider</item>
</item>
<item name="popUpForm" xsi:type="array">
<item name="element" xsi:type="string">#opc-new-shipping-address</item>
<item name="options" xsi:type="array">
<item name="type" xsi:type="string">popup</item>
<item name="responsive" xsi:type="boolean">true</item>
<item name="innerScroll" xsi:type="boolean">true</item>
<item name="title" xsi:type="string" translate="true">Shipping Address</item>
<item name="trigger" xsi:type="string">opc-new-shipping-address</item>
<item name="buttons" xsi:type="array">
<item name="save" xsi:type="array">
<item name="text" xsi:type="string" translate="true">Ship Here</item>
<item name="class" xsi:type="string">action primary action-save-address</item>
</item>
<item name="cancel" xsi:type="array">
<item name="text" xsi:type="string" translate="true">Cancel</item>
<item name="class" xsi:type="string">action secondary action-hide-popup</item>
</item>
</item>
</item>
</item>
</item>
<item name="component" xsi:type="string">Magento_Checkout/js/view/shipping</item>
<item name="provider" xsi:type="string">checkoutProvider</item>
<item name="sortOrder" xsi:type="string">10</item>
<item name="children" xsi:type="array">
<item name="customer-email" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/form/element/email</item>
<item name="displayArea" xsi:type="string">customer-email</item>
<item name="tooltip" xsi:type="array">
<item name="description" xsi:type="string" translate="true">We'll send your order confirmation here.</item>
</item>
<item name="children" xsi:type="array"> <item name="children" xsi:type="array">
<item name="before-login-form" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="displayArea" xsi:type="string">before-login-form</item>
<item name="children" xsi:type="array">
<!-- before login form fields -->
</item>
</item>
<item name="additional-login-form-fields" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="displayArea" xsi:type="string">additional-login-form-fields</item>
<item name="children" xsi:type="array">
<!-- additional login form fields -->
</item>
</item>
</item>
</item>
<item name="before-form" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="displayArea" xsi:type="string">before-form</item>
<item name="children" xsi:type="array">
<!-- before form fields -->
</item>
</item>
<item name="before-fields" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="displayArea" xsi:type="string">before-fields</item>
<item name="children" xsi:type="array">
<!-- before fields -->
</item>
</item>
<item name="address-list" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/shipping-address/list</item>
<item name="displayArea" xsi:type="string">address-list</item>
</item>
<item name="address-list-additional-addresses" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="displayArea" xsi:type="string">address-list-additional-addresses</item>
<item name="children" xsi:type="array">
<!-- address-list-additional-addresses -->
</item>
</item>
<item name="before-shipping-method-form" xsi:type="array"> <item name="before-shipping-method-form" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="displayArea" xsi:type="string">before-shipping-method-form</item>
<item name="children" xsi:type="array"> <item name="children" xsi:type="array">
<!-- address-list-additional-addresses --> <item name="shipping_policy" xsi:type="array">
</item> <item name="component" xsi:type="string">Magento_Shipping/js/view/checkout/shipping/shipping-policy</item>
</item>
<item name="shipping-address-fieldset" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="config" xsi:type="array">
<item name="deps" xsi:type="array">
<item name="0" xsi:type="string">checkoutProvider</item>
</item>
</item>
<item name="displayArea" xsi:type="string">additional-fieldsets</item>
<item name="children" xsi:type="array">
<!-- The following items override configuration of corresponding address attributes -->
<item name="region" xsi:type="array">
<!-- Make region attribute invisible on frontend. Corresponding input element is created by region_id field -->
<item name="visible" xsi:type="boolean">false</item>
</item>
<item name="region_id" xsi:type="array">
<item name="component" xsi:type="string">Magento_Ui/js/form/element/region</item>
<item name="config" xsi:type="array">
<item name="template" xsi:type="string">ui/form/field</item>
<item name="elementTmpl" xsi:type="string">ui/form/element/select</item>
<item name="customEntry" xsi:type="string">shippingAddress.region</item>
</item>
<item name="validation" xsi:type="array">
<item name="required-entry" xsi:type="boolean">true</item>
</item> </item>
<!-- Value of region_id field is filtered by the value of county_id attribute -->
<item name="filterBy" xsi:type="array">
<item name="target" xsi:type="string"><![CDATA[${ $.provider }:${ $.parentScope }.country_id]]></item>
<item name="field" xsi:type="string">country_id</item>
</item> </item>
</item> </item>
<item name="postcode" xsi:type="array">
<!-- post-code field has custom UI component -->
<item name="component" xsi:type="string">Magento_Ui/js/form/element/post-code</item>
<item name="validation" xsi:type="array">
<item name="required-entry" xsi:type="boolean">true</item>
</item> </item>
</item> </item>
<item name="company" xsi:type="array">
<item name="visible" xsi:type="boolean">false</item>
<item name="validation" xsi:type="array">
<item name="min_text_length" xsi:type="number">0</item>
</item> </item>
</item> </item>
<item name="fax" xsi:type="array">
<item name="validation" xsi:type="array">
<item name="min_text_length" xsi:type="number">0</item>
</item> </item>
</item> </item>
<item name="telephone" xsi:type="array">
<item name="config" xsi:type="array">
<item name="tooltip" xsi:type="array">
<item name="description" xsi:type="string" translate="true">For delivery questions.</item>
</item> </item>
</item> </item>
</item> </item>
</item>
</item>
</item>
</item>
</item>
</item>
<item name="billing-step" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="sortOrder" xsi:type="string">2</item>
<item name="children" xsi:type="array">
<item name="payment" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/payment</item>
<item name="config" xsi:type="array">
<item name="title" xsi:type="string" translate="true">Payment</item>
<item name="sortOrder" xsi:type="string">20</item>
</item>
<item name="children" xsi:type="array">
<item name="renders" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="children" xsi:type="array">
<!-- merge payment method renders here -->
</item>
</item>
<item name="additional-payment-validators" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="children" xsi:type="array">
<!-- merge payment validators here -->
<item name="email-validator" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/payment/email-validator</item>
</item>
</item>
</item>
<item name="customer-email" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/form/element/email</item>
<item name="displayArea" xsi:type="string">customer-email</item>
<item name="tooltip" xsi:type="array">
<item name="description" xsi:type="string" translate="true">We'll send your order confirmation here.</item>
</item>
<item name="children" xsi:type="array">
<item name="before-login-form" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="displayArea" xsi:type="string">before-login-form</item>
<item name="children" xsi:type="array">
<!-- before login form fields -->
</item>
</item>
<item name="additional-login-form-fields" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="displayArea" xsi:type="string">additional-login-form-fields</item>
<item name="children" xsi:type="array">
<!-- additional login form fields -->
</item>
</item>
</item>
</item>
<item name="place-order-captcha" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/checkout/placeOrderCaptcha</item>
<item name="displayArea" xsi:type="string">place-order-captcha</item>
<item name="formId" xsi:type="string">payment_processing_request</item>
<item name="configSource" xsi:type="string">checkoutConfig</item>
</item>
<item name="beforeMethods" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="displayArea" xsi:type="string">beforeMethods</item>
<item name="children" xsi:type="array">
<!-- merge additional data before payment methods here -->
</item>
<item name="validation" xsi:type="array">
<item name="validate-select" xsi:type="string">true</item>
</item>
<!-- Value of region_id field is filtered by the value of county_id attribute -->
<item name="filterBy" xsi:type="array">
<item name="target" xsi:type="string">${ $.provider }:${ $.parentScope }.country_id</item>
<item name="field" xsi:type="string">country_id</item>
</item>
</item>
<item name="payments-list" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/payment/list</item>
<item name="displayArea" xsi:type="string">payment-methods-list</item>
<item name="config" xsi:type="array">
<item name="deps" xsi:type="array">
<item name="0" xsi:type="string">checkout.steps.billing-step.payment.renders</item>
<item name="1" xsi:type="string">checkout.steps.billing-step.payment.additional-payment-validators</item>
</item>
</item>
<item name="children" xsi:type="array">
<item name="before-place-order" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="displayArea" xsi:type="string">before-place-order</item>
<item name="dataScope" xsi:type="string">before-place-order</item>
<item name="provider" xsi:type="string">checkoutProvider</item>
<item name="config" xsi:type="array">
<item name="template" xsi:type="string">Magento_Checkout/payment/before-place-order</item>
</item>
</item>
</item>
</item>
<!-- merge your payment methods here -->
<item name="afterMethods" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="displayArea" xsi:type="string">afterMethods</item>
<item name="children" xsi:type="array">
<!-- merge additional data after payment methods here -->
</item>
</item>
</item>
</item>
</item>
</item>
</item>
</item>
<item name="sidebar" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/sidebar</item>
<item name="displayArea" xsi:type="string">sidebar</item>
<item name="config" xsi:type="array">
<item name="template" xsi:type="string">Magento_Checkout/sidebar</item>
<item name="deps" xsi:type="array">
<item name="0" xsi:type="string">checkout.steps</item>
</item>
</item>
<item name="children" xsi:type="array">
<item name="summary" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary</item>
<item name="displayArea" xsi:type="string">summary</item>
<item name="config" xsi:type="array">
<item name="template" xsi:type="string">Magento_Checkout/summary</item>
</item>
<item name="children" xsi:type="array">
<item name="totals" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/totals</item>
<item name="displayArea" xsi:type="string">totals</item>
<item name="config" xsi:type="array">
<item name="template" xsi:type="string">Magento_Checkout/summary/totals</item>
</item>
<item name="children" xsi:type="array">
<!-- sort order for this totals is configured on admin panel-->
<!-- Stores->Configuration->SALES->Sales->General->Checkout Totals Sort Order -->
<item name="subtotal" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/subtotal</item>
<item name="config" xsi:type="array">
<item name="title" xsi:type="string" translate="true">Cart Subtotal</item>
</item>
</item>
<item name="shipping" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/shipping</item>
<item name="config" xsi:type="array">
<item name="title" xsi:type="string" translate="true">Shipping</item>
<item name="notCalculatedMessage" xsi:type="string" translate="true">Not yet calculated</item>
</item>
</item>
<item name="grand-total" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/grand-total</item>
<item name="config" xsi:type="array">
<item name="title" xsi:type="string" translate="true">Order Total</item>
</item>
</item>
</item>
</item>
<item name="itemsBefore" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="children" xsi:type="array">
<!-- merge your components here -->
</item>
</item>
<item name="cart_items" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/cart-items</item>
<item name="children" xsi:type="array">
<item name="details" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/item/details</item>
<item name="children" xsi:type="array">
<item name="thumbnail" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/item/details/thumbnail</item>
<item name="displayArea" xsi:type="string">before_details</item>
</item>
<item name="subtotal" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/item/details/subtotal</item>
<item name="displayArea" xsi:type="string">after_details</item>
</item>
<item name="message" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/item/details/message</item>
<item name="displayArea" xsi:type="string">item_message</item>
</item>
</item>
</item>
</item>
</item>
<item name="itemsAfter" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="children" xsi:type="array">
<!-- merge your components here -->
</item>
</item>
</item>
</item>
<item name="shipping-information" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/shipping-information</item>
<item name="config" xsi:type="array">
<item name="deps" xsi:type="string">checkout.steps.shipping-step.shippingAddress</item>
</item>
<item name="displayArea" xsi:type="string">shipping-information</item>
<item name="children" xsi:type="array">
<item name="ship-to" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/shipping-information/list</item>
<item name="displayArea" xsi:type="string">ship-to</item>
</item>
</item>
</item>
</item>
</item>
</item>
</item>
<item name="checkoutProvider" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
</item>
</item>
</argument> </argument>
</arguments> </arguments>
</block> </referenceBlock>
<referenceContainer name="content">
<block class="Magento\Framework\View\Element\Template" name="checkout.cart.footer" template="Magento_Checkout::footer.phtml" />
</referenceContainer> </referenceContainer>
<referenceContainer name="page.messages" remove="true"/>
</body> </body>
</page> </page>
app/design/frontend/Joshine/breeze/Magento_Checkout/layout/checkout_onepage_success.xml 0 → 100644
<?xml version="1.0"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<head>
<title>Success Page</title>
</head>
<body>
<referenceBlock name="global_notices" remove="true" />
<referenceContainer name="page.bottom.container" remove="true"/>
<referenceContainer name="footer-container" remove="true"/>
<referenceContainer name="page.messages" remove="true"/>
<referenceBlock name="page.main.title">
<block class="Magento\Checkout\Block\Onepage\Success" name="checkout.success.print.button" template="Magento_Checkout::button.phtml"/>
<action method="setPageTitle">
<argument translate="true" name="title" xsi:type="string">Thank you for your purchase!</argument>
</action>
</referenceBlock>
<referenceContainer name="content">
<block class="Magento\Checkout\Block\Onepage\Success" name="checkout.success" template="Magento_Checkout::success.phtml" cacheable="false">
<container name="order.success.additional.info" label="Order Success Additional Info"/>
</block>
<block class="Magento\Checkout\Block\Registration" name="checkout.registration" template="Magento_Checkout::registration.phtml" cacheable="false"/>
<block class="Magento\Framework\View\Element\Template" name="checkout.cart.footer" template="Magento_Checkout::footer.phtml" />
</referenceContainer>
</body>
</page>
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
?>
<style>
.logo {
margin-left: 40%;
margin-top: 10%;
}
a.logo>img{
margin-top: 5%;
width: 155px;
height: auto;
}
.cart-class{
margin-top: 3%;
margin-left: 9%;
margin-bottom: 2%;
}
.activation{
font-size: 20px;
font-width: 600;
margin-right: 20px;
margin-left: 20px;
}
.activation-no{
font-size: 14px;
margin-right: 20px;
margin-left: 20px;
color: #1b1b1b;
}
@media(max-width: 1024px){
a.logo>img {
margin-top: 3%;
margin-bottom: 2%;
}
.logo {
margin-left: 30%;
}
.cart-container{
margin-top: 0px;
}
span.action.nav-toggle {
display: none;
}
.page-main > .columns{
margin-top: 20px !important;
}
.activation {
color: darkblue;
font-size: 14px;
font-weight: 600;
margin-right: 2px;
margin-left: 2px;
}
.activation-no {
font-size: 10px;
margin-right: 2px;
margin-left: 2px;
color: slategray;
}
.cart-class {
margin-left: 0px;
}
form .actions-toolbar{
margin: 0px !important;
}
.checkout-cart-index .column.main .block:not(.crosssell) .content { padding: 0px !important;}
.cart-container .cart.table thead{height: 0px;}
.cart-container .cart-summary{
margin-top: -15%;
}
}
</style>
<div class="cart-class">
<span class="activation"><a href="/checkout/cart/">Cart</a></span> >
<span class="activation-no"><a href="/checkout/#shipping" >Shipping</a></span> >
<span class="activation-no" id="payment-bar"><a href="/checkout/#payment">Payment</a></span> >
<span class="activation-no">Complete</span>
</div>
<?php
/**
* Shopping cart template
*
* @var $block \Magento\Checkout\Block\Cart
*/
if ($block->getItemsCount()) {
// phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
echo $block->getChildHtml('with-items');
} else {
// phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
echo $block->getChildHtml('no-items');
}
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/footer.phtml 0 → 100644
<style>
.cat-footer{
border-top: 1px solid rgba(var(--base-color), var(--divider-alpha, .1));
width: 100%;
margin-top: 5px;
}
.cat-footer-tk{
margin-top: 10px;
margin-left: 9%;
margin-bottom: 2%;
}
.cat-footer-tk > span {
margin-right: 10px;
margin-left: 10px;
font-size: 14px;
}
@media(max-width: 1024px){
.cat-footer{
width: 100% !important;
}
.cat-footer-tk{
margin-left: 0px;
text-align: center;
}
.cat-footer-tk > span {
margin-right: 4px;
margin-left: 4px;
font-size: 10px;
}
}
</style>
<div class="cat-footer">
<div class="cat-footer-tk">
<span><a href="/shipping-policy">Shipping Policy</a></span>
<span><a href="/return-exchange-policy">Return &amp; Exchange</a></span>
<span><a href="/365-days-warranty">365-Days Warranty</a></span>
</div>
</div>
\ No newline at end of file
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
...@@ -4,371 +4,128 @@ ...@@ -4,371 +4,128 @@
* See COPYING.txt for license details. * See COPYING.txt for license details.
*/ */
/** @var $block \Magento\Checkout\Block\Onepage */ /** @var $block \Magento\Checkout\Block\Onepage */
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */ /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
?> ?>
<style type="text/css">
.checkout-index-index{
font-family: 'Outfit-Regular', sans-serif;
}
.header.content .logo:after{
content: '';
display: inline-block;
width: 1px;
height: 30px;
margin-left: 10px;
vertical-align: middle;
-webkit-transform: rotate(30deg);
transform: rotate(30deg);
position: relative;
top: 0px;
left: 8px;
}
.header.content .secure-wrapper{
display: inline-block;
margin-left: 10px;
font-size: 12px;
color: #83b293;
opacity: 1;
width: unset;
}
.header.content .secure-wrapper .iconfont.icon-safepay{
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
color: #ffffff;
background: #83b293;
padding: 8px;
border-radius: 50%;
}
.header.content .secure-wrapper em{
padding-top: 36px;
position: relative;
top: 2px;
left: 5px;
font-size: 20px;
font-style: normal;
}
.header.content .secure-wrapper .icon-safepay:before {
content: "\e644";
}
.checkout-index-index footer.modal-footer{margin-top: unset;}
.header.content{height:60px;padding-top: 10px;padding-bottom: 10px;}
@media(min-width: 640px){
.header.content{padding-top: 15px !important;margin-bottom: 0px !important;}
}
@media(min-width: 1024px){ <style>
li#payment{ main#maincontent{
margin-top: -9%; max-width: 80%;
width: 80%;
margin-left: 18%;
} }
.page-layout-checkout .header.content{
margin-top: 2%;
} }
@media(max-width: 639.98px){ .cat-footer{
.header.content{padding-top: 15px !important;margin-bottom: 0px !important;} width: 80% !important;
.page-layout-checkout .header.content{justify-content:unset;gap:unset;}
.header.content .secure-wrapper{margin-left: -30px;margin-top: 5px;}
.header.content .secure-wrapper .iconfont.icon-safepay{padding: 5px !important;}
.header.content .secure-wrapper em{top: unset !important;font-size: 16px !important;}
.header.content .logo:after{left: 5px;}
.header.content .logo img{max-width: 60%;}
.payment-method-note{font-size: 12px;}
}
.opc>li{padding: 0;padding-bottom: 20px;}
#maincontent{background: #f2f2f2;}
.page-title-wrapper{display: none;}
#opc-sidebar{
border: 1px solid #d4d4d4;
background: #fff;
font-size: 16px;
} }
.opc-block-summary{ .cat-footer-tk{
background: #f9f9f9; margin-left: 0px !important;
padding: 15px;
} }
.action.action-auth-toggle{ .opc .actions-toolbar{
background: none; justify-content: center !important;
color: #000;
text-decoration: underline !important;
line-height: 30px;
font-family: Outfit-Regular;
font-weight: 300;
font-size: 12px;
text-transform: uppercase;
z-index: 1;
} }
.opc .step-title, .opc .field-select-billing .label{ </style>
font-weight: 600; <style>
a.logo>img{
margin-top: 5%;
width: 155px;
height: auto;
}
.cart-class{
margin-top: 3%;
margin-left: 0px !important;
margin-bottom: 1% !important;
}
.activation{
font-size: 20px; font-size: 20px;
cursor: pointer; font-width: 600;
background: #eeeeee; margin-right: 10px;
padding:15px; margin-left: 10px;
}
.label {
color: #555;
font-size: 13px;
}
.table-checkout-shipping-method tr.row{
/*border: 1px solid #1979c3;*/
box-shadow: 0 2px 8px rgb(56 77 108 / 40%);
line-height: 20px;
display: block;
padding: 0 20px;
margin-bottom: 10px;
}
/*table tbody:last-child tr:last-child{*/
/* border-bottom: 1px solid #1979c3;*/
/*}*/
a[href^="tel:"]{
color: #666666;
}
.field.addresses{
color: #666666;
font-size: 14px;
}
.field ._with-tooltip input{
width: 100%;
}
.checkout-container .action.primary,.checkout-container action.secondary{
vertical-align: middle;
-webkit-transform: perspective(1px) translateZ(0);
transform: perspective(1px) translateZ(0);
box-shadow: 0 0 1px rgb(0 0 0 / 0%);
border-radius: 0px;
background-color: #222222;
box-shadow: none;
color: #ffffff;
display: inline-block;
font-family: 'Outfit', sans-serif;
font-weight: normal;
padding: 12px 50px;
line-height: 1;
text-shadow: none;
text-transform: capitalize;
white-space: nowrap;
font-size: 13px;
border-radius: 2px;
border: 2px solid #222222;
background-image: none;
text-align: center;
border: none;
text-transform: uppercase;
font-weight: normal !important;
transition: all 0.4s ease;
-webkit-transition: all 0.4s ease;
}
input:not([type]), input[type="text"], input[type="password"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="week"],#maincontent input[type="email"], input[type="number"], input[type="search"], input[type="tel"], input[type="time"], input[type="url"], input[type="color"], textarea {
border: 1px solid #e1e1e1;
height: 40px;
padding: 5px;
border-radius: 3px;
box-shadow: none;
}
select {
background: #ffffff;
background-clip: padding-box;
border: 1px solid #c2c2c2;
border-radius: 1px;
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-size: 14px;
height: 32px;
line-height: 1.42857143;
padding: 5px 10px 4px;
vertical-align: baseline;
width: 100%;
box-sizing: border-box;
} }
.product-item-details{ .activation-no{
color: #666666;
font-size: 14px; font-size: 14px;
margin-right: 10px;
margin-left: 10px;
color: #1b1b1b;
} }
.shipping-address-item.selected-item{
border: 1px solid #1979c3;
}
.shipping-address-item:hover{
box-shadow: 0 2px 8px rgb(56 77 108 / 20%);
}
.shipping-address-item.selected-item:hover{
box-shadow: 0 2px 8px rgb(56 77 108 / 40%);
}
button.action.secondary{
background: #000000;
}
cc
.checkout-payment-method .opc-payment-additional.discount-code{
.opc-progress-bar{
display: none !important;
} }
.opc-block-summary .payment-option .form-discount .actions-toolbar .action{
background: #000000; @media(max-width: 1024px){
height: 38px; .logo {
} margin-left: 0% !important;
.actions-toolbar .secondary a.action.remind span{
font-size: 14px;
font-family: Outfit-Regular;
color: #000000;
}
.opc .checkout-shipping-address{
padding-bottom: 20px;
}
table.table-checkout-shipping-method{
border-collapse: separate;
border-spacing: 5px 10px;
} }
.content.minicart-items{ .cart-container{
display: block !important; margin-top: 0px;
} }
.opc-summary-wrapper .shipping-information{ span.action.nav-toggle {
display: none; display: none;
} }
.field.choice>[type="radio"], .field.choice>[type="checkbox"]{ .page-main > .columns{
margin-top: 4px; margin-top: 0px !important;
}
.payment-method{
background: #f9f9f9;
padding: 10px 20px;
margin-bottom: 20px;
} }
.payment-method ._active{ .activation {
border: 1px solid #1979c3; color: darkblue;
}
.checkout-billing-address{
font-size: 14px; font-size: 14px;
color: #666666; font-weight: 600;
} margin-right: 2px;
.authentication-wrapper{ margin-left: 2px;
float: none;
font-size: 13px;
color: #666666;
}
.totals.shipping.excl .label{
color: unset;
font-size: unset;
}
.totals.shipping.incl .label{
color: unset;
font-size: unset;
}
@media (min-width: 1024px) {
.checkout-container{
/*width: 60%;*/
margin: 0 auto;
background: #ffffff;
padding: 20px;
}
} }
.teliphone_number{width:100% !important;;} .activation-no {
@media(min-width: 1024px){ font-size: 10px;
.page-title-wrapper~.columns{ margin-right: 2px;
margin-top:0; margin-left: 2px;
color: slategray;
} }
.opc-sidebar.modal-custom .modal-content{ .cart-class {
padding: 0; margin-left: 0px;
} }
.opc-summary-wrapper .actions-toolbar-trigger{ form .actions-toolbar{
width: 90%; margin: 0px !important;
margin: 20px auto;
} }
.opc-summary-wrapper .button.action.primary{ .checkout-cart-index .column.main .block:not(.crosssell) .content { padding: 0px !important;}
vertical-align: middle; main#maincontent {
-webkit-transform: perspective(1px) translateZ(0); max-width: 100%;
transform: perspective(1px) translateZ(0);
box-shadow: 0 0 1px rgb(0 0 0 / 0%);
border-radius: 0px;
box-shadow: none;
color: #ffffff;
display: inline-block;
font-family: 'Outfit', sans-serif;
font-weight: normal;
padding: 12px 50px;
line-height: 1;
text-shadow: none;
text-transform: capitalize;
white-space: nowrap;
font-size: 13px;
border-radius: 2px;
border: 2px solid #222222;
background-image: none;
text-align: center;
border: none;
text-transform: uppercase;
font-weight: normal !important;
transition: all 0.4s ease;
-webkit-transition: all 0.4s ease;
width: 100%; width: 100%;
height: 50px; margin-left: 0px;
background: #ffa800;
font-size: 20px;
}
.opc-progress-bar{
justify-content: center;
font-size: 22px;
padding: 20px 0;
}
.action.action-auth-toggle{
margin: 0;
padding: 0;
} }
.authentication-wrapper{font-size: 12px; line-height: 12px;}
#opc-sidebar{ header.page-header{
float: right; position: unset !important;
width: 370px; margin-top:0px !important;
} }
table.data.table.table-totals {
font-size: 12px;
} }
@media(max-width: 767.98px){ button.action.primary.checkout,div#shipping-method-buttons-container {
.page-main>.columns{margin-top: 0;}
#maincontent{background: #ffffff;}
.opc-estimated-wrapper{background: #eeeeee;}
.opc-progress-bar{
margin-top: 100px;
}
#opc-sidebar{
margin-top: -5%;
}
}
@media(max-width: 639.98px){
.header.content{padding-top: 15px !important;margin-bottom: 0px !important;}
.page-layout-checkout .header.content{justify-content:unset;gap:unset;}
.header.content .secure-wrapper{margin-left: -30px;margin-top: 5px;}
.header.content .secure-wrapper .iconfont.icon-safepay{padding: 5px !important;}
.header.content .secure-wrapper em{top: unset !important;font-size: 16px !important;}
.header.content .logo:after{left: 5px;}
.header.content .logo img{max-width: 60%;}
.opc-progress-bar-item:before{
height:3px;
}
.opc-progress-bar-item>span{font-size: 12px;padding-top: 35px;}
.opc-progress-bar-item>span:before, .opc-progress-bar-item>span:after{width: 26px;height: 26px;margin-left:-13px;top: 6px;}
.opc-progress-bar-item>span:after{font-size: 1rem;}
.opc .actions-toolbar{
position: fixed; position: fixed;
right: 0;
bottom: 0; bottom: 0;
left: 0; width: 110%;
background: #ffffff; margin-left: -10% !important;
z-index: 11;
padding: 10px 0;
margin-bottom:0;
} }
.checkout-container .actions-toolbar .action.continue.primary{ .opc-estimated-wrapper .estimated-price{
width: 96%; font-weight: 600;
margin: 0 auto;
background: #ff9600;
height: 48px;
font-size: 20px;
display: flex;
} }
.checkout-container .actions-toolbar .action.continue.primary .secure img{ .payment-option._collapsible.opc-payment-additional.discount-code._active {
height: 28px; margin: 0px !important;
vertical-align: bottom;
margin-right: 15px;
} }
.authentication-wrapper{top: 0px;}
.opc-payment ~ div:not([style*="none"]){margin-top: 0px !important;}
} }
</style> </style>
<div class="cart-class">
<span class="activation"><a href="/checkout/cart/">Cart</a></span> >
<span class="activation"><a href="/checkout/#shipping" >Shipping</a></span> >
<span class="activation-no" id="payment-bar"><a href="/checkout/#payment">Payment</a></span> >
<span class="activation-no">Complete</span>
</div>
<div id="checkout" data-bind="scope:'checkout'" class="checkout-container"> <div id="checkout" data-bind="scope:'checkout'" class="checkout-container">
<div id="checkout-loader" data-role="checkout-loader" class="loading-mask" data-mage-init='{"checkoutLoader": {}}'> <div id="checkout-loader" data-role="checkout-loader" class="loading-mask" data-mage-init='{"checkoutLoader": {}}'>
<div class="loader"> <div class="loader">
...@@ -406,3 +163,15 @@ script; ...@@ -406,3 +163,15 @@ script;
?> ?>
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?> <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
</div> </div>
<script>
require([
'jquery'
], function ($) {
setTimeout(function(){
var payment = $(location).attr("hash");
if ($.trim("#payment") == $.trim(payment)){
$("#payment-bar").removeClass("activation-no").addClass("activation");
}
},5000);
});
</script>
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/success.phtml
...@@ -6,6 +6,85 @@ ...@@ -6,6 +6,85 @@
?> ?>
<?php /** @var $block \Magento\Checkout\Block\Onepage\Success */ ?> <?php /** @var $block \Magento\Checkout\Block\Onepage\Success */ ?>
<style>
main#maincontent{
width: 80%;
}
.cat-footer{
width: 100% !important;
}
.cat-footer-tk{
margin-left: 0px !important;
}
.opc .actions-toolbar{
justify-content: center !important;
}
#registration{
margin-bottom: 200px;
}
@media(max-width: 1024px){
.logo {
margin-left: 0% !important;
}
.cart-container{
margin-top: 0px;
}
span.action.nav-toggle {
display: none;
}
.page-main > .columns{
margin-top: 0px !important;
}
.activation {
color: darkblue;
font-size: 14px;
font-weight: 600;
margin-right: 2px;
margin-left: 2px;
}
.activation-no {
font-size: 10px;
margin-right: 2px;
margin-left: 2px;
color: slategray;
}
.cart-class {
margin-left: 0px;
}
form .actions-toolbar{
margin: 0px !important;
}
.checkout-cart-index .column.main .block:not(.crosssell) .content { padding: 0px !important;}
main#maincontent {
max-width: 100%;
width: 100%;
margin-left: 0px;
}
.authentication-wrapper{font-size: 12px; line-height: 12px;}
header.page-header{
position: unset !important;
margin-top:0px !important;
}
#registration{
margin-bottom: 50px;
}
h1.page-title{
font-size: 16px;
text-align: center;
}
img{
margin-left: 70%;
margin-top: 10%;
}
}
</style>
<div class="cart-class">
<span class="activation">Cart</span> >
<span class="activation">Shipping</span> >
<span class="activation">Payment</span> >
<span class="activation">Complete</span>
</div>
<div class="checkout-success"> <div class="checkout-success">
<?php if ($block->getOrderId()) :?> <?php if ($block->getOrderId()) :?>
<?php if ($block->getCanViewOrder()) :?> <?php if ($block->getCanViewOrder()) :?>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/progress-bar.html 0 → 100644
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<ul class="opc-progress-bar">
<!-- ko foreach: { data: steps().sort(sortItems), as: 'item' } -->
<li class="opc-progress-bar-item" data-bind="css: item.isVisible() ? '_active' : ($parent.isProcessed(item) ? '_complete' : '')">
<span data-bind="i18n: item.title, click: $parent.navigateTo"></span>
</li>
<!-- /ko -->
</ul>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment