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

[-] FO : fixed bug #PSCFV-3818

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17193 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vAugagneur
2012-09-05 14:43:43 +00:00
parent d4bbdd7207
commit b9dbf36e34
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Carrier.php
+9 -5
View File
@@ -594,7 +594,7 @@ class CarrierCore extends ObjectModel
public static function checkCarrierZone($id_carrier, $id_zone) public static function checkCarrierZone($id_carrier, $id_zone)
{ {
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
SELECT c.`id_carrier` SELECT c.`id_carrier`
FROM `'._DB_PREFIX_.'carrier` c FROM `'._DB_PREFIX_.'carrier` c
LEFT JOIN `'._DB_PREFIX_.'carrier_zone` cz ON (cz.`id_carrier` = c.`id_carrier`) LEFT JOIN `'._DB_PREFIX_.'carrier_zone` cz ON (cz.`id_carrier` = c.`id_carrier`)
@@ -1156,18 +1156,22 @@ class CarrierCore extends ObjectModel
$query->select('id_carrier'); $query->select('id_carrier');
$query->from('product_carrier', 'pc'); $query->from('product_carrier', 'pc');
$query->innerJoin('carrier', 'c', 'c.id_reference = pc.id_carrier_reference AND c.deleted = 0'); $query->innerJoin('carrier', 'c', 'c.id_reference = pc.id_carrier_reference AND c.deleted = 0');
$query->where('id_product = '.(int)$product->id); $query->where('pc.id_product = '.(int)$product->id);
$query->where('id_shop = '.(int)$id_shop); $query->where('pc.id_shop = '.(int)$id_shop);
$carriers = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); $carriers = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
if (!empty($carriers)) if (!empty($carriers))
{ {
//the product is linked with carriers
$carrier_list = array(); $carrier_list = array();
foreach ($carriers as $carrier) foreach ($carriers as $carrier) //check if the linked carriers are available in current zone
if (Carrier::checkCarrierZone($carrier['id_carrier'], $id_zone)) if (Carrier::checkCarrierZone($carrier['id_carrier'], $id_zone))
$carrier_list[] = $carrier['id_carrier']; $carrier_list[] = $carrier['id_carrier'];
if (!empty($carrier_list)) if (!empty($carrier_list))
return $carrier_list; return $carrier_list;
else
return array();//no linked carrier are available for this zone
} }
$carrier_list = array(); $carrier_list = array();