diff --git a/override/controllers/OrderController.php b/override/controllers/OrderController.php index 22a5d8ff..8ab675f3 100755 --- a/override/controllers/OrderController.php +++ b/override/controllers/OrderController.php @@ -12,7 +12,7 @@ class OrderController extends OrderControllerCore { $delays = array_keys($products_delay); $date = new DateTime(); - $delivery_date = SaleDelay::getDeliveryDate($delays, null, $date); + $delivery_date = SaleDelay::getDeliveryDate($delays, null, $date, true); self::$smarty->assign(array( 'delivery_date' => (!empty($delivery_date)?$delivery_date:null), )); diff --git a/themes/site/shopping-cart.tpl b/themes/site/shopping-cart.tpl index 1fd22033..5832b2ca 100755 --- a/themes/site/shopping-cart.tpl +++ b/themes/site/shopping-cart.tpl @@ -222,10 +222,14 @@

{$details.title} {if isset($delivery_date)} {foreach from=$delivery_date item=date key=key} - {if $k == $key} + {if $k==1 && $k==$key} - {l s='Date de réception prévue entre le'} {$date.date_start|date_format:'%d/%m/%Y'} {l s='et le'} {$date.date_end|date_format:'%d/%m/%Y'} + {elseif $k==5 && $k==$key} + + - {l s='Livraison prévue avant le'} {l s='24/12'} + {/if} {/foreach} {/if}