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:50:30 +02:00
commit 3442442c3d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/privatesales/Sale.php
View File

@ -2029,7 +2029,14 @@ class Sale {
$current_sale = $sale; $current_sale = $sale;
$adding_sale = $added_sale; $adding_sale = $added_sale;
} else { } else {
// We can test with the attribute // Compatibility with object - We can test with the attribute
// Same sale
if((int)$sale->id == (int)$added_sale->id){
return true;
}
// Uncombinable
if((int)$sale->uncombinable == 1 || (int)$added_sale->uncombinable == 1) { if((int)$sale->uncombinable == 1 || (int)$added_sale->uncombinable == 1) {
return false; return false;
} }