Skip to content

J
joshine
Commit c75b788c by halweg
Options

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

parents bd8ba9ae 6be9860e
Showing with 145 additions and 10 deletions
app/code/Magento/Checkout/Block/Onepage.php
...@@ -112,6 +112,11 @@ class Onepage extends \Magento\Framework\View\Element\Template ...@@ -112,6 +112,11 @@ class Onepage extends \Magento\Framework\View\Element\Template
{ {
return $this->_scopeConfigInterface->getValue('carriers/flatrate/price'); return $this->_scopeConfigInterface->getValue('carriers/flatrate/price');
} }
public function getFullFreeShip()
{
return $this->_scopeConfigInterface->getValue('carriers/freeshipping/free_shipping_subtotal');
}
/** /**
* Get base url for block. * Get base url for block.
* *
......
app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
...@@ -235,7 +235,12 @@ define([ ...@@ -235,7 +235,12 @@ define([
quote.shippingMethod()['carrier_code'] + '_' + quote.shippingMethod()['method_code'] : quote.shippingMethod()['carrier_code'] + '_' + quote.shippingMethod()['method_code'] :
null; null;
}), }),
is_mobile: function(){
return window.matchMedia("(pointer:coarse)").matches;
},
full_free_ship: function(){
return window.checkoutConfig.full_free_ship;
},
/** /**
* @param {Object} shippingMethod * @param {Object} shippingMethod
* @return {Boolean} * @return {Boolean}
......
app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html
...@@ -4,19 +4,21 @@ ...@@ -4,19 +4,21 @@
* See COPYING.txt for license details. * See COPYING.txt for license details.
*/ */
--> -->
<!-- ko ifnot: $parent.is_mobile() -->
<tr class="row" <tr class="row"
click="element.selectShippingMethod"> click="element.selectShippingMethod">
<td class="col col-method" colspan="4">
<div class="method-content">
<div class="method-title">
<!-- ko if: $parent.rates().length == 1 --> <!-- ko if: $parent.rates().length == 1 -->
<td class="col col-method">
<input type="radio" <input type="radio"
class="radio" class="radio"
ifnot="method.error_message" ifnot="method.error_message"
attr="'aria-labelledby': 'label_method_' + method.method_code + '_' + method.carrier_code + ' ' + 'label_carrier_' + method.method_code + '_' + method.carrier_code, attr="'aria-labelledby': 'label_method_' + method.method_code + '_' + method.carrier_code + ' ' + 'label_carrier_' + method.method_code + '_' + method.carrier_code,
'checked': element.rates().length == 1" /> 'checked': element.rates().length == 1" />
</td>
<!-- /ko --> <!-- /ko -->
<!-- ko if: $parent.rates().length > 1 --> <!-- ko if: $parent.rates().length > 1 -->
<td class="col col-method">
<input type="radio" <input type="radio"
class="radio" class="radio"
ifnot="method.error_message" ifnot="method.error_message"
...@@ -24,20 +26,111 @@ ...@@ -24,20 +26,111 @@
ko-value="method.carrier_code + '_' + method.method_code" ko-value="method.carrier_code + '_' + method.method_code"
attr="'aria-labelledby': 'label_method_' + method.method_code + '_' + method.carrier_code + ' ' + 'label_carrier_' + method.method_code + '_' + method.carrier_code, attr="'aria-labelledby': 'label_method_' + method.method_code + '_' + method.carrier_code + ' ' + 'label_carrier_' + method.method_code + '_' + method.carrier_code,
'checked': element.isSelected" /> 'checked': element.isSelected" />
</td>
<!-- /ko --> <!-- /ko -->
<!-- ko ifnot: (method.error_message) --> <!-- ko ifnot: (method.error_message) -->
<td class="col col-price"> <span class="col col-price">
<each args="element.getRegion('price')" render=""></each> <each args="element.getRegion('price')" render=""></each>
</span>
<!-- /ko -->
<span class="col col-method"
attr="'id': 'label_method_' + method.method_code + '_' + method.carrier_code"
text="method.method_title"></span>
<span class="col col-carrier"
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code"
text="method.carrier_title"></span>
</div>
<!-- ko if: (method.amount) -->
<div class="method-msg">
<span class="col col-msg"
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg">
10-15 Working Days - <span class="free-over ff">Free Over <span text="$parent.full_free_ship()"></span></span>
</span>
</div>
<!-- /ko -->
<!-- ko ifnot: (method.amount) -->
<div class="method-msg">
<span class="col col-msg"
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg">
10-15 Working Days</span>
</span>
</div>
<!-- /ko -->
</div>
</td> </td>
</tr>
<!-- /ko -->
<!-- ko if: $parent.is_mobile() -->
<tr class="row"
click="element.selectShippingMethod">
<td class="col col-method" colspan="4">
<div class="method-content">
<div class="method-title">
<!-- ko if: $parent.rates().length == 1 -->
<input type="radio"
class="radio"
ifnot="method.error_message"
attr="'aria-labelledby': 'label_method_' + method.method_code + '_' + method.carrier_code + ' ' + 'label_carrier_' + method.method_code + '_' + method.carrier_code,
'checked': element.rates().length == 1" />
<!-- /ko --> <!-- /ko -->
<td class="col col-method" <!-- ko if: $parent.rates().length > 1 -->
<input type="radio"
class="radio"
ifnot="method.error_message"
ko-checked="element.isSelected"
ko-value="method.carrier_code + '_' + method.method_code"
attr="'aria-labelledby': 'label_method_' + method.method_code + '_' + method.carrier_code + ' ' + 'label_carrier_' + method.method_code + '_' + method.carrier_code,
'checked': element.isSelected" />
<!-- /ko -->
<!-- ko ifnot: (method.error_message) -->
<span class="col col-price">
<each args="element.getRegion('price')" render=""></each>
</span>
<!-- /ko -->
<span class="col col-method"
attr="'id': 'label_method_' + method.method_code + '_' + method.carrier_code" attr="'id': 'label_method_' + method.method_code + '_' + method.carrier_code"
text="method.method_title"></td> text="method.method_title"></span>
<td class="col col-carrier" <span class="col col-carrier"
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code" attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code"
text="method.carrier_title"></td> text="method.carrier_title"></span>
</div>
<!-- ko if: (method.amount) -->
<div class="method-msg">
<span class="col col-msg"
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg">
10-15 Working Days - <span class="free-over">Free Over <span text="$parent.full_free_ship()"></span></span>
</span>
</div>
<!-- /ko -->
<!-- ko ifnot: (method.amount) -->
<div class="method-msg">
<span class="col col-msg"
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg">
10-15 Working Days</span>
</span>
</div>
<!-- /ko -->
</div>
</td>
</tr> </tr>
<!-- /ko -->
<tr class="row row-error" <tr class="row row-error"
if="method.error_message"> if="method.error_message">
<td class="col col-error" colspan="4"> <td class="col col-error" colspan="4">
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
...@@ -8,7 +8,11 @@ ...@@ -8,7 +8,11 @@
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */ /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
?> ?>
<?php <?php
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$flatraPrice = $block->getFlatratePrice(); $flatraPrice = $block->getFlatratePrice();
$full_free = $block->getFullFreeShip();
$_helper = $objectManager->get('Magento\Framework\Pricing\Helper\Data');
$full_free_ship = $_helper->currency($full_free, true, false);
?> ?>
<style type="text/css"> <style type="text/css">
.payment-method._active{ .payment-method._active{
...@@ -788,6 +792,7 @@ $flatraPrice = $block->getFlatratePrice(); ...@@ -788,6 +792,7 @@ $flatraPrice = $block->getFlatratePrice();
$scriptString = <<<script $scriptString = <<<script
window.checkoutConfig = {$serializedCheckoutConfig}; window.checkoutConfig = {$serializedCheckoutConfig};
window.checkoutConfig.flatrate_price = {$flatraPrice}; window.checkoutConfig.flatrate_price = {$flatraPrice};
window.checkoutConfig.full_free_ship = '{$full_free_ship}';
// Create aliases for customer.js model from customer module // Create aliases for customer.js model from customer module
window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn; window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
window.customerData = window.checkoutConfig.customerData; window.customerData = window.checkoutConfig.customerData;
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -737,6 +737,7 @@ p.shopbycate-title { ...@@ -737,6 +737,7 @@ p.shopbycate-title {
.checkout-cart-index .cart-empty { .checkout-cart-index .cart-empty {
min-height: 300px; min-height: 300px;
} }
.checkout-cart-index .us-icon,.checkout-index-index .us-icon,.checkout-onepage-success .us-icon { .checkout-cart-index .us-icon,.checkout-index-index .us-icon,.checkout-onepage-success .us-icon {
background: url("../images/icons-pc.png"); background: url("../images/icons-pc.png");
background-position-y: -420px; background-position-y: -420px;
...@@ -782,7 +783,28 @@ p.shopbycate-title { ...@@ -782,7 +783,28 @@ p.shopbycate-title {
{ {
border-top:1px solid #ddd; border-top:1px solid #ddd;
} }
.checkout-index-index .col-msg{
font-size: 14px;
color: #777;
}
}
.checkout-index-index .method-content .method-msg{
padding: 5px 0px 5px 2.2rem;
font-size: 13px;
color: #777777;
}
.free-over{
font-size: 16px;
color: #000;
} }
.checkout-index-index #checkout-step-shipping_method .table-checkout-shipping-method .row .col.col-method{
margin:0px 1rem;
padding: 0;
}
.checkout-index-index .method-content{
text-align: left;
}
.no-enabled{ .no-enabled{
color:#cacaca!important; color:#cacaca!important;
} }
...@@ -880,6 +902,11 @@ p.shopbycate-title { ...@@ -880,6 +902,11 @@ p.shopbycate-title {
.checkout-cart-index .cart-container .cart-summary { .checkout-cart-index .cart-container .cart-summary {
margin:0; margin:0;
} }
.checkout-index-index .method-content .method-msg{
padding: 5px 0px 5px 2.2rem;
font-size: 13px;
color: #777777;
}
.checkout-cart-index .cart-container .cart-summary > .title { .checkout-cart-index .cart-container .cart-summary > .title {
padding: 1rem 0px; padding: 1rem 0px;
} }
......
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