Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 10:54:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add computed attribute for total calculation in Summary component

Browse Source
This commit is contained in:
Benjamin Beganović 2024-02-14 18:29:57 +01:00
parent 9696fc4f59
commit bc5ec3e1ac
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/Livewire/BillingPortal/Summary.php
View File

@ -15,6 +15,7 @@ namespace App\Livewire\BillingPortal;
use App\Models\RecurringInvoice; use App\Models\RecurringInvoice;
use App\Models\Subscription; use App\Models\Subscription;
use App\Utils\Number; use App\Utils\Number;
use Livewire\Attributes\Computed;
use Livewire\Attributes\On; use Livewire\Attributes\On;
use Livewire\Component; use Livewire\Component;
@ -27,7 +28,7 @@ class Summary extends Component
#[On('purchase.context')] #[On('purchase.context')]
public function handleContext(string $property, $value): self 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. // The following may not be needed, as we can pass arround $context.
// cache()->set($this->hash, $this->context); // cache()->set($this->hash, $this->context);
@ -48,6 +49,7 @@ class Summary extends Component
$bundle['recurring_products'][$product->hashed_id] = [ $bundle['recurring_products'][$product->hashed_id] = [
'product' => $product, 'product' => $product,
'quantity' => 1, '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); $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) { $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) { $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) { if ($raw) {
@ -90,11 +106,11 @@ class Summary extends Component
} }
$recurring = collect($this->context['bundle']['recurring_products'])->sum(function ($item) { $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) { $recurring_optional = collect($this->context['bundle']['optional_recurring_products'])->sum(function ($item) {
return $item['product']['cost']; return $item['product']['cost'] * $item['quantity'];
}); });
if ($raw) { if ($raw) {
@ -108,6 +124,7 @@ class Summary extends Component
); );
} }
#[Computed()]
public function total() public function total()
{ {
return Number::formatMoney( return Number::formatMoney(