Skip to content

J
joshine
Commit aa856261 by halweg
Options

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

parents e683bb5d 7152d1dd
Showing with 24 additions and 5 deletions
app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
...@@ -238,6 +238,9 @@ define([ ...@@ -238,6 +238,9 @@ define([
is_mobile: function(){ is_mobile: function(){
return window.matchMedia("(pointer:coarse)").matches; return window.matchMedia("(pointer:coarse)").matches;
}, },
flatrate_price: function(){
return window.checkoutConfig.flatrate_price;
},
full_free_ship: function(){ full_free_ship: function(){
return window.checkoutConfig.full_free_ship; return window.checkoutConfig.full_free_ship;
}, },
......
app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html
...@@ -34,12 +34,17 @@ ...@@ -34,12 +34,17 @@
</span> </span>
<!-- /ko --> <!-- /ko -->
<span class="col col-method" <span class="col col-method col-style"
attr="'id': 'label_method_' + method.method_code + '_' + method.carrier_code" attr="'id': 'label_method_' + method.method_code + '_' + method.carrier_code"
text="method.method_title"></span> text="method.method_title"></span>
<span class="col col-carrier" <span class="col col-carrier col-style"
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code" attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code"
text="method.carrier_title"></span> text="method.carrier_title"></span>
<!-- ko if: (method.amount) -->
<span class="col col-amount"
attr="'id': 'label_carrier_fee_' + method.method_code + '_' + method.carrier_code"
text="$parent.flatrate_price()"></span>
<!-- /ko -->
</div> </div>
<!-- ko if: (method.amount) --> <!-- ko if: (method.amount) -->
<div class="method-msg"> <div class="method-msg">
...@@ -99,12 +104,17 @@ ...@@ -99,12 +104,17 @@
</span> </span>
<!-- /ko --> <!-- /ko -->
<span class="col col-method" <span class="col col-method col-style"
attr="'id': 'label_method_' + method.method_code + '_' + method.carrier_code" attr="'id': 'label_method_' + method.method_code + '_' + method.carrier_code"
text="method.method_title"></span> text="method.method_title"></span>
<span class="col col-carrier" <span class="col col-carrier col-style"
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code" attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code"
text="method.carrier_title"></span> text="method.carrier_title"></span>
<!-- ko if: (method.amount) -->
<span class="col col-amount"
attr="'id': 'label_carrier_fee_' + method.method_code + '_' + method.carrier_code"
text="$parent.flatrate_price()"></span>
<!-- /ko -->
</div> </div>
<!-- ko if: (method.amount) --> <!-- ko if: (method.amount) -->
<div class="method-msg"> <div class="method-msg">
...@@ -123,7 +133,7 @@ ...@@ -123,7 +133,7 @@
10-15 Working Days</span> 10-15 Working Days</span>
</span> </span>
</div> </div>
<!-- /ko --> <!-- /ko -->
</div> </div>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
...@@ -438,6 +438,12 @@ $full_free_ship = $_helper->currency($full_free, true, false); ...@@ -438,6 +438,12 @@ $full_free_ship = $_helper->currency($full_free, true, false);
.checkout-cart-index .opc-estimated-wrapper .minicart-wrapper { .checkout-cart-index .opc-estimated-wrapper .minicart-wrapper {
display: none; display: none;
} }
.checkout-index-index .col-style{
color:#777;
}
.checkout-index-index .col-amount{
margin-left:0.5rem;
}
/****************************************payment end********************************************************/ /****************************************payment end********************************************************/
@media(max-width:768px){ @media(max-width:768px){
.opc .step-title .number { .opc .step-title .number {
......
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