Skip to content

J
joshine
Commit c2087fa7 by lmf
Options

Merge branch 'master' of http://47.99.244.21:9999/root/joshine

parents 720941f2 177e1fe5
Showing with 103 additions and 12 deletions
app/code/JTool/PlaceOrder/etc/module.xml 0 → 100644
<?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="JTool_PlaceOrder" setup_version="1.0.0"/>
</config>
\ No newline at end of file
app/code/JTool/PlaceOrder/registration.php 0 → 100644
<?php
\Magento\Framework\Component\ComponentRegistrar::register(\Magento\Framework\Component\ComponentRegistrar::MODULE,
'JTool_PlaceOrder',
__DIR__
);
\ No newline at end of file
app/code/JTool/PlaceOrder/view/frontend/layout/checkout_index_index.xml 0 → 100644
<?xml version="1.0"?>
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="checkout" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<head>
<css src="JTool_PlaceOrder::css/place_order_button.css"/>
</head>
<body>
<referenceBlock name="checkout.root">
<arguments>
<argument name="jsLayout" xsi:type="array">
<item name="components" xsi:type="array">
<item name="checkout" xsi:type="array">
<item name="children" xsi:type="array">
<item name="sidebar" xsi:type="array">
<item name="children" xsi:type="array">
<item name="summary" xsi:type="array">
<item name="component" xsi:type="string">JTool_PlaceOrder/js/view/summary</item>
<item name="config" xsi:type="array">
<item name="template" xsi:type="string">JTool_PlaceOrder/summary</item>
</item>
</item>
</item>
</item>
</item>
</item>
</item>
</argument>
</arguments>
</referenceBlock>
</body>
</page>
\ No newline at end of file
app/code/JTool/PlaceOrder/view/frontend/web/css/place_order_button.css 0 → 100644
.payment-method-content .actions-toolbar{
display: none;
}
\ No newline at end of file
app/code/JTool/PlaceOrder/view/frontend/web/js/view/summary.js 0 → 100644
define(
[
'jquery',
'ko',
'Magento_Checkout/js/view/summary',
'Magento_Checkout/js/model/step-navigator',
],
function(
$,
ko,
Component,
stepNavigator
) {
'use strict';
return Component.extend({
isVisible: function () {
return stepNavigator.isProcessed('shipping');
},
initialize: function () {
$(function() {
$('body').on("click", '#place-order-trigger', function () {
$(".payment-method._active").find('.action.primary.checkout').trigger( 'click' );
});
});
var self = this;
this._super();
}
});
}
);
\ No newline at end of file
app/code/JTool/PlaceOrder/view/frontend/web/template/summary.html 0 → 100644
<div class="opc-block-summary" data-bind="blockLoader: isLoading">
<span data-bind="i18n: 'Order Summary'" class="title"></span>
<!-- ko foreach: elems() -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!-- /ko -->
</div>
<!-- ko if: (isVisible()) -->
<div class="actions-toolbar-trigger" id="place-order-trigger-wrapper">
<button type="button" class="button action primary" id="place-order-trigger" value="Place Order" >
<span>Place Order</span>
</button>
</div>
<!-- /ko -->
\ No newline at end of file
app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,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':{'openedState': '_active'}}"> 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">
<!-- ko i18n: 'Apply Discount Code'--><!-- /ko --> <!-- ko i18n: 'Apply Discount Code'--><!-- /ko -->
......
app/design/frontend/Joshine/breeze/Magento_Theme/layout/default.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"> xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body> <body>
<attribute name="class" value="breeze-theme"/> <attribute name="class" value="breeze-theme"/>
<move element="top.search" destination="store.menu" before="catalog.topnav"/> <move element="top.search" destination="store.menu" after="catalog.topnav"/>
<move element="skip_to_content" destination="header.panel" before="-"/> <move element="skip_to_content" destination="header.panel" before="-"/>
<referenceBlock name="cookie-status-check" remove="true"/> <referenceBlock name="cookie-status-check" remove="true"/>
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -936,14 +936,6 @@ footer{ ...@@ -936,14 +936,6 @@ footer{
.copyright img{ .copyright img{
padding-right: 0px; padding-right: 0px;
} }
@media(min-width: 640px){
.page-header .minicart-wrapper{
top:52px;
}
.page-header .dropdown.options{
top:52px;
}
}
@media(min-width: 640px){ @media(min-width: 640px){
.switcher.currency{ .switcher.currency{
...@@ -951,6 +943,10 @@ footer{ ...@@ -951,6 +943,10 @@ footer{
top: 40px; top: 40px;
right: 116px; right: 116px;
} }
.page-header .header.content .logo{
position: absolute;
left: 45%;
}
} }
.block-collapsible-nav .content .current>a, .block-collapsible-nav .content .current>strong{ .block-collapsible-nav .content .current>a, .block-collapsible-nav .content .current>strong{
border-color: #000000 !important; border-color: #000000 !important;
...@@ -1035,8 +1031,8 @@ footer{ ...@@ -1035,8 +1031,8 @@ footer{
.navigation-wrapper{ .navigation-wrapper{
padding-top: 10px; padding-top: 10px;
padding-bottom: 10px; padding-bottom: 10px;
background: #f2f2f2; //background: #f2f2f2;
border-top: 1px solid #e1e1e1; //border-top: 1px solid #e1e1e1;
font-family: 'Outfit-Regular', sans-serif; font-family: 'Outfit-Regular', sans-serif;
......
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