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

// Dont need to set the id_carrier in class Cart

Browse Source
This commit is contained in:
mDeflotte
2011-11-22 14:41:41 +00:00
parent 6372854e98
commit e727f72cdd
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+4 -13
View File
@@ -168,17 +168,6 @@ class CartCore extends ObjectModel
else else
$this->_taxCalculationMethod = Group::getDefaultPriceDisplayMethod(); $this->_taxCalculationMethod = Group::getDefaultPriceDisplayMethod();
// id_carrier is not setted since 1.5.0
// Need to set it virtualy by using the delivery_option_list
if (!empty($this->delivery_option))
{
$delivery_option = unserialize($this->delivery_option);
if (count($delivery_option) == 1)
{
$delivery_option_list = $this->getDeliveryOptionList();
$this->id_carrier = $this->getIdCarrierFromDeliveryOption($delivery_option);
}
}
} }
public function add($autodate = true, $nullValues = false) public function add($autodate = true, $nullValues = false)
@@ -1332,7 +1321,6 @@ class CartCore extends ObjectModel
$delivery_option_list = array(); $delivery_option_list = array();
$carriers_price = array(); $carriers_price = array();
$carrier_collection = array(); $carrier_collection = array();
$package_list = $this->getPackageList(); $package_list = $this->getPackageList();
foreach ($package_list as $id_address => $packages) foreach ($package_list as $id_address => $packages)
{ {
@@ -1528,11 +1516,14 @@ class CartCore extends ObjectModel
private function getIdCarrierFromDeliveryOption($delivery_option) private function getIdCarrierFromDeliveryOption($delivery_option)
{ {
$delivery_option_list = $this->getDeliveryOptionList(); $delivery_option_list = $this->getDeliveryOptionList();die();
foreach ($delivery_option as $key => $value) foreach ($delivery_option as $key => $value)
if (isset($delivery_option_list[$key]) && isset($delivery_option_list[$key][$value])) if (isset($delivery_option_list[$key]) && isset($delivery_option_list[$key][$value]))
if (count($delivery_option_list[$key][$value]['carrier_list']) == 1) if (count($delivery_option_list[$key][$value]['carrier_list']) == 1)
{
elog($delivery_option_list[$key][$value]['carrier_list']);
return $delivery_option_list[$key][$value]['carrier_list'][0]; return $delivery_option_list[$key][$value]['carrier_list'][0];
}
return 0; return 0;
} }