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

Merge branch 'ticket-13225-SpecificDelivery' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-08-31 15:26:01 +02:00
commit a40c1d6347
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/privatesales/Sale.php
View File

@ -2001,11 +2001,12 @@ class Sale {
// Current sale is not Noel, not classic, not particular
if((int)$current_sale['delivery_delay'] != 1 && (int)$current_sale['delivery_delay'] != 5 && (int)$current_sale['delivery_delay'] != 9){
// Different sale but same shipping (philea for now) and same delivery delay
// Different sale but same shipping (philea for now : id_shipping 1) and same delivery delay
if(
(int)$adding_sale['id_sale'] != (int)$current_sale['id_sale']
&& (int)$current_sale['shipping'] == (int)$adding_sale['shipping']
&& (int)$adding_sale['delivery_delay'] == (int)$current_sale['delivery_delay']
&& (int)$current_sale['shipping'] == 1
){
return true;
}