From e727f72cdd6c437043f9cc1eaf37b2f2c47fb3a0 Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Tue, 22 Nov 2011 14:41:41 +0000 Subject: [PATCH] // Dont need to set the id_carrier in class Cart --- classes/Cart.php | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/classes/Cart.php b/classes/Cart.php index d9cda702a..7e8dea786 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -168,17 +168,6 @@ class CartCore extends ObjectModel else $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) @@ -1332,7 +1321,6 @@ class CartCore extends ObjectModel $delivery_option_list = array(); $carriers_price = array(); $carrier_collection = array(); - $package_list = $this->getPackageList(); foreach ($package_list as $id_address => $packages) { @@ -1528,11 +1516,14 @@ class CartCore extends ObjectModel private function getIdCarrierFromDeliveryOption($delivery_option) { - $delivery_option_list = $this->getDeliveryOptionList(); + $delivery_option_list = $this->getDeliveryOptionList();die(); foreach ($delivery_option as $key => $value) if (isset($delivery_option_list[$key]) && isset($delivery_option_list[$key][$value])) 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 0; }