antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-11985-MondialRelay_part2' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-01-20 10:48:52 +01:00
commit 876417e78e
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/logistics/AdminLogistics.php
View File

@ -549,7 +549,6 @@ class AdminLogistics extends AdminTab {
req = $.get("'.__PS_BASE_URI__.'modules/logistics/ajax.php?id_employee='.(int) $cookie->id_employee.'&token='.Tools::getValue('token').'&id_order=" + id_order, function(loaded) {
if(loaded) {
var loaded = $.parseJSON(loaded);
isRelay = $.inArray(parseInt(loaded.delivery_address.id_country), [1, 2, 3, 6, 10, 12, 13, 17, 26, 40, 148, 245]) != -1? 0: (loaded.delivery_infos_laposte? (loaded.delivery_infos_laposte.delivery_mode != \'DOM\'? 1: 0): (loaded.delivery_infos_exapaq? 2: 0));
isRelay = $.inArray(parseInt(loaded.delivery_address.id_country), [1, 2, 3, 6, 10, 12, 13, 17, 26, 40, 148, 245]) != -1
? 0
: (loaded.delivery_infos_laposte

17
modules/logistics/ajax.php
View File

@ -74,15 +74,20 @@ if(($id_order = (int) Tools::getValue('id_order'))
$delivery_infos_mr = Db::getInstance()->getRow('
SELECT mr_s.*, mr_m.*, cl.`name` AS `country_name`
FROM `'._DB_PREFIX_.'mr_selected` mr_s
LEFT JOIN `'._DB_PREFIX_.'country` c
ON mr_s.`MR_Selected_Pays` = c.`iso_code`
LEFT JOIN `'._DB_PREFIX_.'mr_method` mr_m
ON mr_m.`id_mr_method` = mr_s.`id_method`
LEFT JOIN `'._DB_PREFIX_.'country_lang` cl
ON c.`id_country` = cl.`id_country`
LEFT JOIN `'._DB_PREFIX_.'country` c ON (mr_s.`MR_Selected_Pays` = c.`iso_code`)
LEFT JOIN `'._DB_PREFIX_.'mr_method` mr_m ON (mr_m.`id_mr_method` = mr_s.`id_method`)
LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (c.`id_country` = cl.`id_country`)
WHERE mr_s.`id_cart` = '.(int) $order->id_cart.'
AND cl.`id_lang` = 2
');
if(!$delivery_infos_mr || empty($delivery_infos_mr)) {
$delivery_infos_mr = Db::getInstance()->getRow('
SELECT *
FROM `'._DB_PREFIX_.'mr_selected` s
INNER JOIN `'._DB_PREFIX_.'mr_method` m ON (m.`id_mr_method` = s.`id_method`)
WHERE s.`id_cart` = '.(int) $order->id_cart.'
');
}
// $delivery_infos_laposte = FALSE;
}