dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Delivery option are now auto-selected in the checkout

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10572 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2011-11-23 17:21:30 +00:00
parent ba7ec2dd9d
commit 3989b708c8
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/OrderController.php
-2
View File
@@ -196,8 +196,6 @@ class OrderControllerCore extends ParentOrderController
unset($this->context->cart->id_address_invoice); unset($this->context->cart->id_address_invoice);
Tools::redirect('index.php?controller=order&step=1'); Tools::redirect('index.php?controller=order&step=1');
} }
else if ($this->step >= 3 && !$this->context->cart->delivery_option && !$isVirtualCart)
Tools::redirect('index.php?controller=order&step=2');
} }
/* /*
controllers/front/OrderOpcController.php
+3 -2
View File
@@ -71,7 +71,8 @@ class OrderOpcControllerCore extends ParentOrderController
$return = array( $return = array(
'summary' => $this->context->cart->getSummaryDetails(), 'summary' => $this->context->cart->getSummaryDetails(),
'HOOK_TOP_PAYMENT' => Hook::exec('paymentTop'), 'HOOK_TOP_PAYMENT' => Hook::exec('paymentTop'),
'HOOK_PAYMENT' => $this->_getPaymentMethods() 'HOOK_PAYMENT' => $this->_getPaymentMethods(),
'carrier_data' => $this->_getCarrierList(),
); );
die(Tools::jsonEncode($return)); die(Tools::jsonEncode($return));
} }
@@ -236,7 +237,7 @@ class OrderOpcControllerCore extends ParentOrderController
} }
} }
else else
throw new PrestashopException('Method is not defined'.Tools::isSubmit('method')); throw new PrestashopException('Method is not defined');
} }
} }
elseif (Tools::isSubmit('ajax')) elseif (Tools::isSubmit('ajax'))
themes/prestashop/js/order-opc.js
+1
View File
@@ -169,6 +169,7 @@ function updateCarrierSelectionAndGift()
updatePaymentMethods(jsonData); updatePaymentMethods(jsonData);
updateHookShoppingCart(jsonData.summary.HOOK_SHOPPING_CART); updateHookShoppingCart(jsonData.summary.HOOK_SHOPPING_CART);
updateHookShoppingCartExtra(jsonData.summary.HOOK_SHOPPING_CART_EXTRA); updateHookShoppingCartExtra(jsonData.summary.HOOK_SHOPPING_CART_EXTRA);
updateCarrierList(json.carrier_data);
$('#opc_payment_methods-overlay').fadeOut('slow'); $('#opc_payment_methods-overlay').fadeOut('slow');
$('#opc_delivery_methods-overlay').fadeOut('slow'); $('#opc_delivery_methods-overlay').fadeOut('slow');
} }
themes/prestashop/order-carrier.tpl
+1 -1
View File
@@ -119,7 +119,7 @@
<div class="delivery_options"> <div class="delivery_options">
{foreach $option_list as $key => $option} {foreach $option_list as $key => $option}
<div class="delivery_option {if ($option@index % 2)}alternate_{/if}item"> <div class="delivery_option {if ($option@index % 2)}alternate_{/if}item">
<input class="delivery_option_radio" type="radio" name="delivery_option[{$id_address}]" {if $opc}onclick="updateCarrierSelectionAndGift();"{/if} id="delivery_option_{$id_address}_{$option@index}" value="{$key}" /> <input class="delivery_option_radio" type="radio" name="delivery_option[{$id_address}]" {if $opc}onclick="updateCarrierSelectionAndGift();"{/if} id="delivery_option_{$id_address}_{$option@index}" value="{$key}" {if $delivery_option[$id_address] == $key}selected="selected"{/if} />
<label for="delivery_option_{$id_address}_{$option@index}"> <label for="delivery_option_{$id_address}_{$option@index}">
<table class="resume"> <table class="resume">
<tr> <tr>