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

// Autoset id_carrier on the cart constructor + Replace a hookExec()

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10420 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2011-11-22 14:09:52 +00:00
parent 3f649efee7
commit da416dea61
4 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/ParentOrderController.php
+9 -3
View File
@@ -218,7 +218,7 @@ class ParentOrderControllerCore extends FrontController
$id_zone = Country::getIdZone((int)Configuration::get('PS_COUNTRY_DEFAULT'));
if (Tools::getIsset('delivery_option') && $this->validateDeliveryOption(Tools::getValue('delivery_option')))
$this->context->cart->delivery_option = serialize(Tools::getValue('delivery_option'));
$this->context->cart->setDeliveryOption(Tools::getValue('delivery_option'));
Hook::exec('processCarrier', array('cart' => $this->context->cart));
@@ -435,7 +435,7 @@ class ParentOrderControllerCore extends FrontController
*/
protected function setNoCarrier()
{
$this->context->cart->delivery_option = 0;
$this->context->cart->setDeliveryOption(null);
$this->context->cart->update();
}
@@ -445,6 +445,9 @@ class ParentOrderControllerCore extends FrontController
* @todo this function must be modified - id_carrier is now delivery_option
*
* @param array $carriers
*
* @deprecated since 1.5.0
*
* @return number the id of the default carrier
*/
protected function setDefaultCarrierSelection($carriers)
@@ -467,7 +470,7 @@ class ParentOrderControllerCore extends FrontController
$this->context->cart->id_carrier = (int)$carriers[0]['id_carrier'];
}
else
$this->context->cart->id_carrier = 0;
$this->context->cart->setDeliveryOption(null);
if ($this->context->cart->update())
return $this->context->cart->id_carrier;
return 0;
@@ -477,6 +480,9 @@ class ParentOrderControllerCore extends FrontController
* Decides what the default carrier is and update the cart with it
*
* @param array $carriers
*
* @deprecated since 1.5.0
*
* @return number the id of the default carrier
*/
protected function _setDefaultCarrierSelection($carriers)