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 12:56:37 +01:00
commit 63fcc839e3
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
override/controllers/CartController.php
View File

@ -104,6 +104,7 @@ class CartController extends CartControllerCore
&& (int)$adding_sale['delivery_delay'] != (int)$current_sale['delivery_delay'] && (int)$adding_sale['delivery_delay'] != (int)$current_sale['delivery_delay']
) )
|| ((int)$current_sale['shipping'] != 1 && (int)$adding_sale['shipping'] == 1) || ((int)$current_sale['shipping'] != 1 && (int)$adding_sale['shipping'] == 1)
|| ((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