piccolo fix in gestione prodotti nelle prenotazioni

madbob · Oct 13, 2024 · 1084232 · 1084232
1 parent 7496803
commit 1084232
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/code/app/Booking.php b/code/app/Booking.php
@@ -239,7 +239,6 @@ public function getValue($type, $with_friends, $force_recalculate = false)
                 }
 
                 foreach ($products as $booked) {
-                    $booked->setRelation('booking', $obj);
                     $value += $booked->getValue($type);
                 }
             }
@@ -384,13 +383,16 @@ public function getProductsWithFriendsAttribute()
             */
             $products = new Collection();
             foreach($this->products as $p) {
+                $p->setRelation('booking', $obj);
                 $products->push($p);
             }
 
             $friends = $this->friends_bookings;
 
             foreach($friends as $sub) {
                 foreach($sub->products as $sub_p) {
+                    $sub_p->setRelation('booking', $sub);
+
                     $master_p = $products->firstWhere('product_id', $sub_p->product_id);
 
                     if (is_null($master_p)) {
@@ -420,10 +422,6 @@ public function getProductsWithFriendsAttribute()
                 return $a->product->name <=> $b->product->name;
             });
 
-            $products = $products->map(function($a) use ($obj) {
-                return $a->setRelation('booking', $obj);
-            });
-
             return $products;
         });
     }

diff --git a/code/tests/Services/ModifiersServiceTest.php b/code/tests/Services/ModifiersServiceTest.php
@@ -836,6 +836,7 @@ public function testWithFriend()
         $mods = $booking->applyModifiers(null, true);
         $this->assertEquals($mods->count(), 1);
         $second_initial_amount = $booking->getValue('booked', true);
+        $this->assertTrue($second_initial_amount > 0);
         $this->assertEquals($second_initial_amount, $initial_amount + $amount_of_friend);
         $second_initial_amount = $booking->getValue('effective', true);
         $this->assertEquals(round($second_initial_amount, 2), round(($initial_amount + $amount_of_friend) * 1.10, 2));