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-21 15:27:04 +01:00
commit 1d6e27dd40
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
override/controllers/CartController.php
View File

@ -107,7 +107,12 @@ class CartController extends CartControllerCore
|| ((int)$current_sale['shipping'] == 1 && (int)$adding_sale['shipping'] != 1)
)
) || (
(int)$current_sale['delivery_delay'] != 1 && (int)$adding_sale['delivery_delay'] == 1
((int)$current_sale['delivery_delay'] != 1 && (int)$adding_sale['delivery_delay'] == 1)
|| (
(int)$current_sale['delivery_delay'] == 1
&& (int)$adding_sale['delivery_delay'] == 1
&& (int)$current_sale['shipping'] != (int)$adding_sale['shipping']
)
) || (
((int)$current_sale['delivery_delay'] != 5 && (int)$adding_sale['delivery_delay'] == 5)
|| ((int)$current_sale['delivery_delay'] == 5 && (int)$adding_sale['delivery_delay'] != 5)