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

[-] FO : Fix the group/zone/shop restriction on carriers when using advanced stock management

Browse Source
This commit is contained in:
rGaillard
2012-11-08 15:29:13 +00:00
parent f875baf138
commit d00826eabb
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Carrier.php
+11 -9
View File
@@ -1182,17 +1182,19 @@ class CarrierCore extends ObjectModel
if ($id_warehouse) if ($id_warehouse)
{ {
$warehouse = new Warehouse($id_warehouse); $warehouse = new Warehouse($id_warehouse);
$carrier_list = $warehouse->getCarriers(); $warehouse_carrier_list = $warehouse->getCarriers();
} }
if (empty($carrier_list)) // No carriers defined, get all available carriers $available_carrier_list = array();
{ $customer = new Customer($cart->id_customer);
$carrier_list = array(); $carriers = Carrier::getCarriersForOrder($id_zone, $customer->getGroups(), $cart);
$customer = new Customer($cart->id_customer); foreach ($carriers as $carrier)
$carriers = Carrier::getCarriersForOrder($id_zone, $customer->getGroups(), $cart); $available_carrier_list[] = $carrier['id_carrier'];
foreach ($carriers as $carrier)
$carrier_list[] = $carrier['id_carrier']; if (empty($warehouse_carrier_list))
} $carrier_list = $available_carrier_list;
else
$carrier_list = array_intersect($warehouse_carrier_list, $available_carrier_list);
if ($product->width > 0 || $product->height > 0 || $product->depth > 0 || $product->weight > 0) if ($product->width > 0 || $product->height > 0 || $product->depth > 0 || $product->weight > 0)
{ {