diff --git a/override/controllers/OrderDetailController.php b/override/controllers/OrderDetailController.php index c84a6b59..b014e723 100755 --- a/override/controllers/OrderDetailController.php +++ b/override/controllers/OrderDetailController.php @@ -197,6 +197,13 @@ class OrderDetailController extends OrderDetailControllerCore { WHERE o.`id_order` = ' .(int)$order->id . ' ORDER BY `date_add` '); + $numbers2 = Db::getInstance()->ExecuteS(' + SELECT p.* + FROM `'._DB_PREFIX_.'mondialrelay_parcel` p + LEFT JOIN `'._DB_PREFIX_.'order_detail` o ON o.`id_order_detail` = p.`id_order_detail` + WHERE o.`id_order` = ' .(int)$order->id . ' + ORDER BY `date_add` + '); // assign delay to Products if (Module::isInstalled('privatesales_delay')) { @@ -215,6 +222,7 @@ class OrderDetailController extends OrderDetailControllerCore { 'shop_name' => strval(Configuration::get('PS_SHOP_NAME')), 'order' => $order, 'numbers' => $numbers, + 'numbers2' => $numbers2, 'return_allowed' => (int)($order->isReturnable()), 'currency' => new Currency($order->id_currency), 'order_state' => (int)($id_order_state), diff --git a/themes/site/order-detail.tpl b/themes/site/order-detail.tpl index df9042d2..60fc1546 100755 --- a/themes/site/order-detail.tpl +++ b/themes/site/order-detail.tpl @@ -66,7 +66,8 @@ {/if} -{if count($numbers) > 0} +{if count($numbers) > 0 || count($numbers2) > 0} + {if count($numbers) > 0}

{l s='Numero de suivi'}

+ {/if} + {if count($numbers2) > 0} +

{l s='Numero de suivi'}

+ + {/if} {elseif !empty($order->shipping_number)}

{l s='Numero de suivi'}

{l s='Numero de suivi'} {$order->shipping_number} ({l s='Suivre le colis'}) diff --git a/themes/site_mobile/order-detail.tpl b/themes/site_mobile/order-detail.tpl index fb5dc8c9..1e11b8b2 100755 --- a/themes/site_mobile/order-detail.tpl +++ b/themes/site_mobile/order-detail.tpl @@ -115,6 +115,16 @@ {/foreach} {/if} +{if count($numbers2) > 0} +

{l s='Numero de suivi'}

+ +{/if} {*

{l s='Order:'} {l s='#'}{$order->id|string_format:"%06d"}

{if $carrier->id}

{l s='Carrier:'} {if $carrier->name == "0"}{$shop_name|escape:'htmlall':'UTF-8'}{else}{$carrier->name|escape:'htmlall':'UTF-8'}{/if}

{/if}