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 292 additions and 2 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_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/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