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

Merge branch 'ticket-14285-Dropshipping' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-10-02 13:24:32 +02:00
commit 97ec6492c6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/privatesales/Sale.php
View File

@ -2097,11 +2097,12 @@ class Sale {
return false;
}
// Particular and classic but different shipping
// Particular and classic but different shipping (only dropshipping and default shipping can be combinable)
if(
((int)$current_sale['delivery_delay'] == 1 || (int)$current_sale['delivery_delay'] == 9)
&& ((int)$adding_sale['delivery_delay'] == 1 || (int)$adding_sale['delivery_delay'] == 9)
&& (int)$current_sale['shipping'] != (int)$adding_sale['shipping']
&& ((int)$current_sale['shipping'] != (int)$adding_sale['shipping'])
&& (!in_array((int)$current_sale['shipping'],array(0,2)) || !in_array((int)$adding_sale['shipping'],array(0,2)))
){
return false;
}