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

// Fixed revision 13573

Browse Source
This commit is contained in:
bMancone
2012-02-28 13:26:55 +00:00
parent 8d6b475e71
commit 66b55872cd
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminWarehousesController.php
+1 -1
View File
@@ -215,11 +215,11 @@ class AdminWarehousesControllerCore extends AdminController
'label' => $this->l('Country:'), 'label' => $this->l('Country:'),
'name' => 'id_country', 'name' => 'id_country',
'required' => true, 'required' => true,
'default_value' => (int)$this->context->country->id,
'options' => array( 'options' => array(
'query' => Country::getCountries($this->context->language->id, false), 'query' => Country::getCountries($this->context->language->id, false),
'id' => 'id_country', 'id' => 'id_country',
'name' => 'name', 'name' => 'name',
'preselect_country' => true,
), ),
'desc' => $this->l('Country where the state, region or city is located') 'desc' => $this->l('Country where the state, region or city is located')
), ),
controllers/front/OrderController.php
+9 -1
View File
@@ -98,6 +98,7 @@ class OrderControllerCore extends ParentOrderController
$delivery_option = $this->context->cart->getDeliveryOption(); $delivery_option = $this->context->cart->getDeliveryOption();
$delivery_option[(int)Tools::getValue('id_address')] = Tools::getValue('id_delivery_option'); $delivery_option[(int)Tools::getValue('id_address')] = Tools::getValue('id_delivery_option');
$this->context->cart->setDeliveryOption($delivery_option); $this->context->cart->setDeliveryOption($delivery_option);
$this->context->cart->save();
$return = array( $return = array(
'content' => Hook::exec( 'content' => Hook::exec(
'displayCarrierList', 'displayCarrierList',
@@ -141,11 +142,18 @@ class OrderControllerCore extends ParentOrderController
break; break;
case 3: case 3:
// Test that the conditions (so active) were accepted by the customer // Check that the conditions (so active) were accepted by the customer
$cgv = Tools::getValue('cgv'); $cgv = Tools::getValue('cgv');
if (Configuration::get('PS_CONDITIONS') && (!Validate::isBool($cgv) || $cgv == false)) if (Configuration::get('PS_CONDITIONS') && (!Validate::isBool($cgv) || $cgv == false))
Tools::redirect('index.php?controller=order&step=2'); Tools::redirect('index.php?controller=order&step=2');
// Check the delivery option is setted
if (!Tools::getValue('delivery_option'))
Tools::redirect('index.php?controller=order&step=2');
foreach (Tools::getValue('delivery_option') as $delivery_option)
if (empty($delivery_option))
Tools::redirect('index.php?controller=order&step=2');
$this->autoStep(); $this->autoStep();
// Bypass payment step if total is 0 // Bypass payment step if total is 0
install-dev/install_version.php
+1 -1
View File
@@ -25,4 +25,4 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
define('_PS_INSTALL_VERSION_', '1.5.0.6'); define('_PS_INSTALL_VERSION_', '1.5.0.7');