Merge branch 'fix-uncombinable' into develop

2017-10-02 12:50:22 +02:00 · 2017-10-02 12:50:22 +02:00 · faff854953
commit faff854953
parent 20b2adc944 6b2e8deea1
1 changed files with 8 additions and 1 deletions
--- a/modules/privatesales/Sale.php
+++ b/modules/privatesales/Sale.php
@ -2029,7 +2029,14 @@ class Sale {
            $current_sale = $sale;
            $adding_sale = $added_sale;
        } 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) {
                return false;
            }