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

Merge branch 'ticket-14161-UncombinableSale' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-09-18 11:51:38 +02:00
commit 9ec62bab45
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
override/controllers/CartController.php
View File

@ -82,7 +82,7 @@ class CartController extends CartControllerCore
if (!empty($current_sale)) { if (!empty($current_sale)) {
global $smarty; global $smarty;
$current_delay_name = SaleDelay::getDelayFrontSmallName($current_sale['delivery_delay'], self::$cookie->id_lang); $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)){ if ((int)$current_sale['delivery_delay'] == 1 && !Sale::isCombinable($current_sale,$adding_sale)){
// Product in cart comes from classic delivery sale // Product in cart comes from classic delivery sale
if (Tools::getValue('ajax') == 'true') { if (Tools::getValue('ajax') == 'true') {