// BugFix with opc and multishipping

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10330 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2011-11-21 10:42:14 +00:00
parent f09017dc73
commit 0ce1e22813
14 changed files with 156 additions and 154 deletions
+7 -1
View File
@@ -119,9 +119,15 @@ abstract class PaymentModuleCore extends Module
$delivery_option_list = $cart->getDeliveryOptionList();
$package_list = $cart->getPackageList();
$cart_delivery_option = unserialize($cart->delivery_option);
// If some delivery options are not defined, or not valid, use the first valid option
foreach ($delivery_option_list as $id_address => $package)
if (!isset($cart_delivery_option[$id_address]) || !array_key_exists($cart_delivery_option[$id_address], $package))
die('Error: delivery option for some addresses is not defined');
foreach ($package as $key => $val)
{
$cart_delivery_option[$id_address] = $key;
break;
}
$order_list = array();
$order_detail_list = array();