From 08023b4bc3c90ef9e8de825d696c1fd3fda2ebc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 28 May 2013 17:41:20 +0200 Subject: [PATCH] [-] FO: Fix Carrier::getDeliveredCountries for multishop #PSCFV-9279 --- classes/Carrier.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/Carrier.php b/classes/Carrier.php index f7a49f1b1..df7208dba 100644 --- a/classes/Carrier.php +++ b/classes/Carrier.php @@ -467,7 +467,9 @@ class CarrierCore extends ObjectModel ORDER BY s.`name` ASC'); $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' - SELECT cl.*,c.*, cl.`name` AS country, zz.`name` AS zone FROM `'._DB_PREFIX_.'country` c + SELECT cl.*,c.*, cl.`name` AS country, zz.`name` AS zone + FROM `'._DB_PREFIX_.'country` c'. + Shop::addSqlAssociation('country', 'c').' LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (c.`id_country` = cl.`id_country` AND cl.`id_lang` = '.(int)$id_lang.') INNER JOIN (`'._DB_PREFIX_.'carrier_zone` cz INNER JOIN `'._DB_PREFIX_.'carrier` cr ON ( cr.id_carrier = cz.id_carrier AND cr.deleted = 0 '. ($active_carriers ? 'AND cr.active = 1) ' : ') ').'