From bc5ec3e1ac0f2b6b73f890a98c860e7cf7db3d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Wed, 14 Feb 2024 18:29:57 +0100
Subject: [PATCH] Add computed attribute for total calculation in Summary
 component

---
 app/Livewire/BillingPortal/Summary.php | 27 +++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/Livewire/BillingPortal/Summary.php b/app/Livewire/BillingPortal/Summary.php
index 886ef58577af..baf8809d26b6 100644
--- a/app/Livewire/BillingPortal/Summary.php
+++ b/app/Livewire/BillingPortal/Summary.php
@@ -15,6 +15,7 @@ namespace App\Livewire\BillingPortal;
 use App\Models\RecurringInvoice;
 use App\Models\Subscription;
 use App\Utils\Number;
+use Livewire\Attributes\Computed;
 use Livewire\Attributes\On;
 use Livewire\Component;
 
@@ -27,7 +28,7 @@ class Summary extends Component
     #[On('purchase.context')]
     public function handleContext(string $property, $value): self
     {
-        $this->context[$property] = $value;
+        data_set($this->context, $property, $value);
 
         // The following may not be needed, as we can pass arround $context.
         // cache()->set($this->hash, $this->context);
@@ -48,6 +49,7 @@ class Summary extends Component
             $bundle['recurring_products'][$product->hashed_id] = [
                 'product' => $product,
                 'quantity' => 1,
+                'notes' => $product->markdownNotes(),
             ];
         }
 
@@ -58,6 +60,20 @@ class Summary extends Component
             ];
         }
 
+        foreach ($this->subscription->service()->optional_recurring_products() as $key => $product) {
+            $bundle['optional_recurring_products'][$product->hashed_id] = [
+                'product' => $product,
+                'quantity' => 0,
+            ];
+        }
+
+        foreach ($this->subscription->service()->optional_products() as $key => $product) {
+            $bundle['optional_one_time_products'][$product->hashed_id] = [
+                'product' => $product,
+                'quantity' => 0,
+            ];
+        }
+
         $this->dispatch('purchase.context', property: 'bundle', value: $bundle);
     }
 
@@ -68,11 +84,11 @@ class Summary extends Component
         }
 
         $one_time = collect($this->context['bundle']['one_time_products'])->sum(function ($item) {
-            return $item['product']['cost'];
+            return $item['product']['cost'] * $item['quantity'];
         });
 
         $one_time_optional = collect($this->context['bundle']['optional_one_time_products'])->sum(function ($item) {
-            return $item['product']['cost'];
+            return $item['product']['cost'] * $item['quantity'];
         });
 
         if ($raw) {
@@ -90,11 +106,11 @@ class Summary extends Component
         }
 
         $recurring = collect($this->context['bundle']['recurring_products'])->sum(function ($item) {
-            return $item['product']['cost'];
+            return $item['product']['cost'] * $item['quantity'];
         });
 
         $recurring_optional = collect($this->context['bundle']['optional_recurring_products'])->sum(function ($item) {
-            return $item['product']['cost'];
+            return $item['product']['cost'] * $item['quantity'];
         });
 
         if ($raw) {
@@ -108,6 +124,7 @@ class Summary extends Component
         );
     }
 
+    #[Computed()]
     public function total()
     {
         return Number::formatMoney(