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:45:36 +01:00
commit 894de500bc
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
override/controllers/CartController.php
View File

@ -99,12 +99,17 @@ class CartController extends CartControllerCore
((int)$current_sale['delivery_delay'] != 1 && (int)$current_sale['delivery_delay'] != 5)
&& (int)$adding_sale['id_sale'] != (int)$current_sale['id_sale']
&& (
((int)$current_sale['shipping'] != 1 || (int)$adding_sale['shipping'] != 1)
&& (int)$adding_sale['delivery_delay'] != (int)$current_sale['delivery_delay']
(
((int)$current_sale['shipping'] == 1 && (int)$current_sale['shipping'] == (int)$adding_sale['shipping'])
&& (int)$adding_sale['delivery_delay'] != (int)$current_sale['delivery_delay']
)
|| ((int)$current_sale['shipping'] != 1 && (int)$adding_sale['shipping'] == 1)
)
) || (
((int)$current_sale['delivery_delay'] != 1 && (int)$current_sale['delivery_delay'] != 5)
&& ((int)$adding_sale['delivery_delay'] == 1 || (int)$adding_sale['delivery_delay'] == 5)
(int)$current_sale['delivery_delay'] != 1 && (int)$adding_sale['delivery_delay'] == 1
) || (
((int)$current_sale['delivery_delay'] != 5 && (int)$adding_sale['delivery_delay'] == 5)
|| ((int)$current_sale['delivery_delay'] == 5 && (int)$adding_sale['delivery_delay'] != 5)
)) {
// Product in cart comes from special delivery sale - only products from the same sale can be added
if (Tools::getValue('ajax') == 'true') {
@ -112,10 +117,7 @@ class CartController extends CartControllerCore
} else {
$this->errors[] = Tools::displayError('Sorry your cart already contains products from a sale shipped within a special period. To continue, please confirm your order or empty your cart.', false);
}
} elseif (
((int)$current_sale['delivery_delay'] == 1 || (int)$current_sale['delivery_delay'] == 5)
&& ((int)$adding_sale['delivery_delay'] != 1 && (int)$adding_sale['delivery_delay'] != 5)
) {
} elseif ((int)$current_sale['delivery_delay'] == 1 && (int)$adding_sale['delivery_delay'] != 1) {
// Product in cart comes from classic delivery sale - only products from classic delivery sale can be added
if (Tools::getValue('ajax') == 'true') {
die('{"hasError" : true,"popup_error_cart": true, "errors" : ["'.Tools::displayError('Sorry your cart already contains products from a sale shipped within 3 weeks. To continue, please confirm your order or empty your cart.', false).'"]}');