Merge branch 'ticket-modifNameCarrierEs' into develop

This commit is contained in:
Marion Muszynski 2016-07-29 13:42:16 +02:00
commit 78c68346c6

View File

@ -63,11 +63,15 @@ class BlockOrderSummary extends Module {
$order_address = nl2br(AddressFormat::generateAddress(new Address((int) $cart->id_address_delivery)));
}
$carrier_name = Db::getInstance()->getValue('
SELECT `name`
FROM `'._DB_PREFIX_.'carrier`
WHERE `id_carrier` = '.(int) $cart->id_carrier.'
');
if ($cookie->id_lang == 3 && (int)$cart->id_carrier == 87) {
$carrier_name = "SEUR a domicilio";
} else {
$carrier_name = Db::getInstance()->getValue('
SELECT `name`
FROM `'._DB_PREFIX_.'carrier`
WHERE `id_carrier` = '.(int) $cart->id_carrier.'
');
}
$products_keys = array();
$products_delays = array();