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

Merge branch 'ticket-deliveryDelay_cart' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-07-25 12:20:03 +02:00
commit 0ccf7667a6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
override/controllers/OrderController.php
View File

@ -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),
));

6
themes/site/shopping-cart.tpl
View File

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