Merge branch 'ticket-deliveryDelay_product' into develop

This commit is contained in:
Marion Muszynski 2016-07-25 12:48:41 +02:00
commit 2b47a5c932

View File

@ -186,7 +186,7 @@ class OrderDetailController extends OrderDetailControllerCore {
$delays = array_keys($products);
$date = new DateTime($order->date_add);
$delivery_date = SaleDelay::getDeliveryDate($delays, null, $date);
$delivery_date = SaleDelay::getDeliveryDate($delays, null, $date, true);
}
self::$smarty->assign(array(