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

Merge branch 'ticket-10657-PhileaMulti' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-11-18 12:24:54 +01:00
commit 218aac655a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
override/controllers/CartController.php
View File

@ -98,8 +98,7 @@ class CartController extends CartControllerCore
if (((int)$current_sale['delivery_delay'] != 1
&& (int)$adding_sale['id_sale'] != (int)$current_sale['id_sale']
&& (
(int)$current_sale['shipping'] != 1
&& (int)$adding_sale['shipping'] != 1
((int)$current_sale['shipping'] != 1 || (int)$adding_sale['shipping'] != 1)
&& (int)$adding_sale['delivery_delay'] != (int)$current_sale['delivery_delay']
))
|| ((int)$current_sale['delivery_delay'] != 1 && (int)$adding_sale['delivery_delay'] == 1)