Merge branch 'ticket-14161-UncombinableSale' into develop
This commit is contained in:
commit
9ec62bab45
@ -82,7 +82,7 @@ class CartController extends CartControllerCore
|
||||
if (!empty($current_sale)) {
|
||||
global $smarty;
|
||||
$current_delay_name = SaleDelay::getDelayFrontSmallName($current_sale['delivery_delay'], self::$cookie->id_lang);
|
||||
$adding_delay_name = SaleDelay::getDelayFrontSmallName($adding_sale['delivery_delay'], self::$cookie->id_lang));
|
||||
$adding_delay_name = SaleDelay::getDelayFrontSmallName($adding_sale['delivery_delay'], self::$cookie->id_lang);
|
||||
if ((int)$current_sale['delivery_delay'] == 1 && !Sale::isCombinable($current_sale,$adding_sale)){
|
||||
// Product in cart comes from classic delivery sale
|
||||
if (Tools::getValue('ajax') == 'true') {
|
||||
|
Loading…
Reference in New Issue
Block a user