From 793cdb720cc5f5f69c81d2f8ba7ecae84807b0ab Mon Sep 17 00:00:00 2001 From: rGaillard Date: Wed, 1 Aug 2012 12:11:48 +0000 Subject: [PATCH] // Small fix git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16644 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminCartsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index e6d475d2b..3fe25d9c4 100755 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -215,7 +215,7 @@ class AdminCartsControllerCore extends AdminController $this->context->cart->id_address_delivery = $addresses[0]['id_address']; elseif ($id_address_delivery) $this->context->cart->id_address_delivery = (int)$id_address_delivery; - + $this->context->cart->setNoMultishipping(); $this->context->cart->save(); $currency = new Currency((int)$this->context->cart->id_currency); $this->context->currency = $currency; @@ -577,7 +577,7 @@ class AdminCartsControllerCore extends AdminController { $delivery_option_list_formated = array(); $delivery_option_list = $this->context->cart->getDeliveryOptionList(); - + if (!count($delivery_option_list)) return array();