wip

app/Filament/Company/Resources/Accounting/DocumentResource.php

@@ -103,6 +103,40 @@ class DocumentResource extends Resource
                         ])->from('md'),
                         TableRepeater::make('lineItems')
                             ->relationship()
+                            ->saveRelationshipsUsing(function (Document $document, array $state) {
+                                $document->lineItems()->delete();
+
+                                collect($state)->map(function ($lineItemData) use ($document) {
+                                    $lineItem = $document->lineItems()->create([
+                                        'offering_id' => $lineItemData['offering_id'],
+                                        'description' => $lineItemData['description'],
+                                        'quantity' => $lineItemData['quantity'],
+                                        'unit_price' => $lineItemData['unit_price'],
+                                        'tax_total' => collect($lineItemData['salesTaxes'] ?? [])->sum(function ($taxId) use ($lineItemData) {
+                                            $tax = Adjustment::find($taxId);
+
+                                            return $tax ? ($lineItemData['quantity'] * $lineItemData['unit_price']) * ($tax->rate / 100) : 0;
+                                        }),
+                                    ]);
+
+                                    $lineItem->taxes()->sync($lineItemData['salesTaxes'] ?? []);
+
+                                    return $lineItem;
+                                });
+
+                                $document->refresh();
+                                $subtotal = $document->lineItems()->sum('subtotal') / 100;
+                                $taxTotal = $document->lineItems()->sum('tax_total') / 100;
+                                $discountTotal = $document->lineItems()->sum('discount_total') / 100;
+                                $grandTotal = $subtotal + $taxTotal - $discountTotal;
+
+                                $document->updateQuietly([
+                                    'subtotal' => $subtotal,
+                                    'tax_total' => $taxTotal,
+                                    'discount_total' => $discountTotal,
+                                    'total' => $grandTotal,
+                                ]);
+                            })
                             ->headers([
                                 Header::make('Items')->width('20%'),
                                 Header::make('Description')->width('30%'),
@@ -135,8 +169,7 @@ class DocumentResource extends Resource
                                             $set('total', $total + $taxAmount);
                                         }
                                     }),
-                                Forms\Components\TextInput::make('description')
-                                    ->required(),
+                                Forms\Components\TextInput::make('description'),
                                 Forms\Components\TextInput::make('quantity')
                                     ->required()
                                     ->numeric()
@@ -175,68 +208,11 @@ class DocumentResource extends Resource
                                     }),
                             ]),
                         Forms\Components\Grid::make(6)
-                            ->inlineLabel()
-                            ->extraAttributes([
-                                'class' => 'text-right pr-16',
-                            ])
                             ->schema([
-                                Forms\Components\Group::make([
-                                    Forms\Components\Placeholder::make('subtotal')
-                                        ->label('Subtotal')
-                                        ->content(function (Forms\Get $get) {
-                                            $lineItems = $get('lineItems');
-
-                                            $subtotal = collect($lineItems)
-                                                ->sum(fn ($item) => ($item['quantity'] ?? 0) * ($item['unit_price'] ?? 0));
-
-                                            return money($subtotal, CurrencyAccessor::getDefaultCurrency(), true)->format();
-                                        }),
-                                    Forms\Components\Placeholder::make('tax_total')
-                                        ->label('Taxes')
-                                        ->content(function (Forms\Get $get) {
-                                            $lineItems = $get('lineItems');
-
-                                            $totalTaxes = collect($lineItems)->reduce(function ($carry, $item) {
-                                                $quantity = $item['quantity'] ?? 0;
-                                                $unitPrice = $item['unit_price'] ?? 0;
-                                                $salesTaxes = $item['salesTaxes'] ?? [];
-                                                $lineTotal = $quantity * $unitPrice;
-
-                                                $taxAmount = Adjustment::whereIn('id', $salesTaxes)
-                                                    ->pluck('rate')
-                                                    ->sum(fn ($rate) => $lineTotal * ($rate / 100));
-
-                                                return $carry + $taxAmount;
-                                            }, 0);
-
-                                            return money($totalTaxes, CurrencyAccessor::getDefaultCurrency(), true)->format();
-                                        }),
-                                    Forms\Components\Placeholder::make('total')
-                                        ->label('Total')
-                                        ->content(function (Forms\Get $get) {
-                                            $lineItems = $get('lineItems') ?? [];
-
-                                            $subtotal = collect($lineItems)
-                                                ->sum(fn ($item) => ($item['quantity'] ?? 0) * ($item['unit_price'] ?? 0));
-
-                                            $totalTaxes = collect($lineItems)->reduce(function ($carry, $item) {
-                                                $quantity = $item['quantity'] ?? 0;
-                                                $unitPrice = $item['unit_price'] ?? 0;
-                                                $salesTaxes = $item['salesTaxes'] ?? [];
-                                                $lineTotal = $quantity * $unitPrice;
-
-                                                $taxAmount = Adjustment::whereIn('id', $salesTaxes)
-                                                    ->pluck('rate')
-                                                    ->sum(fn ($rate) => $lineTotal * ($rate / 100));
-
-                                                return $carry + $taxAmount;
-                                            }, 0);
-
-                                            $grandTotal = $subtotal + $totalTaxes;
-
-                                            return money($grandTotal, CurrencyAccessor::getDefaultCurrency(), true)->format();
-                                        }),
-                                ])->columnStart(6),
+                                Forms\Components\ViewField::make('totals')
+                                    ->columnStart(5)
+                                    ->columnSpan(2)
+                                    ->view('filament.forms.components.invoice-totals'),
                             ]),
                         //                        Forms\Components\Repeater::make('lineItems')
                         //                            ->relationship()

app/Filament/Company/Resources/Accounting/DocumentResource/Pages/EditDocument.php

@@ -5,6 +5,7 @@ namespace App\Filament\Company\Resources\Accounting\DocumentResource\Pages;
 use App\Filament\Company\Resources\Accounting\DocumentResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
+use Illuminate\Database\Eloquent\Model;
 
 class EditDocument extends EditRecord
 {
@@ -16,4 +17,11 @@ class EditDocument extends EditRecord
             Actions\DeleteAction::make(),
         ];
     }
+
+    protected function handleRecordUpdate(Model $record, array $data): Model
+    {
+        ray($data);
+
+        return parent::handleRecordUpdate($record, $data); // TODO: Change the autogenerated stub
+    }
 }

app/Filament/Company/Resources/Sales/InvoiceResource/Pages/EditInvoice.php

@@ -5,6 +5,7 @@ namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
+use Illuminate\Database\Eloquent\Model;
 
 class EditInvoice extends EditRecord
 {
@@ -16,4 +17,11 @@ class EditInvoice extends EditRecord
             Actions\DeleteAction::make(),
         ];
     }
+
+    protected function handleRecordUpdate(Model $record, array $data): Model
+    {
+        ray($data);
+
+        return parent::handleRecordUpdate($record, $data); // TODO: Change the autogenerated stub
+    }
 }

app/Models/Accounting/DocumentLineItem.php

@@ -31,7 +31,6 @@ class DocumentLineItem extends Model
         'description',
         'quantity',
         'unit_price',
-        'total',
         'tax_total',
         'discount_total',
         'created_by',
@@ -40,9 +39,10 @@ class DocumentLineItem extends Model
 
     protected $casts = [
         'unit_price' => MoneyCast::class,
-        'total' => MoneyCast::class,
+        'subtotal' => MoneyCast::class,
         'tax_total' => MoneyCast::class,
         'discount_total' => MoneyCast::class,
+        'total' => MoneyCast::class,
     ];
 
     public function document(): BelongsTo

app/Observers/DocumentLineItemObserver.php

@@ -22,18 +22,6 @@ class DocumentLineItemObserver
         //
     }
 
-    public function saving(DocumentLineItem $lineItem): void
-    {
-        // Calculate the base total (quantity * unit price)
-        $lineItem->total = $lineItem->quantity * $lineItem->unit_price;
-
-        // Calculate tax total (if applicable)
-        $lineItem->tax_total = $lineItem->taxes->sum(fn ($tax) => $lineItem->total * ($tax->rate / 100));
-
-        // Calculate discount total (if applicable)
-        $lineItem->discount_total = $lineItem->discounts->sum(fn ($discount) => $lineItem->total * ($discount->rate / 100));
-    }
-
     /**
      * Handle the DocumentLineItem "deleted" event.
      */

app/Observers/DocumentObserver.php

@@ -30,11 +30,6 @@ class DocumentObserver
         //
     }
 
-    public function updated(Document $document): void
-    {
-        $this->recalculateTotals($document);
-    }
-
     public function saved(Document $document): void
     {
         $this->recalculateTotals($document);
@@ -42,29 +37,24 @@ class DocumentObserver
 
     protected function recalculateTotals(Document $document): void
     {
-        // Sum up totals in cents
-        $subtotalCents = $document->lineItems()->sum('total');
-        $taxTotalCents = $document->lineItems()->sum('tax_total');
-        $discountTotalCents = $document->lineItems()->sum('discount_total');
-        $grandTotalCents = $subtotalCents + $taxTotalCents - $discountTotalCents;
+        // Sum up values from line items
+        $subtotalCents = $document->lineItems()->sum('subtotal'); // Use the computed column directly
+        $taxTotalCents = $document->lineItems()->sum('tax_total'); // Sum from line items
+        $discountTotalCents = $document->lineItems()->sum('discount_total'); // Sum from line items
+        $grandTotalCents = $subtotalCents + $taxTotalCents - $discountTotalCents; // Calculated as before
 
-        $subtotal = $subtotalCents / 100; // Convert to dollars
+        // Convert from cents to dollars
+        $subtotal = $subtotalCents / 100;
         $taxTotal = $taxTotalCents / 100;
         $discountTotal = $discountTotalCents / 100;
         $grandTotal = $grandTotalCents / 100;
 
-        ray([
-            'subtotal' => $subtotal,
-            'tax_total' => $taxTotal,
-            'discount_total' => $discountTotal,
-            'grand_total' => $grandTotal,
-        ]);
-
+        // Update document totals
         $document->updateQuietly([
-            'subtotal' => $subtotal,
+            'subtotal' => $subtotal, // Use database-computed subtotal
             'tax_total' => $taxTotal,
             'discount_total' => $discountTotal,
-            'total' => $grandTotal,
+            'total' => $grandTotal, // Use calculated grand total
         ]);
     }
 

app/Utilities/Currency/CurrencyConverter.php

@@ -49,6 +49,13 @@ class CurrencyConverter
         return money($amount, $currency)->format();
     }
 
+    public static function formatToMoney(string | float $amount, ?string $currency = null): string
+    {
+        $currency ??= CurrencyAccessor::getDefaultCurrency();
+
+        return money($amount, $currency, true)->format();
+    }
+
     public static function handleCurrencyChange(Set $set, $state): void
     {
         $currency = currency($state);

app/View/Models/InvoiceTotalViewModel.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\View\Models;
+
+use App\Models\Accounting\Adjustment;
+use App\Models\Accounting\Document;
+use App\Utilities\Currency\CurrencyConverter;
+
+class InvoiceTotalViewModel
+{
+    public function __construct(
+        public ?Document $invoice,
+        public ?array $data = null
+    ) {}
+
+    public function buildViewData(): array
+    {
+        $lineItems = collect($this->data['lineItems'] ?? []);
+
+        $subtotal = $lineItems->sum(fn ($item) => ($item['quantity'] ?? 0) * ($item['unit_price'] ?? 0));
+
+        $taxTotal = $lineItems->reduce(function ($carry, $item) {
+            $quantity = $item['quantity'] ?? 0;
+            $unitPrice = $item['unit_price'] ?? 0;
+            $salesTaxes = $item['salesTaxes'] ?? [];
+            $lineTotal = $quantity * $unitPrice;
+
+            $taxAmount = Adjustment::whereIn('id', $salesTaxes)
+                ->pluck('rate')
+                ->sum(fn ($rate) => $lineTotal * ($rate / 100));
+
+            return $carry + $taxAmount;
+        }, 0);
+
+        $grandTotal = $subtotal + $taxTotal;
+
+        $subTotalFormatted = CurrencyConverter::formatToMoney($subtotal);
+        $taxTotalFormatted = CurrencyConverter::formatToMoney($taxTotal);
+        $grandTotalFormatted = CurrencyConverter::formatToMoney($grandTotal);
+
+        return [
+            'subtotal' => $subTotalFormatted,
+            'taxTotal' => $taxTotalFormatted,
+            'grandTotal' => $grandTotalFormatted,
+        ];
+    }
+}

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.330.0",
+            "version": "3.330.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "dd1b65a4329f91d5e282a92fab2be7bdf6e2adea"
+                "reference": "136749f15d1dbff07064ef5ba1c2f08b96cf78ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/dd1b65a4329f91d5e282a92fab2be7bdf6e2adea",
-                "reference": "dd1b65a4329f91d5e282a92fab2be7bdf6e2adea",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/136749f15d1dbff07064ef5ba1c2f08b96cf78ff",
+                "reference": "136749f15d1dbff07064ef5ba1c2f08b96cf78ff",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.330.0"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.330.1"
             },
-            "time": "2024-11-22T19:10:26+00:00"
+            "time": "2024-11-25T19:20:00+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -5060,16 +5060,16 @@
         },
         {
             "name": "openspout/openspout",
-            "version": "v4.26.0",
+            "version": "v4.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/openspout/openspout.git",
-                "reference": "a49b947c0c109f4fd112f9b5c6d6cb3e6baf8b50"
+                "reference": "1841a6047b4d23d1d353821b8a03f8d599a94143"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/openspout/openspout/zipball/a49b947c0c109f4fd112f9b5c6d6cb3e6baf8b50",
-                "reference": "a49b947c0c109f4fd112f9b5c6d6cb3e6baf8b50",
+                "url": "https://api.github.com/repos/openspout/openspout/zipball/1841a6047b4d23d1d353821b8a03f8d599a94143",
+                "reference": "1841a6047b4d23d1d353821b8a03f8d599a94143",
                 "shasum": ""
             },
             "require": {
@@ -5083,13 +5083,13 @@
             },
             "require-dev": {
                 "ext-zlib": "*",
-                "friendsofphp/php-cs-fixer": "^3.64.0",
-                "infection/infection": "^0.29.6",
+                "friendsofphp/php-cs-fixer": "^3.65.0",
+                "infection/infection": "^0.29.8",
                 "phpbench/phpbench": "^1.3.1",
-                "phpstan/phpstan": "^1.12.4",
-                "phpstan/phpstan-phpunit": "^1.4.0",
-                "phpstan/phpstan-strict-rules": "^1.6.1",
-                "phpunit/phpunit": "^11.3.6"
+                "phpstan/phpstan": "^2.0.2",
+                "phpstan/phpstan-phpunit": "^2.0.1",
+                "phpstan/phpstan-strict-rules": "^2",
+                "phpunit/phpunit": "^11.4.3"
             },
             "suggest": {
                 "ext-iconv": "To handle non UTF-8 CSV files (if \"php-mbstring\" is not already installed or is too limited)",
@@ -5137,7 +5137,7 @@
             ],
             "support": {
                 "issues": "https://github.com/openspout/openspout/issues",
-                "source": "https://github.com/openspout/openspout/tree/v4.26.0"
+                "source": "https://github.com/openspout/openspout/tree/v4.27.0"
             },
             "funding": [
                 {
@@ -5149,7 +5149,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-24T14:04:43+00:00"
+            "time": "2024-11-25T10:23:43+00:00"
         },
         {
             "name": "paragonie/constant_time_encoding",

database/migrations/2024_11_13_220301_create_document_line_items_table.php

@@ -19,7 +19,8 @@ return new class extends Migration
             $table->string('description')->nullable();
             $table->integer('quantity')->default(1);
             $table->integer('unit_price')->default(0);
-            $table->integer('total')->default(0);
+            $table->integer('subtotal')->storedAs('quantity * unit_price');
+            $table->integer('total')->storedAs('(quantity * unit_price) + tax_total - discount_total');
             $table->integer('tax_total')->default(0);
             $table->integer('discount_total')->default(0);
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();

package-lock.json

@@ -928,9 +928,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.7.7",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
-            "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
+            "version": "1.7.8",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.8.tgz",
+            "integrity": "sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1187,9 +1187,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.64",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.64.tgz",
-            "integrity": "sha512-IXEuxU+5ClW2IGEYFC2T7szbyVgehupCWQe5GNh+H065CD6U6IFN0s4KeAMFGNmQolRU4IV7zGBWSYMmZ8uuqQ==",
+            "version": "1.5.65",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.65.tgz",
+            "integrity": "sha512-PWVzBjghx7/wop6n22vS2MLU8tKGd4Q91aCEGhG/TYmW6PP5OcSXcdnxTe1NNt0T66N8D6jxh4kC8UsdzOGaIw==",
             "dev": true,
             "license": "ISC"
         },

resources/css/filament/company/tailwind.config.js

@@ -5,6 +5,7 @@ export default {
     content: [
         './app/Filament/Company/**/*.php',
         './resources/views/filament/company/**/*.blade.php',
+        './resources/views/filament/forms/**/*.blade.php',
         './resources/views/livewire/company/**/*.blade.php',
         './resources/views/components/**/*.blade.php',
         './vendor/filament/**/*.blade.php',

resources/views/filament/forms/components/invoice-totals.blade.php

@@ -0,0 +1,30 @@
+@use('App\Utilities\Currency\CurrencyAccessor')
+
+@php
+    $data = $this->form->getRawState();
+    $viewModel = new \App\View\Models\InvoiceTotalViewModel($this->record, $data);
+    extract($viewModel->buildViewData(), \EXTR_SKIP);
+@endphp
+
+<div class="totals-summary w-full pr-14">
+    <table class="w-full text-right table-fixed">
+        <tbody>
+            <tr>
+                <td class="w-2/3 text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Subtotal:</td>
+                <td class="w-1/3 text-sm pl-4 py-2 leading-6">{{ $subtotal }}</td>
+            </tr>
+            <tr>
+                <td class="w-2/3 text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Taxes:</td>
+                <td class="w-1/3 text-sm pl-4 py-2 leading-6">{{ $taxTotal }}</td>
+            </tr>
+            <tr class="font-semibold">
+                <td class="w-2/3 text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Total:</td>
+                <td class="w-1/3 text-sm pl-4 py-2 leading-6">{{ $grandTotal }}</td>
+            </tr>
+        </tbody>
+    </table>
+</div>
+
+
+
+