Skip to content

J
joshine
Commit 49049e5a by lmf
Options

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

parents d9ac00ba 67772c92
Showing with 70 additions and 6 deletions
app/code/Joshine/Category/Block/Html/Topmenu.php
...@@ -70,6 +70,10 @@ class Topmenu extends JoshineMenu ...@@ -70,6 +70,10 @@ class Topmenu extends JoshineMenu
$classes[] = 'category-item'; $classes[] = 'category-item';
} }
if ($item->getLevel() == 0 ) {
$classes[] = 'level-top';
}
if ($item->getIsFirst()) { if ($item->getIsFirst()) {
$classes[] = 'first'; $classes[] = 'first';
} }
......
app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html
...@@ -6,6 +6,16 @@ ...@@ -6,6 +6,16 @@
--> -->
<tr class="row" <tr class="row"
click="element.selectShippingMethod"> click="element.selectShippingMethod">
<!-- ko if: $parent.rates().length == 1 -->
<td class="col col-method">
<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" />
</td>
<!-- /ko -->
<!-- ko if: $parent.rates().length > 1 -->
<td class="col col-method"> <td class="col col-method">
<input type="radio" <input type="radio"
class="radio" class="radio"
...@@ -13,8 +23,9 @@ ...@@ -13,8 +23,9 @@
ko-checked="element.isSelected" ko-checked="element.isSelected"
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.rates().length == 1 || element.isSelected" /> 'checked': element.isSelected" />
</td> </td>
<!-- /ko -->
<!-- ko ifnot: (method.error_message) --> <!-- ko ifnot: (method.error_message) -->
<td class="col col-price"> <td class="col col-price">
<each args="element.getRegion('price')" render=""></each> <each args="element.getRegion('price')" render=""></each>
......
app/code/Rokanthemes/OnePageCheckout/view/frontend/web/js/action/update-item.js
...@@ -13,7 +13,10 @@ define([ ...@@ -13,7 +13,10 @@ define([
'Magento_Checkout/js/model/payment-service', 'Magento_Checkout/js/model/payment-service',
'Rokanthemes_OnePageCheckout/js/model/update-item-service', 'Rokanthemes_OnePageCheckout/js/model/update-item-service',
'Magento_Ui/js/model/messageList', 'Magento_Ui/js/model/messageList',
'Magento_Checkout/js/action/get-totals' 'Magento_Checkout/js/action/get-totals',
'Magento_Checkout/js/action/select-shipping-method',
'Magento_Checkout/js/checkout-data',
'Rokanthemes_OnePageCheckout/js/model/shipping-save-processor'
], function ( ], function (
$, $,
_, _,
...@@ -29,7 +32,10 @@ define([ ...@@ -29,7 +32,10 @@ define([
paymentServiceDefault, paymentServiceDefault,
updateItemService, updateItemService,
globalMessageList, globalMessageList,
getTotalsAction getTotalsAction,
selectShippingMethodAction,
checkoutData,
shippingSaveProcessor
) { ) {
'use strict'; 'use strict';
...@@ -61,8 +67,31 @@ define([ ...@@ -61,8 +67,31 @@ define([
if (response.status) { if (response.status) {
globalMessageList.addSuccessMessage(response); globalMessageList.addSuccessMessage(response);
updateItemService.hasUpdateResult(true); updateItemService.hasUpdateResult(true);
shippingService.setShippingRates(response.shipping_methods); //shippingService.setShippingRates(response.shipping_methods);
paymentServiceDefault.setPaymentMethods(methodConverter(response.payment_methods)); paymentServiceDefault.setPaymentMethods(methodConverter(response.payment_methods));
var sh = response.shipping_methods;
var new_sh = [];
if(sh.length > 1)
{
for(var i=0;i<sh.length;i++)
{
if(sh[i].amount == 0)
{
selectShippingMethodAction(sh[i]);
checkoutData.setSelectedShippingRate(sh[i]['carrier_code'] + '_' + sh[i]['method_code']);
quote.shippingMethod(sh[i]);
new_sh.push(sh[i]);
}
}
}
else if(sh.length === 1)
{
selectShippingMethodAction(sh[0]);
quote.shippingMethod(sh[0]);
new_sh.push(sh[0]);
}
shippingService.setShippingRates(new_sh);
updateItemService.hasUpdateResult(false); updateItemService.hasUpdateResult(false);
response.totals.coupon_code ? paymentService.isAppliedCoupon(true) : paymentService.isAppliedCoupon(false); response.totals.coupon_code ? paymentService.isAppliedCoupon(true) : paymentService.isAppliedCoupon(false);
var deferred = $.Deferred(); var deferred = $.Deferred();
...@@ -70,7 +99,7 @@ define([ ...@@ -70,7 +99,7 @@ define([
$('.items-in-cart').find('[data-bind="text: getCartSummaryItemsCount()"]') $('.items-in-cart').find('[data-bind="text: getCartSummaryItemsCount()"]')
.text(response['totals']['items_qty']); .text(response['totals']['items_qty']);
shippingSaveProcessor.saveShippingInformation(quote.shippingAddress().getType());
} else { } else {
globalMessageList.addErrorMessage(response); globalMessageList.addErrorMessage(response);
} }
......
app/code/Rokanthemes/OnePageCheckout/view/frontend/web/js/model/shipping-rate-processor/new-address.js
...@@ -39,8 +39,24 @@ define([ ...@@ -39,8 +39,24 @@ define([
return storage.post( return storage.post(
serviceUrl, payload, false serviceUrl, payload, false
).done(function (result) { ).done(function (result) {
var new_sh = [];
if(result.length > 1)
{
for(var i=0;i<result.length;i++)
{
if(result[i].amount == 0)
{
new_sh.push(result[i]);
}
}
}
else if(result.length === 1)
{
new_sh.push(result[0]);
}
rateRegistry.set(address.getCacheKey(), result); rateRegistry.set(address.getCacheKey(), result);
shippingService.setShippingRates(result); shippingService.setShippingRates(new_sh);
}).fail(function (response) { }).fail(function (response) {
shippingService.setShippingRates([]); shippingService.setShippingRates([]);
errorProcessor.process(response); errorProcessor.process(response);
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -733,6 +733,10 @@ p.shopbycate-title { ...@@ -733,6 +733,10 @@ p.shopbycate-title {
.checkout-cart-index .col.qty{ .checkout-cart-index .col.qty{
text-align: center; text-align: center;
} }
.checkout-cart-index .cart-container table tr.item-actions:last-child {
border-bottom: 0;
}
@media (min-width: 1024px){ @media (min-width: 1024px){
.cart.item .item-info td.col.item { .cart.item .item-info td.col.item {
width: 50%; width: 50%;
......
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