wip

app/Contracts/ExportableReport.php

@@ -2,12 +2,17 @@
 
 namespace App\Contracts;
 
+use App\DTO\ReportCategoryDTO;
+
 interface ExportableReport
 {
     public function getTitle(): string;
 
     public function getHeaders(): array;
 
+    /**
+     * @return ReportCategoryDTO[]
+     */
     public function getCategories(): array;
 
     public function getOverallTotals(): array;

app/DTO/ReportCategoryDTO.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\DTO;
+
+class ReportCategoryDTO
+{
+    /**
+     * @param  string[]  $header
+     * @param  string[][]  $data
+     * @param  string[]  $summary
+     */
+    public function __construct(
+        public array $header,
+        public array $data,
+        public array $summary,
+    ) {
+    }
+}

app/Filament/Company/Pages/Accounting/AccountChart.php

@@ -10,6 +10,7 @@ use App\Utilities\Currency\CurrencyAccessor;
 use Filament\Actions\Action;
 use Filament\Actions\CreateAction;
 use Filament\Actions\EditAction;
+use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Component;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Textarea;
@@ -98,6 +99,7 @@ class AccountChart extends Page
                 $this->getNameFormComponent(),
                 $this->getCurrencyFormComponent(),
                 $this->getDescriptionFormComponent(),
+                $this->getArchiveFormComponent(),
             ]);
     }
 
@@ -161,6 +163,16 @@ class AccountChart extends Page
             ->autosize();
     }
 
+    protected function getArchiveFormComponent(): Component
+    {
+        return Checkbox::make('archived')
+            ->label('Archive Account')
+            ->helperText('Archived accounts will not be available for selection in transactions.')
+            ->hidden(static function (string $operation): bool {
+                return $operation === 'create';
+            });
+    }
+
     private function getChartSubtypeOptions($useActiveTab = true): array
     {
         $subtypes = $useActiveTab ?

app/Filament/Company/Pages/Accounting/Transactions.php

@@ -11,6 +11,7 @@ use App\Filament\Company\Pages\Service\ConnectedAccount;
 use App\Filament\Forms\Components\DateRangeSelect;
 use App\Filament\Forms\Components\JournalEntryRepeater;
 use App\Models\Accounting\Account;
+use App\Models\Accounting\JournalEntry;
 use App\Models\Accounting\Transaction;
 use App\Models\Banking\BankAccount;
 use App\Models\Company;
@@ -150,7 +151,7 @@ class Transactions extends Page implements HasTable
                     ->label('Description'),
                 Forms\Components\Select::make('bank_account_id')
                     ->label('Account')
-                    ->options(fn () => $this->getBankAccountOptions())
+                    ->options(fn (?Transaction $transaction) => $this->getBankAccountOptions(currentBankAccountId: $transaction?->bank_account_id))
                     ->live()
                     ->searchable()
                     ->afterStateUpdated(function (Set $set, $state, $old, Get $get) {
@@ -180,7 +181,7 @@ class Transactions extends Page implements HasTable
                     ->required(),
                 Forms\Components\Select::make('account_id')
                     ->label('Category')
-                    ->options(fn (Forms\Get $get) => $this->getChartAccountOptions(type: TransactionType::parse($get('type')), nominalAccountsOnly: true))
+                    ->options(fn (Forms\Get $get, ?Transaction $transaction) => $this->getChartAccountOptions(type: TransactionType::parse($get('type')), nominalAccountsOnly: true, currentAccountId: $transaction?->account_id))
                     ->searchable()
                     ->preload()
                     ->required(),
@@ -225,12 +226,15 @@ class Transactions extends Page implements HasTable
                     ->sortable()
                     ->localizeDate(),
                 Tables\Columns\TextColumn::make('description')
+                    ->label('Description')
                     ->limit(30)
-                    ->label('Description'),
+                    ->toggleable(),
                 Tables\Columns\TextColumn::make('bankAccount.account.name')
-                    ->label('Account'),
+                    ->label('Account')
+                    ->toggleable(),
                 Tables\Columns\TextColumn::make('account.name')
                     ->label('Category')
+                    ->toggleable()
                     ->state(static fn (Transaction $transaction) => $transaction->account->name ?? 'Journal Entry'),
                 Tables\Columns\TextColumn::make('amount')
                     ->label('Amount')
@@ -254,7 +258,7 @@ class Transactions extends Page implements HasTable
                             ->schema([
                                 Select::make('account_id')
                                     ->label('Category')
-                                    ->options(fn () => $this->getChartAccountOptions(nominalAccountsOnly: true))
+                                    ->options(fn () => $this->getChartAccountOptions(nominalAccountsOnly: true, onlyWithTransactions: true))
                                     ->multiple()
                                     ->searchable(),
                                 Select::make('reviewed')
@@ -559,7 +563,7 @@ class Transactions extends Page implements HasTable
                 ->label('Description'),
             Select::make('account_id')
                 ->label('Account')
-                ->options(fn (): array => $this->getChartAccountOptions())
+                ->options(fn (?JournalEntry $journalEntry): array => $this->getChartAccountOptions(currentAccountId: $journalEntry?->account_id))
                 ->live()
                 ->softRequired()
                 ->searchable(),
@@ -709,8 +713,11 @@ class Transactions extends Page implements HasTable
         return 'uncategorized';
     }
 
-    protected function getChartAccountOptions(?TransactionType $type = null, bool $nominalAccountsOnly = false): array
+    protected function getChartAccountOptions(?TransactionType $type = null, ?bool $nominalAccountsOnly = null, ?bool $onlyWithTransactions = null, ?int $currentAccountId = null): array
     {
+        $onlyWithTransactions ??= false;
+        $nominalAccountsOnly ??= false;
+
         $excludedCategory = match ($type) {
             TransactionType::Deposit => AccountCategory::Expense,
             TransactionType::Withdrawal => AccountCategory::Revenue,
@@ -720,14 +727,20 @@ class Transactions extends Page implements HasTable
         return Account::query()
             ->when($nominalAccountsOnly, fn (Builder $query) => $query->doesntHave('bankAccount'))
             ->when($excludedCategory, fn (Builder $query) => $query->whereNot('category', $excludedCategory))
+            ->when($onlyWithTransactions, fn (Builder $query) => $query->has('transactions'))
+            ->where(function (Builder $query) use ($currentAccountId) {
+                $query->where('archived', false)
+                    ->orWhere('id', $currentAccountId);
+            })
             ->get()
             ->groupBy(fn (Account $account) => $account->category->getPluralLabel())
             ->map(fn (Collection $accounts, string $category) => $accounts->pluck('name', 'id'))
             ->toArray();
     }
 
-    protected function getBankAccountOptions(?bool $onlyWithTransactions = null, bool $isFilter = false): array
+    protected function getBankAccountOptions(?bool $onlyWithTransactions = null, ?bool $isFilter = null, ?int $currentBankAccountId = null): array
     {
+        $isFilter ??= false;
         $onlyWithTransactions ??= false;
 
         $options = $isFilter ? [
@@ -735,6 +748,17 @@ class Transactions extends Page implements HasTable
         ] : [];
 
         $bankAccountOptions = BankAccount::with('account.subtype')
+            ->whereHas('account', function (Builder $query) use ($isFilter, $currentBankAccountId) {
+                if ($isFilter === false) {
+                    $query->where('archived', false);
+                }
+
+                if ($currentBankAccountId) {
+                    $query->orWhereHas('bankAccount', function (Builder $query) use ($currentBankAccountId) {
+                        $query->where('id', $currentBankAccountId);
+                    });
+                }
+            })
             ->when($onlyWithTransactions, fn (Builder $query) => $query->has('transactions'))
             ->get()
             ->groupBy('account.subtype.name')

app/Filament/Company/Pages/Reports/AccountBalances.php

@@ -6,8 +6,12 @@ use App\Contracts\ExportableReport;
 use App\Services\ExportService;
 use App\Services\ReportService;
 use App\Transformers\AccountBalanceReportTransformer;
+use Filament\Forms\Components\Checkbox;
+use Filament\Forms\Components\CheckboxList;
+use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Split;
 use Filament\Forms\Form;
+use Guava\FilamentClusters\Forms\Cluster;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class AccountBalances extends BaseReportPage
@@ -33,18 +37,29 @@ class AccountBalances extends BaseReportPage
     public function loadReportData(): void
     {
         $reportDTO = $this->reportService->buildAccountBalanceReport($this->startDate, $this->endDate);
-        $this->accountBalanceReport = new AccountBalanceReportTransformer($reportDTO);
+        $options = array_fill_keys($this->options, true);
+        $this->accountBalanceReport = new AccountBalanceReportTransformer($reportDTO, $options);
     }
 
     public function form(Form $form): Form
     {
         return $form
+            ->inlineLabel()
             ->schema([
                 Split::make([
                     $this->getDateRangeFormComponent(),
-                    $this->getStartDateFormComponent(),
-                    $this->getEndDateFormComponent(),
+                    Cluster::make([
+                        $this->getStartDateFormComponent(),
+                        $this->getEndDateFormComponent(),
+                    ])
+                        ->hiddenLabel(),
                 ])->live(),
+                CheckboxList::make('options')
+                    ->options([
+                        'showAccountCode' => 'Show Account Code',
+                        'showZeroBalances' => 'Show Zero Balances',
+                    ])
+                    ->columns(2),
             ]);
     }
 

app/Filament/Company/Pages/Reports/BaseReportPage.php

@@ -29,6 +29,8 @@ abstract class BaseReportPage extends Page
 
     public Company $company;
 
+    public array $options = [];
+
     public function mount(): void
     {
         $this->company = auth()->user()->currentCompany;
@@ -36,6 +38,7 @@ abstract class BaseReportPage extends Page
         $this->fiscalYearEndDate = $this->company->locale->fiscalYearEndDate();
         $this->dateRange = $this->getDefaultDateRange();
         $this->setDateRange(Carbon::parse($this->fiscalYearStartDate), Carbon::parse($this->fiscalYearEndDate));
+        $this->options = ['showAccountCode'];
 
         $this->loadReportData();
     }

app/Filament/Company/Resources/Banking/AccountResource.php

@@ -11,6 +11,7 @@ use App\Models\Banking\BankAccount;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
+use Filament\Support\Enums\Alignment;
 use Filament\Support\Enums\FontWeight;
 use Filament\Tables;
 use Filament\Tables\Table;
@@ -111,12 +112,16 @@ class AccountResource extends Resource
                     ->icon(static fn (BankAccount $record) => $record->isEnabled() ? 'heroicon-o-lock-closed' : null)
                     ->tooltip(static fn (BankAccount $record) => $record->isEnabled() ? 'Default Account' : null)
                     ->iconPosition('after')
-                    ->description(static fn (BankAccount $record) => $record->mask ?? null)
-                    ->sortable(),
+                    ->description(static fn (BankAccount $record) => $record->mask ?? null),
+                Tables\Columns\TextColumn::make('account.subtype.name')
+                    ->localizeLabel('Subtype')
+                    ->sortable()
+                    ->toggleable(),
                 Tables\Columns\TextColumn::make('account.ending_balance')
-                    ->localizeLabel('Current Balance')
+                    ->localizeLabel('Ending Balance')
                     ->state(static fn (BankAccount $record) => $record->account->ending_balance->convert()->formatWithCode())
-                    ->sortable(),
+                    ->toggleable()
+                    ->alignment(Alignment::End),
             ])
             ->filters([
                 //

app/Listeners/ConfigureChartOfAccounts.php

@@ -72,7 +72,6 @@ class ConfigureChartOfAccounts
                     'name' => $accountName,
                     'currency_code' => CurrencyAccessor::getDefaultCurrency(),
                     'description' => $accountDetails['description'] ?? 'No description available.',
-                    'active' => true,
                     'default' => true,
                     'created_by' => $company->owner->id,
                     'updated_by' => $company->owner->id,

app/Models/Accounting/Account.php

@@ -39,7 +39,7 @@ class Account extends Model
         'name',
         'currency_code',
         'description',
-        'active',
+        'archived',
         'default',
         'bank_account_id',
         'created_by',
@@ -49,7 +49,7 @@ class Account extends Model
     protected $casts = [
         'category' => AccountCategory::class,
         'type' => AccountType::class,
-        'active' => 'boolean',
+        'archived' => 'boolean',
         'default' => 'boolean',
     ];
 

app/Models/Company.php

@@ -54,8 +54,6 @@ class Company extends FilamentCompaniesCompany implements HasAvatar
      * @var array<string, class-string>
      */
     protected $dispatchesEvents = [
-        'created' => CompanyCreated::class,
-        'updated' => CompanyUpdated::class,
         'deleted' => CompanyDeleted::class,
     ];
 

app/Observers/AccountObserver.php

@@ -7,12 +7,14 @@ use App\Enums\Accounting\AccountType;
 use App\Models\Accounting\Account;
 use App\Models\Accounting\AccountSubtype;
 use App\Utilities\Accounting\AccountCode;
+use App\Utilities\Currency\CurrencyAccessor;
 
 class AccountObserver
 {
     public function creating(Account $account): void
     {
         $this->setCategoryAndType($account, true);
+        $this->setCurrency($account);
     }
 
     public function updating(Account $account): void
@@ -35,6 +37,13 @@ class AccountObserver
         }
     }
 
+    private function setCurrency(Account $account): void
+    {
+        if ($account->currency_code === null && $account->subtype->multi_currency === false) {
+            $account->currency_code = CurrencyAccessor::getDefaultCurrency();
+        }
+    }
+
     private function setFieldsForBankAccount(Account $account): void
     {
         $generatedAccountCode = AccountCode::generate($account->subtype);

app/Providers/EventServiceProvider.php

@@ -1,88 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use App\Events\CompanyConfigured;
-use App\Events\CompanyDefaultEvent;
-use App\Events\CompanyDefaultUpdated;
-use App\Events\CompanyGenerated;
-use App\Events\CurrencyRateChanged;
-use App\Events\DefaultCurrencyChanged;
-use App\Events\PlaidSuccess;
-use App\Events\StartTransactionImport;
-use App\Listeners\ConfigureChartOfAccounts;
-use App\Listeners\ConfigureCompanyDefault;
-use App\Listeners\CreateCompanyDefaults;
-use App\Listeners\CreateConnectedAccount;
-use App\Listeners\HandleTransactionImport;
-use App\Listeners\SyncAssociatedModels;
-use App\Listeners\SyncWithCompanyDefaults;
-use App\Listeners\UpdateAccountBalances;
-use App\Listeners\UpdateCurrencyRates;
-use Illuminate\Auth\Events\Registered;
-use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
-use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-
-class EventServiceProvider extends ServiceProvider
-{
-    /**
-     * The event to listener mappings for the application.
-     *
-     * @var array<class-string, array<int, class-string>>
-     */
-    protected $listen = [
-        Registered::class => [
-            SendEmailVerificationNotification::class,
-        ],
-        CompanyDefaultEvent::class => [
-            SyncWithCompanyDefaults::class,
-        ],
-        CompanyDefaultUpdated::class => [
-            SyncAssociatedModels::class,
-        ],
-        CompanyConfigured::class => [
-            ConfigureCompanyDefault::class,
-        ],
-        CompanyGenerated::class => [
-            CreateCompanyDefaults::class,
-            ConfigureChartOfAccounts::class,
-        ],
-        DefaultCurrencyChanged::class => [
-            UpdateCurrencyRates::class,
-        ],
-        CurrencyRateChanged::class => [
-            UpdateAccountBalances::class,
-        ],
-        PlaidSuccess::class => [
-            CreateConnectedAccount::class,
-        ],
-        StartTransactionImport::class => [
-            HandleTransactionImport::class,
-        ],
-    ];
-
-    /**
-     * The model observers to register.
-     *
-     * @var array<string, string|object|array<int, string|object>>
-     */
-    protected $observers = [
-        // Currency::class => [CurrencyObserver::class],
-    ];
-
-    /**
-     * Register any events for your application.
-     */
-    public function boot(): void
-    {
-        //
-    }
-
-    /**
-     * Determine if events and listeners should be automatically discovered.
-     */
-    public function shouldDiscoverEvents(): bool
-    {
-        return false;
-    }
-}

app/Repositories/Banking/ConnectedBankAccountRepository.php

@@ -29,7 +29,6 @@ class ConnectedBankAccountRepository
             'currency_code' => $connectedBankAccount->currency_code,
             'description' => $connectedBankAccount->name,
             'subtype_id' => $accountSubtype->id,
-            'active' => true,
         ]);
     }
 }

app/Services/ExportService.php

@@ -30,13 +30,13 @@ class ExportService
             fputcsv($file, $report->getHeaders());
 
             foreach ($report->getCategories() as $category) {
-                fputcsv($file, $category['header']);
+                fputcsv($file, $category->header);
 
-                foreach ($category['data'] as $accountRow) {
+                foreach ($category->data as $accountRow) {
                     fputcsv($file, $accountRow);
                 }
 
-                fputcsv($file, $category['summary']);
+                fputcsv($file, $category->summary);
                 fputcsv($file, []); // Empty row for spacing
             }
 

app/Transformers/AccountBalanceReportTransformer.php

@@ -3,6 +3,7 @@
 namespace App\Transformers;
 
 use App\DTO\AccountDTO;
+use App\DTO\ReportCategoryDTO;
 
 class AccountBalanceReportTransformer extends BaseReportTransformer
 {
@@ -13,52 +14,95 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
 
     public function getHeaders(): array
     {
-        return ['', 'Account', 'Starting Balance', 'Debit', 'Credit', 'Net Movement', 'Ending Balance'];
+        $headers = ['Account', 'Starting Balance', 'Debit', 'Credit', 'Net Movement', 'Ending Balance'];
+
+        if ($this->options['showAccountCode'] ?? false) {
+            array_unshift($headers, 'Account Code');
+        }
+
+        return $headers;
     }
 
     public function getRightAlignedColumns(): array
     {
-        return [2, 3, 4, 5, 6];
+        $columns = [1, 2, 3, 4, 5];
+
+        if ($this->options['showAccountCode'] ?? false) {
+            $columns = [2, 3, 4, 5, 6];
+        }
+
+        return $columns;
     }
 
     public function getLeftAlignedColumns(): array
     {
-        return [1];
+        $columns = [0];
+
+        if ($this->options['showAccountCode'] ?? false) {
+            $columns = [1];
+        }
+
+        return $columns;
     }
 
     public function getCenterAlignedColumns(): array
     {
-        return [0];
+        if ($this->options['showAccountCode'] ?? false) {
+            return [0];
+        }
+
+        return [];
     }
 
+    /**
+     * @return ReportCategoryDTO[]
+     */
     public function getCategories(): array
     {
         $categories = [];
 
         foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
-            $categories[] = [
-                'header' => ['', $accountCategoryName, '', '', '', '', ''],
-                'data' => array_map(static function (AccountDTO $account) {
-                    return [
-                        $account->accountCode,
-                        $account->accountName,
-                        $account->balance->startingBalance ?? '',
-                        $account->balance->debitBalance,
-                        $account->balance->creditBalance,
-                        $account->balance->netMovement,
-                        $account->balance->endingBalance ?? '',
-                    ];
-                }, $accountCategory->accounts),
-                'summary' => [
-                    '',
-                    'Total ' . $accountCategoryName,
-                    $accountCategory->summary->startingBalance ?? '',
-                    $accountCategory->summary->debitBalance,
-                    $accountCategory->summary->creditBalance,
-                    $accountCategory->summary->netMovement,
-                    $accountCategory->summary->endingBalance ?? '',
-                ],
+            $header = [$accountCategoryName, '', '', '', '', ''];
+
+            if ($this->options['showAccountCode'] ?? false) {
+                array_unshift($header, '');
+            }
+
+            $data = array_map(function (AccountDTO $account) {
+                $row = [
+                    $account->accountName,
+                    $account->balance->startingBalance ?? '',
+                    $account->balance->debitBalance,
+                    $account->balance->creditBalance,
+                    $account->balance->netMovement ?? '',
+                    $account->balance->endingBalance ?? '',
+                ];
+
+                if ($this->options['showAccountCode'] ?? false) {
+                    array_unshift($row, $account->accountCode);
+                }
+
+                return $row;
+            }, $accountCategory->accounts);
+
+            $summary = [
+                'Total ' . $accountCategoryName,
+                $accountCategory->summary->startingBalance ?? '',
+                $accountCategory->summary->debitBalance,
+                $accountCategory->summary->creditBalance,
+                $accountCategory->summary->netMovement ?? '',
+                $accountCategory->summary->endingBalance ?? '',
             ];
+
+            if ($this->options['showAccountCode'] ?? false) {
+                array_unshift($summary, '');
+            }
+
+            $categories[] = new ReportCategoryDTO(
+                header: $header,
+                data: $data,
+                summary: $summary,
+            );
         }
 
         return $categories;
@@ -66,8 +110,7 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
 
     public function getOverallTotals(): array
     {
-        return [
-            '',
+        $totals = [
             'Total for all accounts',
             '',
             $this->report->overallTotal->debitBalance,
@@ -75,5 +118,11 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
             '',
             '',
         ];
+
+        if ($this->options['showAccountCode'] ?? false) {
+            array_unshift($totals, '');
+        }
+
+        return $totals;
     }
 }

app/Transformers/BaseReportTransformer.php

@@ -10,9 +10,12 @@ abstract class BaseReportTransformer implements ExportableReport, Wireable
 {
     protected ReportDTO $report;
 
-    public function __construct(ReportDTO $report)
+    protected array $options;
+
+    public function __construct(ReportDTO $report, array $options = [])
     {
         $this->report = $report;
+        $this->options = $options;
     }
 
     public function getAlignmentClass(int $index): string

app/Transformers/TrialBalanceReportTransformer.php

@@ -3,6 +3,7 @@
 namespace App\Transformers;
 
 use App\DTO\AccountDTO;
+use App\DTO\ReportCategoryDTO;
 
 class TrialBalanceReportTransformer extends BaseReportTransformer
 {
@@ -31,14 +32,17 @@ class TrialBalanceReportTransformer extends BaseReportTransformer
         return [0];
     }
 
+    /**
+     * @return ReportCategoryDTO[]
+     */
     public function getCategories(): array
     {
         $categories = [];
 
         foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
-            $categories[] = [
-                'header' => ['', $accountCategoryName, '', ''],
-                'data' => array_map(static function (AccountDTO $account) {
+            $categories[] = new ReportCategoryDTO(
+                header: ['', $accountCategoryName, '', ''],
+                data: array_map(static function (AccountDTO $account) {
                     return [
                         $account->accountCode,
                         $account->accountName,
@@ -46,13 +50,13 @@ class TrialBalanceReportTransformer extends BaseReportTransformer
                         $account->balance->creditBalance,
                     ];
                 }, $accountCategory->accounts),
-                'summary' => [
+                summary: [
                     '',
                     'Total ' . $accountCategoryName,
                     $accountCategory->summary->debitBalance,
                     $accountCategory->summary->creditBalance,
                 ],
-            ];
+            );
         }
 
         return $categories;

bootstrap/providers.php

@@ -3,7 +3,6 @@
 return [
     App\Providers\AppServiceProvider::class,
     App\Providers\AuthServiceProvider::class,
-    App\Providers\EventServiceProvider::class,
     App\Providers\Filament\AdminPanelProvider::class,
     App\Providers\FilamentCompaniesServiceProvider::class,
     App\Providers\Filament\UserPanelProvider::class,

database/migrations/2023_09_03_100000_create_accounting_tables.php

@@ -59,7 +59,7 @@ return new class extends Migration
             $table->string('name')->nullable()->index();
             $table->string('currency_code')->nullable();
             $table->text('description')->nullable();
-            $table->boolean('active')->default(true);
+            $table->boolean('archived')->default(false);
             $table->boolean('default')->default(false);
             $table->foreignId('bank_account_id')->nullable()->constrained('bank_accounts')->cascadeOnDelete();
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();

package-lock.json

@@ -29,9 +29,9 @@
             }
         },
         "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
-            "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+            "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
             "cpu": [
                 "ppc64"
             ],
@@ -45,9 +45,9 @@
             }
         },
         "node_modules/@esbuild/android-arm": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
-            "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+            "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
             "cpu": [
                 "arm"
             ],
@@ -61,9 +61,9 @@
             }
         },
         "node_modules/@esbuild/android-arm64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
-            "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+            "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
             "cpu": [
                 "arm64"
             ],
@@ -77,9 +77,9 @@
             }
         },
         "node_modules/@esbuild/android-x64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
-            "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+            "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
             "cpu": [
                 "x64"
             ],
@@ -93,9 +93,9 @@
             }
         },
         "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
-            "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+            "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
             "cpu": [
                 "arm64"
             ],
@@ -109,9 +109,9 @@
             }
         },
         "node_modules/@esbuild/darwin-x64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
-            "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+            "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
             "cpu": [
                 "x64"
             ],
@@ -125,9 +125,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
-            "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+            "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
             "cpu": [
                 "arm64"
             ],
@@ -141,9 +141,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
-            "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+            "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
             "cpu": [
                 "x64"
             ],
@@ -157,9 +157,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
-            "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+            "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
             "cpu": [
                 "arm"
             ],
@@ -173,9 +173,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
-            "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+            "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
             "cpu": [
                 "arm64"
             ],
@@ -189,9 +189,9 @@
             }
         },
         "node_modules/@esbuild/linux-ia32": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
-            "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+            "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
             "cpu": [
                 "ia32"
             ],
@@ -205,9 +205,9 @@
             }
         },
         "node_modules/@esbuild/linux-loong64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
-            "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+            "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
             "cpu": [
                 "loong64"
             ],
@@ -221,9 +221,9 @@
             }
         },
         "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
-            "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+            "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
             "cpu": [
                 "mips64el"
             ],
@@ -237,9 +237,9 @@
             }
         },
         "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
-            "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+            "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
             "cpu": [
                 "ppc64"
             ],
@@ -253,9 +253,9 @@
             }
         },
         "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
-            "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+            "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
             "cpu": [
                 "riscv64"
             ],
@@ -269,9 +269,9 @@
             }
         },
         "node_modules/@esbuild/linux-s390x": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
-            "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+            "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
             "cpu": [
                 "s390x"
             ],
@@ -285,9 +285,9 @@
             }
         },
         "node_modules/@esbuild/linux-x64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
-            "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+            "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
             "cpu": [
                 "x64"
             ],
@@ -301,9 +301,9 @@
             }
         },
         "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
-            "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+            "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
             "cpu": [
                 "x64"
             ],
@@ -317,9 +317,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
-            "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+            "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
             "cpu": [
                 "x64"
             ],
@@ -333,9 +333,9 @@
             }
         },
         "node_modules/@esbuild/sunos-x64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
-            "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+            "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
             "cpu": [
                 "x64"
             ],
@@ -349,9 +349,9 @@
             }
         },
         "node_modules/@esbuild/win32-arm64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
-            "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+            "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
             "cpu": [
                 "arm64"
             ],
@@ -365,9 +365,9 @@
             }
         },
         "node_modules/@esbuild/win32-ia32": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
-            "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+            "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
             "cpu": [
                 "ia32"
             ],
@@ -381,9 +381,9 @@
             }
         },
         "node_modules/@esbuild/win32-x64": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
-            "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+            "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
             "cpu": [
                 "x64"
             ],
@@ -890,9 +890,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.23.0",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
-            "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
+            "version": "4.23.1",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz",
+            "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==",
             "dev": true,
             "funding": [
                 {
@@ -909,10 +909,10 @@
                 }
             ],
             "dependencies": {
-                "caniuse-lite": "^1.0.30001587",
-                "electron-to-chromium": "^1.4.668",
+                "caniuse-lite": "^1.0.30001629",
+                "electron-to-chromium": "^1.4.796",
                 "node-releases": "^2.0.14",
-                "update-browserslist-db": "^1.0.13"
+                "update-browserslist-db": "^1.0.16"
             },
             "bin": {
                 "browserslist": "cli.js"
@@ -931,9 +931,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001625",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001625.tgz",
-            "integrity": "sha512-4KE9N2gcRH+HQhpeiRZXd+1niLB/XNLAhSy4z7fI8EzcbcPoAqjNInxVHTiTwWfTIV4w096XG8OtCOCQQKPv3w==",
+            "version": "1.0.30001634",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001634.tgz",
+            "integrity": "sha512-fbBYXQ9q3+yp1q1gBk86tOFs4pyn/yxFm5ZNP18OXJDfA3txImOY9PhfxVggZ4vRHDqoU8NrKU81eN0OtzOgRA==",
             "dev": true,
             "funding": [
                 {
@@ -1079,9 +1079,9 @@
             "dev": true
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.784",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.784.tgz",
-            "integrity": "sha512-9CZwh+sDrhDAeOEFh8s3PqwduzTyYIeYwZolc1b9ENAUt3ePu7R1sJSCWr/820ISssRxCJUyHI9Wb7j+0Uo1AA==",
+            "version": "1.4.803",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.803.tgz",
+            "integrity": "sha512-61H9mLzGOCLLVsnLiRzCbc63uldP0AniRYPV3hbGVtONA1pI7qSGILdbofR7A8TMbOypDocEAjH/e+9k1QIe3g==",
             "dev": true
         },
         "node_modules/emoji-regex": {
@@ -1091,9 +1091,9 @@
             "dev": true
         },
         "node_modules/esbuild": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
-            "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+            "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
             "dev": true,
             "hasInstallScript": true,
             "bin": {
@@ -1103,29 +1103,29 @@
                 "node": ">=12"
             },
             "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.20.2",
-                "@esbuild/android-arm": "0.20.2",
-                "@esbuild/android-arm64": "0.20.2",
-                "@esbuild/android-x64": "0.20.2",
-                "@esbuild/darwin-arm64": "0.20.2",
-                "@esbuild/darwin-x64": "0.20.2",
-                "@esbuild/freebsd-arm64": "0.20.2",
-                "@esbuild/freebsd-x64": "0.20.2",
-                "@esbuild/linux-arm": "0.20.2",
-                "@esbuild/linux-arm64": "0.20.2",
-                "@esbuild/linux-ia32": "0.20.2",
-                "@esbuild/linux-loong64": "0.20.2",
-                "@esbuild/linux-mips64el": "0.20.2",
-                "@esbuild/linux-ppc64": "0.20.2",
-                "@esbuild/linux-riscv64": "0.20.2",
-                "@esbuild/linux-s390x": "0.20.2",
-                "@esbuild/linux-x64": "0.20.2",
-                "@esbuild/netbsd-x64": "0.20.2",
-                "@esbuild/openbsd-x64": "0.20.2",
-                "@esbuild/sunos-x64": "0.20.2",
-                "@esbuild/win32-arm64": "0.20.2",
-                "@esbuild/win32-ia32": "0.20.2",
-                "@esbuild/win32-x64": "0.20.2"
+                "@esbuild/aix-ppc64": "0.21.5",
+                "@esbuild/android-arm": "0.21.5",
+                "@esbuild/android-arm64": "0.21.5",
+                "@esbuild/android-x64": "0.21.5",
+                "@esbuild/darwin-arm64": "0.21.5",
+                "@esbuild/darwin-x64": "0.21.5",
+                "@esbuild/freebsd-arm64": "0.21.5",
+                "@esbuild/freebsd-x64": "0.21.5",
+                "@esbuild/linux-arm": "0.21.5",
+                "@esbuild/linux-arm64": "0.21.5",
+                "@esbuild/linux-ia32": "0.21.5",
+                "@esbuild/linux-loong64": "0.21.5",
+                "@esbuild/linux-mips64el": "0.21.5",
+                "@esbuild/linux-ppc64": "0.21.5",
+                "@esbuild/linux-riscv64": "0.21.5",
+                "@esbuild/linux-s390x": "0.21.5",
+                "@esbuild/linux-x64": "0.21.5",
+                "@esbuild/netbsd-x64": "0.21.5",
+                "@esbuild/openbsd-x64": "0.21.5",
+                "@esbuild/sunos-x64": "0.21.5",
+                "@esbuild/win32-arm64": "0.21.5",
+                "@esbuild/win32-ia32": "0.21.5",
+                "@esbuild/win32-x64": "0.21.5"
             }
         },
         "node_modules/escalade": {
@@ -1207,9 +1207,9 @@
             }
         },
         "node_modules/foreground-child": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-            "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz",
+            "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==",
             "dev": true,
             "dependencies": {
                 "cross-spawn": "^7.0.0",
@@ -1388,9 +1388,9 @@
             "dev": true
         },
         "node_modules/jackspeak": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.1.2.tgz",
-            "integrity": "sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==",
+            "version": "3.4.0",
+            "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz",
+            "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==",
             "dev": true,
             "dependencies": {
                 "@isaacs/cliui": "^8.0.2"
@@ -1406,9 +1406,9 @@
             }
         },
         "node_modules/jiti": {
-            "version": "1.21.0",
-            "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz",
-            "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==",
+            "version": "1.21.6",
+            "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
+            "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
             "dev": true,
             "bin": {
                 "jiti": "bin/jiti.js"
@@ -1789,9 +1789,9 @@
             }
         },
         "node_modules/postcss-load-config/node_modules/lilconfig": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.1.tgz",
-            "integrity": "sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
+            "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
             "dev": true,
             "engines": {
                 "node": ">=14"
@@ -2240,9 +2240,9 @@
             }
         },
         "node_modules/tailwindcss": {
-            "version": "3.4.3",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.3.tgz",
-            "integrity": "sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==",
+            "version": "3.4.4",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.4.tgz",
+            "integrity": "sha512-ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==",
             "dev": true,
             "dependencies": {
                 "@alloc/quick-lru": "^5.2.0",
@@ -2365,12 +2365,12 @@
             "dev": true
         },
         "node_modules/vite": {
-            "version": "5.2.12",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.12.tgz",
-            "integrity": "sha512-/gC8GxzxMK5ntBwb48pR32GGhENnjtY30G4A0jemunsBkiEZFw60s8InGpN8gkhHEkjnRK1aSAxeQgwvFhUHAA==",
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.1.tgz",
+            "integrity": "sha512-XBmSKRLXLxiaPYamLv3/hnP/KXDai1NDexN0FpkTaZXTfycHvkRHoenpgl/fvuK/kPbB6xAgoyiryAhQNxYmAQ==",
             "dev": true,
             "dependencies": {
-                "esbuild": "^0.20.1",
+                "esbuild": "^0.21.3",
                 "postcss": "^8.4.38",
                 "rollup": "^4.13.0"
             },
@@ -2536,9 +2536,9 @@
             }
         },
         "node_modules/yaml": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.2.tgz",
-            "integrity": "sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==",
+            "version": "2.4.5",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz",
+            "integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==",
             "dev": true,
             "bin": {
                 "yaml": "bin.mjs"

resources/data/lang/en.json

@@ -188,5 +188,6 @@
     "Live Rate": "Live Rate",
     "Edit": "Edit",
     "Notes": "Notes",
-    "Terms": "Terms"
+    "Terms": "Terms",
+    "Ending Balance": "Ending Balance"
 }

resources/views/components/company/reports/report-pdf.blade.php

@@ -107,13 +107,13 @@
     @foreach($report->getCategories() as $category)
         <tbody>
         <tr class="category-header-row">
-            @foreach($category['header'] as $index => $header)
+            @foreach($category->header as $index => $header)
                 <td class="{{ $report->getAlignmentClass($index) }}">
                     {{ $header }}
                 </td>
             @endforeach
         </tr>
-        @foreach($category['data'] as $account)
+        @foreach($category->data as $account)
             <tr>
                 @foreach($account as $index => $cell)
                     <td class="{{ $report->getAlignmentClass($index) }}">
@@ -123,7 +123,7 @@
             </tr>
         @endforeach
         <tr class="category-summary-row">
-            @foreach($category['summary'] as $index => $cell)
+            @foreach($category->summary as $index => $cell)
                 <td class="{{ $report->getAlignmentClass($index) }}">
                     {{ $cell }}
                 </td>

resources/views/components/company/tables/reports/detailed-report.blade.php

@@ -13,7 +13,7 @@
     @foreach($report->getCategories() as $category)
         <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
         <tr class="bg-gray-50 dark:bg-white/5">
-            @foreach($category['header'] as $index => $header)
+            @foreach($category->header as $index => $header)
                 <x-filament-tables::cell class="{{ $report->getAlignmentClass($index) }}">
                     <div class="px-3 py-2 text-sm font-semibold text-gray-950 dark:text-white">
                         {{ $header }}
@@ -21,7 +21,7 @@
                 </x-filament-tables::cell>
             @endforeach
         </tr>
-        @foreach($category['data'] as $account)
+        @foreach($category->data as $account)
             <tr>
                 @foreach($account as $index => $cell)
                     <x-filament-tables::cell class="{{ $report->getAlignmentClass($index) }}">
@@ -33,7 +33,7 @@
             </tr>
         @endforeach
         <tr>
-            @foreach($category['summary'] as $index => $cell)
+            @foreach($category->summary as $index => $cell)
                 <x-filament-tables::cell class="{{ $report->getAlignmentClass($index) }}">
                     <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
                         {{ $cell }}

resources/views/filament/company/pages/accounting/chart.blade.php

@@ -21,16 +21,17 @@
                         <table class="es-table table-fixed w-full divide-y divide-gray-200 text-start text-sm dark:divide-white/5">
                             <colgroup>
                                 <col span="1" style="width: 12.5%;">
-                                <col span="1" style="width: 25%;">
-                                <col span="1" style="width: 40%;">
+                                <col span="1" style="width: 20%;">
+                                <col span="1" style="width: 35%;">
                                 <col span="1" style="width: 15%;">
+                                <col span="1" style="width: 10%;">
                                 <col span="1" style="width: 7.5%;">
                             </colgroup>
                             @foreach($subtypes as $subtype)
                                 <tbody class="es-table__rowgroup divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
                                 <!-- Subtype Name Header Row -->
                                 <tr class="es-table__row--header bg-gray-50 dark:bg-white/5">
-                                    <td colspan="5" class="es-table__cell px-4 py-4">
+                                    <td colspan="6" class="es-table__cell px-4 py-4">
                                         <div class="es-table__row-content flex items-center space-x-2">
                                             <span class="es-table__row-title text-gray-800 dark:text-gray-200 font-semibold tracking-wider">
                                                 {{ $subtype->name }}
@@ -61,6 +62,13 @@
                                             </small>
                                         </td>
                                         <td colspan="2" class="es-table__cell px-4 py-4">{{ $account->description }}</td>
+                                        <td colspan="1" class="es-table__cell px-4 py-4">
+                                            @if($account->archived)
+                                                <x-filament::badge color="gray" size="sm">
+                                                    Archived
+                                                </x-filament::badge>
+                                            @endif
+                                        </td>
                                         <td colspan="1" class="es-table__cell px-4 py-4">
                                             <div>
                                                 @if($account->default === false)

resources/views/filament/company/pages/reports/account-balances.blade.php

@@ -3,11 +3,11 @@
         <x-filament-tables::container>
             <div class="p-6 divide-y divide-gray-200 dark:divide-white/5">
                 <form wire:submit.prevent="loadReportData" class="w-full">
-                    <div class="flex flex-col md:flex-row items-end justify-center gap-4 md:gap-6">
+                    <div class="flex flex-col md:flex-row items-start justify-center gap-4 md:gap-12">
                         <div class="flex-grow">
                             {{ $this->form }}
                         </div>
-                        <x-filament::button type="submit" class="mt-4 md:mt-0">
+                        <x-filament::button type="submit" class="mt-4 md:mt-0 flex-shrink-0">
                             Update Report
                         </x-filament::button>
                     </div>