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

Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop

Browse Source
This commit is contained in:
Christophe Latour 2017-10-02 12:41:55 +02:00
commit 7e089dabe1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/privatesales/Sale.php
View File

@ -2047,16 +2047,17 @@ class Sale {
); );
} }
// Sale is uncombinable
if(self::isUncombinable((int)$current_sale['id_sale']) || self::isUncombinable((int)$adding_sale['id_sale'])) {
return false;
}
// Same sale // Same sale
if((int)$adding_sale['id_sale'] == (int)$current_sale['id_sale']){ if((int)$adding_sale['id_sale'] == (int)$current_sale['id_sale']){
return true; return true;
} }
// Sale is uncombinable
if(self::isUncombinable((int)$current_sale['id_sale']) || self::isUncombinable((int)$adding_sale['id_sale'])) {
return false;
}
// Current sale is not Noel, not classic, not particular // 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){ if((int)$current_sale['delivery_delay'] != 1 && (int)$current_sale['delivery_delay'] != 5 && (int)$current_sale['delivery_delay'] != 9){