Merge branch 'master' into aggregations

madbob · Sep 14, 2024 · 92f0ec0 · 92f0ec0
2 parents 97abef0 + 671f1ba
commit 92f0ec0
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/code/app/Booking.php b/code/app/Booking.php
@@ -150,7 +150,7 @@ public function allModifiedValues($id, $with_friends)
             });
         }
 
-        return $values->unique('id');
+        return $values;
     }
 
     /*
@@ -644,9 +644,6 @@ public function calculateModifiers($aggregate_data = null, $real = true)
             if ($real == false) {
                 DB::rollback();
             }
-            else {
-                $this->setRelation('modifiedValues', $values);
-            }
         }
 
         return $values;