wip

app/Contracts/AccountHandler.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Contracts;
-
-use App\Models\Accounting\Account;
-use App\ValueObjects\Money;
-
-interface AccountHandler
-{
-    public function getDebitBalance(Account $account, string $startDate, string $endDate): Money;
-
-    public function getCreditBalance(Account $account, string $startDate, string $endDate): Money;
-
-    public function getNetMovement(Account $account, string $startDate, string $endDate): Money;
-
-    public function getStartingBalance(Account $account, string $startDate): ?Money;
-
-    public function getEndingBalance(Account $account, string $startDate, string $endDate): ?Money;
-
-    public function getBalances(Account $account, string $startDate, string $endDate, array $fields): array;
-
-    public function getTotalBalanceForAllBankAccounts(string $startDate, string $endDate): Money;
-
-    public function getEarliestTransactionDate(): string;
-}

app/Contracts/DocumentNumber.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Contracts;
-
-use Illuminate\Database\Eloquent\Model;
-
-interface DocumentNumber
-{
-    public function getNextNumber(?Model $model, ?string $type, int | string $number, string $prefix, int | string $digits, ?bool $padded = true): string;
-
-    public function incrementNumber(Model $model, string $type): void;
-}

app/Enums/Accounting/AccountCategory.php

@@ -75,7 +75,7 @@ enum AccountCategory: string implements HasLabel
     /**
      * Determines if the account is a real account.
      *
-     * In accounting, real accounts are permanent accounts that retain their balances across accounting periods.
+     * In accounting, assets, liabilities, and equity are real accounts which are permanent accounts that retain their balances across accounting periods.
      * They are not closed at the end of each accounting period.
      */
     public function isReal(): bool

app/Facades/Accounting.php

@@ -2,27 +2,13 @@
 
 namespace App\Facades;
 
-use App\Contracts\AccountHandler;
-use App\Models\Accounting\Account;
-use App\ValueObjects\Money;
+use App\Services\AccountService;
 use Illuminate\Support\Facades\Facade;
 
-/**
- * @method static Money getDebitBalance(Account $account, string $startDate, string $endDate)
- * @method static Money getCreditBalance(Account $account, string $startDate, string $endDate)
- * @method static Money getNetMovement(Account $account, string $startDate, string $endDate)
- * @method static Money|null getStartingBalance(Account $account, string $startDate)
- * @method static Money|null getEndingBalance(Account $account, string $startDate, string $endDate)
- * @method static array getBalances(Account $account, string $startDate, string $endDate, array $fields)
- * @method static Money getTotalBalanceForAllBankAccounts(string $startDate, string $endDate)
- * @method static string getEarliestTransactionDate()
- *
- * @see AccountHandler
- */
 class Accounting extends Facade
 {
     protected static function getFacadeAccessor(): string
     {
-        return AccountHandler::class;
+        return AccountService::class;
     }
 }

app/Facades/Reporting.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Facades;
+
+use App\Services\ReportService;
+use Illuminate\Support\Facades\Facade;
+
+class Reporting extends Facade
+{
+    protected static function getFacadeAccessor(): string
+    {
+        return ReportService::class;
+    }
+}

app/Filament/Company/Clusters/Settings/Pages/CompanyProfile.php

@@ -183,7 +183,7 @@ class CompanyProfile extends Page
                     ->imageResizeMode('contain')
                     ->imageCropAspectRatio('1:1')
                     ->panelAspectRatio('1:1')
-                    ->panelLayout('compact')
+                    ->panelLayout('integrated')
                     ->removeUploadedFileButtonPosition('center bottom')
                     ->uploadButtonPosition('center bottom')
                     ->uploadProgressIndicatorPosition('center bottom')

app/Filament/Company/Clusters/Settings/Pages/Invoice.php

@@ -137,13 +137,15 @@ class Invoice extends Page
                 TextInput::make('number_next')
                     ->softRequired()
                     ->localizeLabel()
-                    ->maxLength(static fn (Get $get) => $get('number_digits'))
-                    ->hint(static function (Get $get, $state) {
+                    ->mask(static function (Get $get) {
+                        return str_repeat('9', $get('number_digits'));
+                    })
+                    ->hint(function (Get $get, $state) {
                         $number_prefix = $get('number_prefix');
                         $number_digits = $get('number_digits');
                         $number_next = $state;
 
-                        return InvoiceModel::getNumberNext(true, true, $number_prefix, $number_digits, $number_next);
+                        return $this->record->getNumberNext(true, true, $number_prefix, $number_digits, $number_next);
                     }),
                 Select::make('payment_terms')
                     ->softRequired()

app/Models/Setting/DocumentDefault.php

@@ -93,53 +93,32 @@ class DocumentDefault extends Model
         return array_combine(range(1, 20), range(1, 20));
     }
 
-    public static function getNumberNext(?bool $padded = null, ?bool $format = null, ?string $prefix = null, int | string | null $digits = null, int | string | null $next = null, ?string $type = null): string
+    public function getNumberNext(?bool $padded = null, ?bool $format = null, ?string $prefix = null, int | string | null $digits = null, int | string | null $next = null): string
     {
-        $initializeAttributes = new static;
+        [$number_prefix, $number_digits, $number_next] = $this->initializeAttributes($prefix, $digits, $next);
 
-        [$number_prefix, $number_digits, $number_next] = $initializeAttributes->initializeAttributes($prefix, $digits, $next, $type);
-
-        if ($format) {
-            return $number_prefix . static::getPaddedNumberNext($number_next, $number_digits);
-        }
-
-        if ($padded) {
-            return static::getPaddedNumberNext($number_next, $number_digits);
-        }
-
-        return $number_next;
+        return match (true) {
+            $format && $padded => $number_prefix . $this->getPaddedNumberNext($number_next, $number_digits),
+            $format => $number_prefix . $number_next,
+            $padded => $this->getPaddedNumberNext($number_next, $number_digits),
+            default => $number_next,
+        };
     }
 
-    public function initializeAttributes(?string $prefix, int | string | null $digits, int | string | null $next, ?string $type): array
+    public function initializeAttributes(?string $prefix, int | string | null $digits, int | string | null $next): array
     {
-        $number_prefix = $prefix ?? $this->getAttributeFromArray('number_prefix');
-        $number_digits = $digits ?? $this->getAttributeFromArray('number_digits');
-        $number_next = $next ?? $this->getAttributeFromArray('number_next');
-
-        if ($type) {
-            $attributes = static::getAttributesByType($type);
-
-            $number_prefix = $attributes['number_prefix'] ?? $number_prefix;
-            $number_digits = $attributes['number_digits'] ?? $number_digits;
-            $number_next = $attributes['number_next'] ?? $number_next;
-        }
+        $number_prefix = $prefix ?? $this->number_prefix;
+        $number_digits = $digits ?? $this->number_digits;
+        $number_next = $next ?? $this->number_next;
 
         return [$number_prefix, $number_digits, $number_next];
     }
 
-    public static function getAttributesByType(?string $type): array
-    {
-        $model = new static;
-        $attributes = $model->newQuery()->type($type)->first();
-
-        return $attributes ? $attributes->toArray() : [];
-    }
-
     /**
      * Get the next number with padding for dynamic display purposes.
      * Even if number_next is a string, it will be cast to an integer.
      */
-    public static function getPaddedNumberNext(int | string | null $number_next, int | string | null $number_digits): string
+    public function getPaddedNumberNext(int | string | null $number_next, int | string | null $number_digits): string
     {
         return str_pad($number_next, $number_digits, '0', STR_PAD_LEFT);
     }

app/Providers/AppServiceProvider.php

@@ -2,8 +2,6 @@
 
 namespace App\Providers;
 
-use App\Contracts\AccountHandler;
-use App\Services\AccountService;
 use App\Services\DateRangeService;
 use BezhanSalleh\PanelSwitch\PanelSwitch;
 use Filament\Notifications\Livewire\Notifications;
@@ -14,13 +12,6 @@ use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
 {
-    /**
-     * All of the container bindings that should be registered.
-     */
-    public array $bindings = [
-        AccountHandler::class => AccountService::class,
-    ];
-
     /**
      * Register any application services.
      */

app/Services/AccountService.php

@@ -2,7 +2,6 @@
 
 namespace App\Services;
 
-use App\Contracts\AccountHandler;
 use App\Enums\Accounting\AccountCategory;
 use App\Models\Accounting\Account;
 use App\Models\Accounting\Transaction;
@@ -14,7 +13,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Facades\DB;
 
-class AccountService implements AccountHandler
+class AccountService
 {
     public function __construct(
         protected JournalEntryRepository $journalEntryRepository
@@ -22,107 +21,93 @@ class AccountService implements AccountHandler
 
     public function getDebitBalance(Account $account, string $startDate, string $endDate): Money
     {
-        $amount = $this->journalEntryRepository->sumDebitAmounts($account, $startDate, $endDate);
+        $query = $this->getAccountBalances($startDate, $endDate, [$account->id])->first();
 
-        return new Money($amount, $account->currency_code);
+        return new Money($query->total_debit, $account->currency_code);
     }
 
     public function getCreditBalance(Account $account, string $startDate, string $endDate): Money
     {
-        $amount = $this->journalEntryRepository->sumCreditAmounts($account, $startDate, $endDate);
+        $query = $this->getAccountBalances($startDate, $endDate, [$account->id])->first();
 
-        return new Money($amount, $account->currency_code);
+        return new Money($query->total_credit, $account->currency_code);
     }
 
     public function getNetMovement(Account $account, string $startDate, string $endDate): Money
     {
-        $balances = $this->calculateBalances($account, $startDate, $endDate);
+        $query = $this->getAccountBalances($startDate, $endDate, [$account->id])->first();
 
-        return new Money($balances['net_movement'], $account->currency_code);
+        $netMovement = $this->calculateNetMovementByCategory(
+            $account->category,
+            $query->total_debit ?? 0,
+            $query->total_credit ?? 0
+        );
+
+        return new Money($netMovement, $account->currency_code);
     }
 
     public function getStartingBalance(Account $account, string $startDate, bool $override = false): ?Money
     {
-        if ($override === false && in_array($account->category, [AccountCategory::Expense, AccountCategory::Revenue], true)) {
+        if ($override === false && $account->category->isNominal()) {
             return null;
         }
 
-        $balances = $this->calculateStartingBalances($account, $startDate);
+        $query = $this->getAccountBalances($startDate, $startDate, [$account->id])->first();
 
-        return new Money($balances['starting_balance'], $account->currency_code);
+        return new Money($query->starting_balance ?? 0, $account->currency_code);
     }
 
     public function getEndingBalance(Account $account, string $startDate, string $endDate): ?Money
     {
-        $calculatedBalances = $this->calculateBalances($account, $startDate, $endDate);
-        $startingBalances = $this->calculateStartingBalances($account, $startDate);
+        $query = $this->getAccountBalances($startDate, $endDate, [$account->id])->first();
 
-        $netMovement = $calculatedBalances['net_movement'];
+        $netMovement = $this->calculateNetMovementByCategory(
+            $account->category,
+            $query->total_debit ?? 0,
+            $query->total_credit ?? 0
+        );
 
-        if (in_array($account->category, [AccountCategory::Expense, AccountCategory::Revenue], true)) {
+        if ($account->category->isNominal()) {
             return new Money($netMovement, $account->currency_code);
         }
 
-        $endingBalance = $startingBalances['starting_balance'] + $netMovement;
+        $endingBalance = ($query->starting_balance ?? 0) + $netMovement;
 
         return new Money($endingBalance, $account->currency_code);
     }
 
     private function calculateNetMovementByCategory(AccountCategory $category, int $debitBalance, int $creditBalance): int
     {
-        return match ($category) {
-            AccountCategory::Asset, AccountCategory::Expense => $debitBalance - $creditBalance,
-            AccountCategory::Liability, AccountCategory::Equity, AccountCategory::Revenue => $creditBalance - $debitBalance,
-        };
-    }
-
-    private function calculateBalances(Account $account, string $startDate, string $endDate): array
-    {
-        $debitBalance = $this->journalEntryRepository->sumDebitAmounts($account, $startDate, $endDate);
-        $creditBalance = $this->journalEntryRepository->sumCreditAmounts($account, $startDate, $endDate);
-
-        return [
-            'debit_balance' => $debitBalance,
-            'credit_balance' => $creditBalance,
-            'net_movement' => $this->calculateNetMovementByCategory($account->category, $debitBalance, $creditBalance),
-        ];
+        if ($category->isNormalDebitBalance()) {
+            return $debitBalance - $creditBalance;
+        } else {
+            return $creditBalance - $debitBalance;
+        }
     }
 
-    private function calculateStartingBalances(Account $account, string $startDate): array
+    public function getBalances(Account $account, string $startDate, string $endDate): array
     {
-        $debitBalanceBefore = $this->journalEntryRepository->sumDebitAmounts($account, $startDate);
-        $creditBalanceBefore = $this->journalEntryRepository->sumCreditAmounts($account, $startDate);
-
-        return [
-            'debit_balance_before' => $debitBalanceBefore,
-            'credit_balance_before' => $creditBalanceBefore,
-            'starting_balance' => $this->calculateNetMovementByCategory($account->category, $debitBalanceBefore, $creditBalanceBefore),
+        $query = $this->getAccountBalances($startDate, $endDate, [$account->id])->first();
+
+        $needStartingBalances = $account->category->isReal();
+
+        $netMovement = $this->calculateNetMovementByCategory(
+            $account->category,
+            $query->total_debit ?? 0,
+            $query->total_credit ?? 0
+        );
+
+        $balances = [
+            'debit_balance' => $query->total_debit,
+            'credit_balance' => $query->total_credit,
+            'net_movement' => $netMovement,
+            'starting_balance' => $needStartingBalances ? ($query->starting_balance ?? 0) : null,
+            'ending_balance' => $needStartingBalances
+                ? ($query->starting_balance ?? 0) + $netMovement
+                : $netMovement, // For nominal accounts, ending balance is just the net movement
         ];
-    }
-
-    public function getBalances(Account $account, string $startDate, string $endDate, array $fields): array
-    {
-        $balances = [];
-        $calculatedBalances = $this->calculateBalances($account, $startDate, $endDate);
-
-        // Calculate starting balances only if needed
-        $startingBalances = null;
-        $needStartingBalances = ! in_array($account->category, [AccountCategory::Expense, AccountCategory::Revenue], true)
-                                && (in_array('starting_balance', $fields) || in_array('ending_balance', $fields));
-
-        if ($needStartingBalances) {
-            $startingBalances = $this->calculateStartingBalances($account, $startDate);
-        }
-
-        foreach ($fields as $field) {
-            $balances[$field] = match ($field) {
-                'debit_balance', 'credit_balance', 'net_movement' => $calculatedBalances[$field],
-                'starting_balance' => $needStartingBalances ? $startingBalances['starting_balance'] : null,
-                'ending_balance' => $needStartingBalances ? $startingBalances['starting_balance'] + $calculatedBalances['net_movement'] : null,
-                default => null,
-            };
-        }
 
+        // Return balances, filtering out any null values
         return array_filter($balances, static fn ($value) => $value !== null);
     }
 

app/Services/ReportService.php

@@ -261,7 +261,7 @@ class ReportService
 
                 $endingBalance = $accountBalances['ending_balance'] ?? $accountBalances['net_movement'];
 
-                $trialBalance = $this->calculateTrialBalance($account->category, $endingBalance);
+                $trialBalance = $this->calculateTrialBalances($account->category, $endingBalance);
 
                 foreach ($trialBalance as $balanceType => $balance) {
                     $categorySummaryBalances[$balanceType] += $balance;
@@ -315,7 +315,21 @@ class ReportService
         return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
     }
 
-    public function calculateTrialBalance(AccountCategory $category, int $endingBalance): array
+    public function getRetainedEarningsBalances(string $startDate, string $endDate): AccountBalanceDTO
+    {
+        $retainedEarningsAmount = $this->calculateRetainedEarnings($startDate, $endDate)->getAmount();
+
+        $isCredit = $retainedEarningsAmount >= 0;
+        $retainedEarningsDebitAmount = $isCredit ? 0 : abs($retainedEarningsAmount);
+        $retainedEarningsCreditAmount = $isCredit ? $retainedEarningsAmount : 0;
+
+        return $this->formatBalances([
+            'debit_balance' => $retainedEarningsDebitAmount,
+            'credit_balance' => $retainedEarningsCreditAmount,
+        ]);
+    }
+
+    public function calculateTrialBalances(AccountCategory $category, int $endingBalance): array
     {
         if ($category->isNormalDebitBalance()) {
             if ($endingBalance >= 0) {

app/Utilities/DocumentNumber.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Utilities;
-
-use App\Contracts\DocumentNumber as DocumentNumberInterface;
-use Illuminate\Database\Eloquent\Model;
-
-class DocumentNumber implements DocumentNumberInterface
-{
-    public function getNextNumber(?Model $model, ?string $type, int | string $number, string $prefix, int | string $digits, ?bool $padded = false): string
-    {
-        if ($model) {
-            $numberNext = $model?->newQuery()
-                ->where('type', $type)
-                ->value($number);
-        } else {
-            $numberNext = $number;
-        }
-
-        if ($padded) {
-            return $prefix . str_pad($numberNext, $digits, '0', STR_PAD_LEFT);
-        }
-
-        return $numberNext;
-    }
-
-    public function incrementNumber(Model $model, string $type): void
-    {
-        $model->newQuery()
-            ->where('type', $type)
-            ->increment('number_next');
-    }
-}

app/View/Models/InvoiceViewModel.php

@@ -80,7 +80,7 @@ class InvoiceViewModel
 
     public function invoice_number(): string
     {
-        return DocumentDefault::getNumberNext(padded: true, format: true, prefix: $this->number_prefix(), digits: $this->number_digits(), next: $this->number_next());
+        return $this->invoice->getNumberNext(padded: true, format: true, prefix: $this->number_prefix(), digits: $this->number_digits(), next: $this->number_next());
     }
 
     // Invoice date related methods

composer.json

@@ -18,7 +18,7 @@
         "awcodes/filament-table-repeater": "^3.0",
         "barryvdh/laravel-snappy": "^1.0",
         "bezhansalleh/filament-panel-switch": "^1.0",
-        "filament/filament": "^3.2.29",
+        "filament/filament": "^3.2.115",
         "guava/filament-clusters": "^1.1",
         "guzzlehttp/guzzle": "^7.8",
         "laravel/framework": "^11.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3e716d3001ed070af71b1104b265f4fd",
+    "content-hash": "a745e09991b771592a6638bed644713c",
     "packages": [
         {
             "name": "akaunting/laravel-money",
@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.322.5",
+            "version": "3.322.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "968fe51da0854eac0e0aeac6ec8b86856c6bd83e"
+                "reference": "ea3563a7f10fa562796f712fa306c1dca41a45d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/968fe51da0854eac0e0aeac6ec8b86856c6bd83e",
-                "reference": "968fe51da0854eac0e0aeac6ec8b86856c6bd83e",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ea3563a7f10fa562796f712fa306c1dca41a45d7",
+                "reference": "ea3563a7f10fa562796f712fa306c1dca41a45d7",
                 "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.322.5"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.322.7"
             },
-            "time": "2024-09-25T18:14:27+00:00"
+            "time": "2024-09-27T18:34:08+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -1738,16 +1738,16 @@
         },
         {
             "name": "filament/actions",
-            "version": "v3.2.114",
+            "version": "v3.2.115",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
-                "reference": "4cf93bf9ff04a76a9256ce6df88216583aeccb15"
+                "reference": "38c6eb00c7e3265907b37482c2dfd411c6f910c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/actions/zipball/4cf93bf9ff04a76a9256ce6df88216583aeccb15",
-                "reference": "4cf93bf9ff04a76a9256ce6df88216583aeccb15",
+                "url": "https://api.github.com/repos/filamentphp/actions/zipball/38c6eb00c7e3265907b37482c2dfd411c6f910c9",
+                "reference": "38c6eb00c7e3265907b37482c2dfd411c6f910c9",
                 "shasum": ""
             },
             "require": {
@@ -1787,20 +1787,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-09-17T08:30:20+00:00"
+            "time": "2024-09-27T13:16:08+00:00"
         },
         {
             "name": "filament/filament",
-            "version": "v3.2.114",
+            "version": "v3.2.115",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
-                "reference": "8d28c9756a341349a5d7a0694a66be7cc2c986c3"
+                "reference": "8d0f0e7101c14fe2f00490172452767f16b39f02"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/8d28c9756a341349a5d7a0694a66be7cc2c986c3",
-                "reference": "8d28c9756a341349a5d7a0694a66be7cc2c986c3",
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/8d0f0e7101c14fe2f00490172452767f16b39f02",
+                "reference": "8d0f0e7101c14fe2f00490172452767f16b39f02",
                 "shasum": ""
             },
             "require": {
@@ -1852,20 +1852,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-09-23T14:09:56+00:00"
+            "time": "2024-09-27T13:16:11+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v3.2.114",
+            "version": "v3.2.115",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "46a42dbc18f9273a3a59c54e94222fa62855c702"
+                "reference": "ffa33043ea0ee67a4eed58535687f87311e4256b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/46a42dbc18f9273a3a59c54e94222fa62855c702",
-                "reference": "46a42dbc18f9273a3a59c54e94222fa62855c702",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/ffa33043ea0ee67a4eed58535687f87311e4256b",
+                "reference": "ffa33043ea0ee67a4eed58535687f87311e4256b",
                 "shasum": ""
             },
             "require": {
@@ -1908,20 +1908,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-09-17T08:30:15+00:00"
+            "time": "2024-09-27T13:16:04+00:00"
         },
         {
             "name": "filament/infolists",
-            "version": "v3.2.114",
+            "version": "v3.2.115",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
-                "reference": "dd6e2319aea92c5444c52792c750edfeb057f62a"
+                "reference": "d4d3030644e3617aed252a5df3c385145ada0ec6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/dd6e2319aea92c5444c52792c750edfeb057f62a",
-                "reference": "dd6e2319aea92c5444c52792c750edfeb057f62a",
+                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/d4d3030644e3617aed252a5df3c385145ada0ec6",
+                "reference": "d4d3030644e3617aed252a5df3c385145ada0ec6",
                 "shasum": ""
             },
             "require": {
@@ -1959,20 +1959,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-09-17T08:30:15+00:00"
+            "time": "2024-09-27T13:16:10+00:00"
         },
         {
             "name": "filament/notifications",
-            "version": "v3.2.114",
+            "version": "v3.2.115",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
-                "reference": "03ea56e0729c98c65831ab0215285a7cb1c4117f"
+                "reference": "0272612e1d54e0520f8717b24c71b9b70f198c8f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/notifications/zipball/03ea56e0729c98c65831ab0215285a7cb1c4117f",
-                "reference": "03ea56e0729c98c65831ab0215285a7cb1c4117f",
+                "url": "https://api.github.com/repos/filamentphp/notifications/zipball/0272612e1d54e0520f8717b24c71b9b70f198c8f",
+                "reference": "0272612e1d54e0520f8717b24c71b9b70f198c8f",
                 "shasum": ""
             },
             "require": {
@@ -2011,20 +2011,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-07-31T11:53:11+00:00"
+            "time": "2024-09-27T13:16:07+00:00"
         },
         {
             "name": "filament/support",
-            "version": "v3.2.114",
+            "version": "v3.2.115",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
-                "reference": "2183eb1149ef9ab742256155adf2afedda322e6d"
+                "reference": "6dba51efd6f2a32db21bc8684cd663915ab0e4d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/support/zipball/2183eb1149ef9ab742256155adf2afedda322e6d",
-                "reference": "2183eb1149ef9ab742256155adf2afedda322e6d",
+                "url": "https://api.github.com/repos/filamentphp/support/zipball/6dba51efd6f2a32db21bc8684cd663915ab0e4d7",
+                "reference": "6dba51efd6f2a32db21bc8684cd663915ab0e4d7",
                 "shasum": ""
             },
             "require": {
@@ -2070,20 +2070,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-09-23T14:10:13+00:00"
+            "time": "2024-09-27T13:16:20+00:00"
         },
         {
             "name": "filament/tables",
-            "version": "v3.2.114",
+            "version": "v3.2.115",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
-                "reference": "75acf6f38a8ccfded57dc62bc3af0dd0bb04069d"
+                "reference": "07226fcd080f0f547aac31cf5117bfab192ea770"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/75acf6f38a8ccfded57dc62bc3af0dd0bb04069d",
-                "reference": "75acf6f38a8ccfded57dc62bc3af0dd0bb04069d",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/07226fcd080f0f547aac31cf5117bfab192ea770",
+                "reference": "07226fcd080f0f547aac31cf5117bfab192ea770",
                 "shasum": ""
             },
             "require": {
@@ -2122,11 +2122,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-09-17T08:30:46+00:00"
+            "time": "2024-09-27T13:16:23+00:00"
         },
         {
             "name": "filament/widgets",
-            "version": "v3.2.114",
+            "version": "v3.2.115",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
@@ -2981,16 +2981,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.24.1",
+            "version": "v11.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "e063fa80ac5818099f45a3a57dd803476c8f3a2a"
+                "reference": "b487a9089c0b1c71ac63bb6bc44fb4b00dc6da2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/e063fa80ac5818099f45a3a57dd803476c8f3a2a",
-                "reference": "e063fa80ac5818099f45a3a57dd803476c8f3a2a",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/b487a9089c0b1c71ac63bb6bc44fb4b00dc6da2e",
+                "reference": "b487a9089c0b1c71ac63bb6bc44fb4b00dc6da2e",
                 "shasum": ""
             },
             "require": {
@@ -3186,7 +3186,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-09-25T07:21:24+00:00"
+            "time": "2024-09-26T11:21:58+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -10000,16 +10000,16 @@
         },
         {
             "name": "pestphp/pest",
-            "version": "v3.2.3",
+            "version": "v3.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pestphp/pest.git",
-                "reference": "4e2987d438a3c3b2f291d2c991049544ab2f52bb"
+                "reference": "5fe79d9c18a674e9cce2f36f365516c26ae87b49"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pestphp/pest/zipball/4e2987d438a3c3b2f291d2c991049544ab2f52bb",
-                "reference": "4e2987d438a3c3b2f291d2c991049544ab2f52bb",
+                "url": "https://api.github.com/repos/pestphp/pest/zipball/5fe79d9c18a674e9cce2f36f365516c26ae87b49",
+                "reference": "5fe79d9c18a674e9cce2f36f365516c26ae87b49",
                 "shasum": ""
             },
             "require": {
@@ -10095,7 +10095,7 @@
             ],
             "support": {
                 "issues": "https://github.com/pestphp/pest/issues",
-                "source": "https://github.com/pestphp/pest/tree/v3.2.3"
+                "source": "https://github.com/pestphp/pest/tree/v3.2.4"
             },
             "funding": [
                 {
@@ -10107,7 +10107,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-25T15:19:39+00:00"
+            "time": "2024-09-26T22:53:39+00:00"
         },
         {
             "name": "pestphp/pest-plugin",
@@ -10810,16 +10810,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.31.0",
+            "version": "1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "249f15fb843bf240cf058372dad29e100cee6c17"
+                "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/249f15fb843bf240cf058372dad29e100cee6c17",
-                "reference": "249f15fb843bf240cf058372dad29e100cee6c17",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6ca22b154efdd9e3c68c56f5d94670920a1c19a4",
+                "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4",
                 "shasum": ""
             },
             "require": {
@@ -10851,22 +10851,22 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.31.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.32.0"
             },
-            "time": "2024-09-22T11:32:18+00:00"
+            "time": "2024-09-26T07:23:32+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.4",
+            "version": "1.12.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "ffa517cb918591b93acc9b95c0bebdcd0e4538bd"
+                "reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ffa517cb918591b93acc9b95c0bebdcd0e4538bd",
-                "reference": "ffa517cb918591b93acc9b95c0bebdcd0e4538bd",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17",
+                "reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17",
                 "shasum": ""
             },
             "require": {
@@ -10911,7 +10911,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-19T07:58:01+00:00"
+            "time": "2024-09-26T12:45:22+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

package-lock.json

@@ -5,15 +5,15 @@
     "packages": {
         "": {
             "devDependencies": {
-                "@tailwindcss/forms": "^0.5.7",
-                "@tailwindcss/typography": "^0.5.13",
-                "autoprefixer": "^10.4.19",
-                "axios": "^1.7.2",
+                "@tailwindcss/forms": "^0.5.9",
+                "@tailwindcss/typography": "^0.5.15",
+                "autoprefixer": "^10.4.20",
+                "axios": "^1.7.7",
                 "laravel-vite-plugin": "^1.0",
-                "postcss": "^8.4.38",
-                "postcss-nesting": "^12.1.5",
-                "tailwindcss": "^3.4.4",
-                "vite": "^5.3"
+                "postcss": "^8.4.47",
+                "postcss-nesting": "^13.0.0",
+                "tailwindcss": "^3.4.13",
+                "vite": "^5.4"
             }
         },
         "node_modules/@alloc/quick-lru": {
@@ -541,9 +541,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz",
-            "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.5.tgz",
+            "integrity": "sha512-SU5cvamg0Eyu/F+kLeMXS7GoahL+OoizlclVFX3l5Ql6yNlywJJ0OuqTzUx0v+aHhPHEB/56CT06GQrRrGNYww==",
             "cpu": [
                 "arm"
             ],
@@ -555,9 +555,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz",
-            "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.5.tgz",
+            "integrity": "sha512-S4pit5BP6E5R5C8S6tgU/drvgjtYW76FBuG6+ibG3tMvlD1h9LHVF9KmlmaUBQ8Obou7hEyS+0w+IR/VtxwNMQ==",
             "cpu": [
                 "arm64"
             ],
@@ -569,9 +569,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz",
-            "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.5.tgz",
+            "integrity": "sha512-250ZGg4ipTL0TGvLlfACkIxS9+KLtIbn7BCZjsZj88zSg2Lvu3Xdw6dhAhfe/FjjXPVNCtcSp+WZjVsD3a/Zlw==",
             "cpu": [
                 "arm64"
             ],
@@ -583,9 +583,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz",
-            "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.5.tgz",
+            "integrity": "sha512-D8brJEFg5D+QxFcW6jYANu+Rr9SlKtTenmsX5hOSzNYVrK5oLAEMTUgKWYJP+wdKyCdeSwnapLsn+OVRFycuQg==",
             "cpu": [
                 "x64"
             ],
@@ -597,9 +597,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz",
-            "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.5.tgz",
+            "integrity": "sha512-PNqXYmdNFyWNg0ma5LdY8wP+eQfdvyaBAojAXgO7/gs0Q/6TQJVXAXe8gwW9URjbS0YAammur0fynYGiWsKlXw==",
             "cpu": [
                 "arm"
             ],
@@ -611,9 +611,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz",
-            "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.5.tgz",
+            "integrity": "sha512-kSSCZOKz3HqlrEuwKd9TYv7vxPYD77vHSUvM2y0YaTGnFc8AdI5TTQRrM1yIp3tXCKrSL9A7JLoILjtad5t8pQ==",
             "cpu": [
                 "arm"
             ],
@@ -625,9 +625,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz",
-            "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.5.tgz",
+            "integrity": "sha512-oTXQeJHRbOnwRnRffb6bmqmUugz0glXaPyspp4gbQOPVApdpRrY/j7KP3lr7M8kTfQTyrBUzFjj5EuHAhqH4/w==",
             "cpu": [
                 "arm64"
             ],
@@ -639,9 +639,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz",
-            "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.5.tgz",
+            "integrity": "sha512-qnOTIIs6tIGFKCHdhYitgC2XQ2X25InIbZFor5wh+mALH84qnFHvc+vmWUpyX97B0hNvwNUL4B+MB8vJvH65Fw==",
             "cpu": [
                 "arm64"
             ],
@@ -653,9 +653,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz",
-            "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.5.tgz",
+            "integrity": "sha512-TMYu+DUdNlgBXING13rHSfUc3Ky5nLPbWs4bFnT+R6Vu3OvXkTkixvvBKk8uO4MT5Ab6lC3U7x8S8El2q5o56w==",
             "cpu": [
                 "ppc64"
             ],
@@ -667,9 +667,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz",
-            "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.5.tgz",
+            "integrity": "sha512-PTQq1Kz22ZRvuhr3uURH+U/Q/a0pbxJoICGSprNLAoBEkyD3Sh9qP5I0Asn0y0wejXQBbsVMRZRxlbGFD9OK4A==",
             "cpu": [
                 "riscv64"
             ],
@@ -681,9 +681,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz",
-            "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.5.tgz",
+            "integrity": "sha512-bR5nCojtpuMss6TDEmf/jnBnzlo+6n1UhgwqUvRoe4VIotC7FG1IKkyJbwsT7JDsF2jxR+NTnuOwiGv0hLyDoQ==",
             "cpu": [
                 "s390x"
             ],
@@ -695,9 +695,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz",
-            "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.5.tgz",
+            "integrity": "sha512-N0jPPhHjGShcB9/XXZQWuWBKZQnC1F36Ce3sDqWpujsGjDz/CQtOL9LgTrJ+rJC8MJeesMWrMWVLKKNR/tMOCA==",
             "cpu": [
                 "x64"
             ],
@@ -709,9 +709,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz",
-            "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.5.tgz",
+            "integrity": "sha512-uBa2e28ohzNNwjr6Uxm4XyaA1M/8aTgfF2T7UIlElLaeXkgpmIJ2EitVNQxjO9xLLLy60YqAgKn/AqSpCUkE9g==",
             "cpu": [
                 "x64"
             ],
@@ -723,9 +723,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz",
-            "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.5.tgz",
+            "integrity": "sha512-RXT8S1HP8AFN/Kr3tg4fuYrNxZ/pZf1HemC5Tsddc6HzgGnJm0+Lh5rAHJkDuW3StI0ynNXukidROMXYl6ew8w==",
             "cpu": [
                 "arm64"
             ],
@@ -737,9 +737,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz",
-            "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.5.tgz",
+            "integrity": "sha512-ElTYOh50InL8kzyUD6XsnPit7jYCKrphmddKAe1/Ytt74apOxDq5YEcbsiKs0fR3vff3jEneMM+3I7jbqaMyBg==",
             "cpu": [
                 "ia32"
             ],
@@ -751,9 +751,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz",
-            "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.5.tgz",
+            "integrity": "sha512-+lvL/4mQxSV8MukpkKyyvfwhH266COcWlXE/1qxwN08ajovta3459zrjLghYMgDerlzNwLAcFpvU+WWE5y6nAQ==",
             "cpu": [
                 "x64"
             ],
@@ -794,9 +794,9 @@
             }
         },
         "node_modules/@types/estree": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-            "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+            "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
             "dev": true,
             "license": "MIT"
         },
@@ -1745,9 +1745,9 @@
             }
         },
         "node_modules/package-json-from-dist": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
-            "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+            "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
             "dev": true,
             "license": "BlueOak-1.0.0"
         },
@@ -1982,9 +1982,9 @@
             }
         },
         "node_modules/postcss-nesting": {
-            "version": "12.1.5",
-            "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-12.1.5.tgz",
-            "integrity": "sha512-N1NgI1PDCiAGWPTYrwqm8wpjv0bgDmkYHH72pNsqTCv9CObxjxftdYu6AKtGN+pnJa7FQjMm3v4sp8QJbFsYdQ==",
+            "version": "13.0.0",
+            "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-13.0.0.tgz",
+            "integrity": "sha512-TCGQOizyqvEkdeTPM+t6NYwJ3EJszYE/8t8ILxw/YoeUvz2rz7aM8XTAmBWh9/DJjfaaabL88fWrsVHSPF2zgA==",
             "dev": true,
             "funding": [
                 {
@@ -1998,21 +1998,21 @@
             ],
             "license": "MIT-0",
             "dependencies": {
-                "@csstools/selector-resolve-nested": "^1.1.0",
-                "@csstools/selector-specificity": "^3.1.1",
+                "@csstools/selector-resolve-nested": "^2.0.0",
+                "@csstools/selector-specificity": "^4.0.0",
                 "postcss-selector-parser": "^6.1.0"
             },
             "engines": {
-                "node": "^14 || ^16 || >=18"
+                "node": ">=18"
             },
             "peerDependencies": {
                 "postcss": "^8.4"
             }
         },
         "node_modules/postcss-nesting/node_modules/@csstools/selector-resolve-nested": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-1.1.0.tgz",
-            "integrity": "sha512-uWvSaeRcHyeNenKg8tp17EVDRkpflmdyvbE0DHo6D/GdBb6PDnCYYU6gRpXhtICMGMcahQmj2zGxwFM/WC8hCg==",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-2.0.0.tgz",
+            "integrity": "sha512-oklSrRvOxNeeOW1yARd4WNCs/D09cQjunGZUgSq6vM8GpzFswN+8rBZyJA29YFZhOTQ6GFzxgLDNtVbt9wPZMA==",
             "dev": true,
             "funding": [
                 {
@@ -2026,16 +2026,16 @@
             ],
             "license": "MIT-0",
             "engines": {
-                "node": "^14 || ^16 || >=18"
+                "node": ">=18"
             },
             "peerDependencies": {
-                "postcss-selector-parser": "^6.0.13"
+                "postcss-selector-parser": "^6.1.0"
             }
         },
         "node_modules/postcss-nesting/node_modules/@csstools/selector-specificity": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.1.1.tgz",
-            "integrity": "sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==",
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-4.0.0.tgz",
+            "integrity": "sha512-189nelqtPd8++phaHNwYovKZI0FOzH1vQEE3QhHHkNIGrg5fSs9CbYP3RvfEH5geztnIA9Jwq91wyOIwAW5JIQ==",
             "dev": true,
             "funding": [
                 {
@@ -2049,10 +2049,10 @@
             ],
             "license": "MIT-0",
             "engines": {
-                "node": "^14 || ^16 || >=18"
+                "node": ">=18"
             },
             "peerDependencies": {
-                "postcss-selector-parser": "^6.0.13"
+                "postcss-selector-parser": "^6.1.0"
             }
         },
         "node_modules/postcss-nesting/node_modules/postcss-selector-parser": {
@@ -2171,13 +2171,13 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.22.4",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz",
-            "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.5.tgz",
+            "integrity": "sha512-WoinX7GeQOFMGznEcWA1WrTQCd/tpEbMkc3nuMs9BT0CPjMdSjPMTVClwWd4pgSQwJdP65SK9mTCNvItlr5o7w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@types/estree": "1.0.5"
+                "@types/estree": "1.0.6"
             },
             "bin": {
                 "rollup": "dist/bin/rollup"
@@ -2187,22 +2187,22 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.22.4",
-                "@rollup/rollup-android-arm64": "4.22.4",
-                "@rollup/rollup-darwin-arm64": "4.22.4",
-                "@rollup/rollup-darwin-x64": "4.22.4",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.22.4",
-                "@rollup/rollup-linux-arm-musleabihf": "4.22.4",
-                "@rollup/rollup-linux-arm64-gnu": "4.22.4",
-                "@rollup/rollup-linux-arm64-musl": "4.22.4",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4",
-                "@rollup/rollup-linux-riscv64-gnu": "4.22.4",
-                "@rollup/rollup-linux-s390x-gnu": "4.22.4",
-                "@rollup/rollup-linux-x64-gnu": "4.22.4",
-                "@rollup/rollup-linux-x64-musl": "4.22.4",
-                "@rollup/rollup-win32-arm64-msvc": "4.22.4",
-                "@rollup/rollup-win32-ia32-msvc": "4.22.4",
-                "@rollup/rollup-win32-x64-msvc": "4.22.4",
+                "@rollup/rollup-android-arm-eabi": "4.22.5",
+                "@rollup/rollup-android-arm64": "4.22.5",
+                "@rollup/rollup-darwin-arm64": "4.22.5",
+                "@rollup/rollup-darwin-x64": "4.22.5",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.22.5",
+                "@rollup/rollup-linux-arm-musleabihf": "4.22.5",
+                "@rollup/rollup-linux-arm64-gnu": "4.22.5",
+                "@rollup/rollup-linux-arm64-musl": "4.22.5",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.22.5",
+                "@rollup/rollup-linux-riscv64-gnu": "4.22.5",
+                "@rollup/rollup-linux-s390x-gnu": "4.22.5",
+                "@rollup/rollup-linux-x64-gnu": "4.22.5",
+                "@rollup/rollup-linux-x64-musl": "4.22.5",
+                "@rollup/rollup-win32-arm64-msvc": "4.22.5",
+                "@rollup/rollup-win32-ia32-msvc": "4.22.5",
+                "@rollup/rollup-win32-x64-msvc": "4.22.5",
                 "fsevents": "~2.3.2"
             }
         },
@@ -2512,9 +2512,9 @@
             "license": "Apache-2.0"
         },
         "node_modules/update-browserslist-db": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-            "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+            "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
             "dev": true,
             "funding": [
                 {
@@ -2532,8 +2532,8 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "escalade": "^3.1.2",
-                "picocolors": "^1.0.1"
+                "escalade": "^3.2.0",
+                "picocolors": "^1.1.0"
             },
             "bin": {
                 "update-browserslist-db": "cli.js"

package.json

@@ -6,14 +6,14 @@
         "build": "vite build"
     },
     "devDependencies": {
-        "@tailwindcss/forms": "^0.5.7",
-        "@tailwindcss/typography": "^0.5.13",
-        "autoprefixer": "^10.4.19",
-        "axios": "^1.7.2",
+        "@tailwindcss/forms": "^0.5.9",
+        "@tailwindcss/typography": "^0.5.15",
+        "autoprefixer": "^10.4.20",
+        "axios": "^1.7.7",
         "laravel-vite-plugin": "^1.0",
-        "postcss": "^8.4.38",
-        "postcss-nesting": "^12.1.5",
-        "tailwindcss": "^3.4.4",
-        "vite": "^5.3"
+        "postcss": "^8.4.47",
+        "postcss-nesting": "^13.0.0",
+        "tailwindcss": "^3.4.13",
+        "vite": "^5.4"
     }
 }

tests/Feature/Reports/AccountBalancesReportTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use App\Facades\Accounting;
+use App\Facades\Reporting;
 use App\Factories\ReportDateFactory;
 use App\Filament\Company\Pages\Reports\AccountBalances;
 use App\Models\Accounting\Transaction;
@@ -42,16 +43,13 @@ it('correctly builds an account balances report for the current fiscal year', fu
 
     $defaultBankAccountAccount = $testCompany->default->bankAccount->account;
 
-    $fields = $defaultBankAccountAccount->category->getRelevantBalanceFields();
-
     $expectedBalances = Accounting::getBalances(
         $defaultBankAccountAccount,
         $defaultStartDate->toDateString(),
         $defaultEndDate->toDateString(),
-        $fields
     );
 
-    $formattedExpectedBalances = formatReportBalances($expectedBalances);
+    $formattedExpectedBalances = Reporting::formatBalances($expectedBalances);
 
     livewire(AccountBalances::class)
         ->assertFormSet([
@@ -111,16 +109,13 @@ it('correctly builds an account balances report for the previous fiscal year', f
 
     $defaultBankAccountAccount = $testCompany->default->bankAccount->account;
 
-    $fields = $defaultBankAccountAccount->category->getRelevantBalanceFields();
-
     $expectedBalancesSubYear = Accounting::getBalances(
         $defaultBankAccountAccount,
         $defaultStartDate->subYear()->startOfYear()->toDateString(),
         $defaultEndDate->subYear()->endOfYear()->toDateString(),
-        $fields
     );
 
-    $formattedExpectedBalancesSubYear = formatReportBalances($expectedBalancesSubYear);
+    $formattedExpectedBalancesSubYear = Reporting::formatBalances($expectedBalancesSubYear);
 
     livewire(AccountBalances::class)
         ->assertFormSet([

tests/Feature/Reports/TrialBalanceReportTest.php

@@ -1,11 +1,10 @@
 <?php
 
 use App\Facades\Accounting;
+use App\Facades\Reporting;
 use App\Factories\ReportDateFactory;
 use App\Filament\Company\Pages\Reports\TrialBalance;
 use App\Models\Accounting\Transaction;
-use App\Services\AccountService;
-use App\Services\ReportService;
 
 use function Pest\Livewire\livewire;
 
@@ -47,18 +46,15 @@ it('correctly builds a standard trial balance report', function () {
     $defaultBankAccountAccount = $testCompany->default->bankAccount->account;
     $earliestTransactionDate = $reportDates->refresh()->earliestTransactionDate;
 
-    $fields = $defaultBankAccountAccount->category->getRelevantBalanceFields();
-
     $expectedBalances = Accounting::getBalances(
         $defaultBankAccountAccount,
         $earliestTransactionDate->toDateString(),
         $defaultEndDate->toDateString(),
-        $fields
     );
 
-    $calculatedTrialBalances = calculateTrialBalances($defaultBankAccountAccount->category, $expectedBalances['ending_balance']);
+    $calculatedTrialBalances = Reporting::calculateTrialBalances($defaultBankAccountAccount->category, $expectedBalances['ending_balance']);
 
-    $formattedExpectedBalances = formatReportBalances($calculatedTrialBalances);
+    $formattedExpectedBalances = Reporting::formatBalances($calculatedTrialBalances);
 
     livewire(TrialBalance::class)
         ->assertFormSet([
@@ -74,6 +70,7 @@ it('correctly builds a standard trial balance report', function () {
         ->call('applyFilters')
         ->assertDontSeeText('Retained Earnings')
         ->assertSeeTextInOrder([
+            $defaultBankAccountAccount->code,
             $defaultBankAccountAccount->name,
             $formattedExpectedBalances->debitBalance,
             $formattedExpectedBalances->creditBalance,
@@ -117,23 +114,19 @@ it('correctly builds a post-closing trial balance report', function () {
         ->create();
 
     $defaultBankAccountAccount = $testCompany->default->bankAccount->account;
-    $earliestTransactionDate = $reportDates->refresh()->earliestTransactionDate->toImmutable();
-
-    $fields = $defaultBankAccountAccount->category->getRelevantBalanceFields();
-
-    $accountService = app(AccountService::class);
-
-    $balances = $accountService->getAccountBalances($earliestTransactionDate->toDateTimeString(), $defaultEndDate->toDateTimeString(), [$defaultBankAccountAccount->id]);
-
-    $account = $balances->find($defaultBankAccountAccount->id);
+    $earliestTransactionDate = $reportDates->refresh()->earliestTransactionDate;
 
-    $reportService = app(ReportService::class);
+    $expectedBalances = Accounting::getBalances(
+        $defaultBankAccountAccount,
+        $earliestTransactionDate->toDateString(),
+        $defaultEndDate->toDateString(),
+    );
 
-    $calculatedBalances = $reportService->calculateAccountBalances($account, $account->category);
+    $calculatedTrialBalances = Reporting::calculateTrialBalances($defaultBankAccountAccount->category, $expectedBalances['ending_balance']);
 
-    $calculatedTrialBalances = calculateTrialBalances($defaultBankAccountAccount->category, $calculatedBalances['ending_balance']);
+    $formattedExpectedBalances = Reporting::formatBalances($calculatedTrialBalances);
 
-    $formattedExpectedBalances = formatReportBalances($calculatedTrialBalances);
+    $formattedRetainedEarningsBalances = Reporting::getRetainedEarningsBalances($earliestTransactionDate->toDateTimeString(), $defaultEndDate->toDateTimeString());
 
     // Use Livewire to assert the report's filters and displayed data
     livewire(TrialBalance::class)
@@ -149,11 +142,28 @@ it('correctly builds a post-closing trial balance report', function () {
             'dateRange' => $defaultDateRange,
             'asOfDate' => $defaultEndDate->toDateString(),
         ])
-        ->assertSeeText('Retained Earnings')
         ->assertSeeTextInOrder([
+            $defaultBankAccountAccount->code,
             $defaultBankAccountAccount->name,
             $formattedExpectedBalances->debitBalance,
             $formattedExpectedBalances->creditBalance,
         ])
+        ->assertSeeText('Retained Earnings')
+        ->assertSeeTextInOrder([
+            'RE',
+            'Retained Earnings',
+            $formattedRetainedEarningsBalances->debitBalance,
+            $formattedRetainedEarningsBalances->creditBalance,
+        ])
+        ->assertSeeTextInOrder([
+            'Total Revenue',
+            '$0.00',
+            '$0.00',
+        ])
+        ->assertSeeTextInOrder([
+            'Total Expenses',
+            '$0.00',
+            '$0.00',
+        ])
         ->assertReportTableData();
 });

tests/Helpers/helpers.php

@@ -1,11 +1,8 @@
 <?php
 
-use App\DTO\AccountBalanceDTO;
-use App\Enums\Accounting\AccountCategory;
 use App\Enums\Setting\EntityType;
 use App\Filament\Company\Pages\CreateCompany;
 use App\Models\Company;
-use App\Services\ReportService;
 
 use function Pest\Livewire\livewire;
 
@@ -25,31 +22,3 @@ function createCompany(string $name): Company
 
     return auth()->user()->currentCompany;
 }
-
-function calculateRetainedEarningsBalances(ReportService $reportService, $startDate, $endDate): AccountBalanceDTO
-{
-    $retainedEarningsAmount = $reportService->calculateRetainedEarnings($startDate, $endDate)->getAmount();
-
-    $isCredit = $retainedEarningsAmount >= 0;
-    $retainedEarningsDebitAmount = $isCredit ? 0 : abs($retainedEarningsAmount);
-    $retainedEarningsCreditAmount = $isCredit ? $retainedEarningsAmount : 0;
-
-    return $reportService->formatBalances([
-        'debit_balance' => $retainedEarningsDebitAmount,
-        'credit_balance' => $retainedEarningsCreditAmount,
-    ]);
-}
-
-function formatReportBalances(array $balances): AccountBalanceDTO
-{
-    $reportService = app(ReportService::class);
-
-    return $reportService->formatBalances($balances);
-}
-
-function calculateTrialBalances(AccountCategory $accountCategory, int $endingBalance): array
-{
-    $reportService = app(ReportService::class);
-
-    return $reportService->calculateTrialBalance($accountCategory, $endingBalance);
-}