Merge pull request #53 from andrewdwallo/development-3.x

Refactor app and reporting

app/Contracts/AccountHandler.php

@@ -2,9 +2,6 @@
 
 namespace App\Contracts;
 
-use App\DTO\AccountBalanceDTO;
-use App\DTO\AccountBalanceReportDTO;
-use App\Enums\Accounting\AccountCategory;
 use App\Models\Accounting\Account;
 use App\ValueObjects\Money;
 
@@ -20,14 +17,8 @@ interface AccountHandler
 
     public function getEndingBalance(Account $account, string $startDate, string $endDate): ?Money;
 
-    public function calculateNetMovementByCategory(AccountCategory $category, int $debitBalance, int $creditBalance): int;
-
     public function getBalances(Account $account, string $startDate, string $endDate): array;
 
-    public function formatBalances(array $balances): AccountBalanceDTO;
-
-    public function buildAccountBalanceReport(string $startDate, string $endDate): AccountBalanceReportDTO;
-
     public function getTotalBalanceForAllBankAccounts(string $startDate, string $endDate): Money;
 
     public function getAccountCategoryOrder(): array;

app/Contracts/ExportableReport.php

@@ -0,0 +1,21 @@
+<?php
+
+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;
+
+    public function getColumns(): array;
+}

app/DTO/AccountBalanceDTO.php

@@ -12,8 +12,7 @@ class AccountBalanceDTO implements Wireable
         public string $creditBalance,
         public ?string $netMovement,
         public ?string $endingBalance,
-    ) {
-    }
+    ) {}
 
     public function toLivewire(): array
     {

app/DTO/AccountCategoryDTO.php

@@ -12,8 +12,7 @@ class AccountCategoryDTO implements Wireable
     public function __construct(
         public array $accounts,
         public AccountBalanceDTO $summary,
-    ) {
-    }
+    ) {}
 
     public function toLivewire(): array
     {

app/DTO/AccountDTO.php

@@ -10,8 +10,7 @@ class AccountDTO implements Wireable
         public string $accountName,
         public string $accountCode,
         public AccountBalanceDTO $balance,
-    ) {
-    }
+    ) {}
 
     public function toLivewire(): array
     {

app/DTO/ReportCategoryDTO.php

@@ -0,0 +1,17 @@
+<?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/DTO/AccountBalanceReportDTO.php → app/DTO/ReportDTO.php

@@ -4,7 +4,7 @@ namespace App\DTO;
 
 use Livewire\Wireable;
 
-class AccountBalanceReportDTO implements Wireable
+class ReportDTO implements Wireable
 {
     public function __construct(
         /**
@@ -12,14 +12,15 @@ class AccountBalanceReportDTO implements Wireable
          */
         public array $categories,
         public AccountBalanceDTO $overallTotal,
-    ) {
-    }
+        public array $fields,
+    ) {}
 
     public function toLivewire(): array
     {
         return [
             'categories' => $this->categories,
             'overallTotal' => $this->overallTotal->toLivewire(),
+            'fields' => $this->fields,
         ];
     }
 
@@ -28,6 +29,7 @@ class AccountBalanceReportDTO implements Wireable
         return new static(
             $value['categories'],
             AccountBalanceDTO::fromLivewire($value['overallTotal']),
+            $value['fields'],
         );
     }
 }

app/Events/CompanyConfigured.php

@@ -13,13 +13,7 @@ class CompanyConfigured
     use InteractsWithSockets;
     use SerializesModels;
 
-    public Company $company;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(Company $company)
-    {
-        $this->company = $company;
-    }
+    public function __construct(
+        public Company $company
+    ) {}
 }

app/Events/CompanyDefaultEvent.php

@@ -13,13 +13,10 @@ class CompanyDefaultEvent
     use InteractsWithSockets;
     use SerializesModels;
 
-    public Model $model;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Model $model)
-    {
-        $this->model = $model;
-    }
+    public function __construct(
+        public Model $model
+    ) {}
 }

app/Events/CompanyDefaultUpdated.php

@@ -13,16 +13,11 @@ class CompanyDefaultUpdated
     use InteractsWithSockets;
     use SerializesModels;
 
-    public Model $record;
-
-    public array $data;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Model $record, array $data)
-    {
-        $this->record = $record;
-        $this->data = $data;
-    }
+    public function __construct(
+        public Model $record,
+        public array $data
+    ) {}
 }

app/Events/CompanyGenerated.php

@@ -12,25 +12,14 @@ class CompanyGenerated
     use Dispatchable;
     use SerializesModels;
 
-    public User $user;
-
-    public Company $company;
-
-    public string $country;
-
-    public string $language;
-
-    public string $currency;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(User $user, Company $company, string $country, string $language = 'en', string $currency = 'USD')
-    {
-        $this->user = $user;
-        $this->company = $company;
-        $this->country = $country;
-        $this->language = $language;
-        $this->currency = $currency;
-    }
+    public function __construct(
+        public User $user,
+        public Company $company,
+        public string $country,
+        public string $language = 'en',
+        public string $currency = 'USD'
+    ) {}
 }

app/Events/CurrencyRateChanged.php

@@ -13,19 +13,9 @@ class CurrencyRateChanged
     use InteractsWithSockets;
     use SerializesModels;
 
-    public Currency $currency;
-
-    public float $oldRate;
-
-    public float $newRate;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(Currency $currency, float $oldRate, float $newRate)
-    {
-        $this->currency = $currency;
-        $this->oldRate = $oldRate;
-        $this->newRate = $newRate;
-    }
+    public function __construct(
+        public Currency $currency,
+        public float $oldRate,
+        public float $newRate
+    ) {}
 }

app/Events/DefaultCurrencyChanged.php

@@ -13,13 +13,10 @@ class DefaultCurrencyChanged
     use InteractsWithSockets;
     use SerializesModels;
 
-    public Currency $currency;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Currency $currency)
-    {
-        $this->currency = $currency;
-    }
+    public function __construct(
+        public Currency $currency
+    ) {}
 }

app/Events/PlaidSuccess.php

@@ -11,19 +11,12 @@ class PlaidSuccess
     use Dispatchable;
     use SerializesModels;
 
-    public string $publicToken;
-
-    public string $accessToken;
-
-    public Company $company;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(string $publicToken, string $accessToken, Company $company)
-    {
-        $this->publicToken = $publicToken;
-        $this->accessToken = $accessToken;
-        $this->company = $company;
-    }
+    public function __construct(
+        public string $publicToken,
+        public string $accessToken,
+        public Company $company
+    ) {}
 }

app/Events/StartTransactionImport.php

@@ -12,22 +12,13 @@ class StartTransactionImport
     use Dispatchable;
     use SerializesModels;
 
-    public Company $company;
-
-    public ConnectedBankAccount $connectedBankAccount;
-
-    public int | string $selectedBankAccountId;
-
-    public string $startDate;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Company $company, ConnectedBankAccount $connectedBankAccount, int | string $selectedBankAccountId, string $startDate)
-    {
-        $this->company = $company;
-        $this->connectedBankAccount = $connectedBankAccount;
-        $this->selectedBankAccountId = $selectedBankAccountId;
-        $this->startDate = $startDate;
-    }
+    public function __construct(
+        public Company $company,
+        public ConnectedBankAccount $connectedBankAccount,
+        public int | string $selectedBankAccountId,
+        public string $startDate
+    ) {}
 }

app/Facades/Accounting.php

@@ -3,9 +3,6 @@
 namespace App\Facades;
 
 use App\Contracts\AccountHandler;
-use App\DTO\AccountBalanceDTO;
-use App\DTO\AccountBalanceReportDTO;
-use App\Enums\Accounting\AccountCategory;
 use App\Models\Accounting\Account;
 use App\ValueObjects\Money;
 use Illuminate\Support\Facades\Facade;
@@ -16,10 +13,7 @@ use Illuminate\Support\Facades\Facade;
  * @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 int calculateNetMovementByCategory(AccountCategory $category, int $debitBalance, int $creditBalance)
  * @method static array getBalances(Account $account, string $startDate, string $endDate)
- * @method static AccountBalanceDTO formatBalances(array $balances)
- * @method static AccountBalanceReportDTO buildAccountBalanceReport(string $startDate, string $endDate)
  * @method static Money getTotalBalanceForAllBankAccounts(string $startDate, string $endDate)
  * @method static array getAccountCategoryOrder()
  * @method static string getEarliestTransactionDate()

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

@@ -15,7 +15,6 @@ use Filament\Forms\Components\ColorPicker;
 use Filament\Forms\Components\Component;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Grid;
-use Filament\Forms\Components\MarkdownEditor;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Textarea;
@@ -163,7 +162,8 @@ class Invoice extends Page
                 TextInput::make('subheader')
                     ->localizeLabel()
                     ->nullable(),
-                MarkdownEditor::make('terms')
+                Textarea::make('terms')
+                    ->localizeLabel()
                     ->nullable(),
                 Textarea::make('footer')
                     ->localizeLabel('Footer / Notes')

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

@@ -127,10 +127,10 @@ class Localization extends Page
                     ->options(LocalizationModel::getAllLanguages())
                     ->searchable(),
                 Select::make('timezone')
+                    ->softRequired()
                     ->localizeLabel()
                     ->options(Timezone::getTimezoneOptions(CompanyProfileModel::first()->country))
-                    ->searchable()
-                    ->nullable(),
+                    ->searchable(),
             ])->columns();
     }
 

app/Filament/Company/Clusters/Settings/Resources/CurrencyResource/Pages/CreateCurrency.php

@@ -18,7 +18,7 @@ class CreateCurrency extends CreateRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeCreate(array $data): array

app/Filament/Company/Clusters/Settings/Resources/CurrencyResource/Pages/EditCurrency.php

@@ -24,9 +24,9 @@ class EditCurrency extends EditRecord
         ];
     }
 
-    protected function getRedirectUrl(): ?string
+    protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeSave(array $data): array

app/Filament/Company/Clusters/Settings/Resources/DiscountResource/Pages/CreateDiscount.php

@@ -18,7 +18,7 @@ class CreateDiscount extends CreateRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeCreate(array $data): array

app/Filament/Company/Clusters/Settings/Resources/DiscountResource/Pages/EditDiscount.php

@@ -25,7 +25,7 @@ class EditDiscount extends EditRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeSave(array $data): array

app/Filament/Company/Clusters/Settings/Resources/TaxResource/Pages/CreateTax.php

@@ -18,7 +18,7 @@ class CreateTax extends CreateRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeCreate(array $data): array

app/Filament/Company/Clusters/Settings/Resources/TaxResource/Pages/EditTax.php

@@ -25,7 +25,7 @@ class EditTax extends EditRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeSave(array $data): array

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;
@@ -127,15 +128,16 @@ class Transactions extends Page implements HasTable
         return $form
             ->schema([
                 Forms\Components\Select::make('bankAccountIdFiltered')
-                    ->label('Account')
-                    ->hiddenLabel()
-                    ->allowHtml()
-                    ->options(fn () => $this->getBankAccountOptions(true, true))
                     ->live()
+                    ->allowHtml()
+                    ->hiddenLabel()
+                    ->columnSpan(2)
+                    ->label('Account')
                     ->selectablePlaceholder(false)
-                    ->columnSpan(4),
+                    ->extraAttributes(['wire:key' => Str::random()])
+                    ->options(fn () => $this->getBankAccountOptions(true, true)),
             ])
-            ->columns(14);
+            ->columns(7);
     }
 
     public function transactionForm(Form $form): Form
@@ -149,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) {
@@ -179,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(),
@@ -224,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')
@@ -296,6 +301,7 @@ class Transactions extends Page implements HasTable
                 $this->buildDateRangeFilter('updated_at', 'Last Modified'),
             ], layout: Tables\Enums\FiltersLayout::Modal)
             ->deferFilters()
+            ->deferLoading()
             ->filtersFormColumns(2)
             ->filtersTriggerAction(
                 fn (Tables\Actions\Action $action) => $action
@@ -557,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(),
@@ -707,8 +713,10 @@ 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, ?int $currentAccountId = null): array
     {
+        $nominalAccountsOnly ??= false;
+
         $excludedCategory = match ($type) {
             TransactionType::Deposit => AccountCategory::Expense,
             TransactionType::Withdrawal => AccountCategory::Revenue,
@@ -716,16 +724,21 @@ class Transactions extends Page implements HasTable
         };
 
         return Account::query()
-            ->when($nominalAccountsOnly, fn (Builder $query) => $query->whereNull('accountable_type'))
+            ->when($nominalAccountsOnly, fn (Builder $query) => $query->doesntHave('bankAccount'))
             ->when($excludedCategory, fn (Builder $query) => $query->whereNot('category', $excludedCategory))
+            ->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 ? [
@@ -733,6 +746,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/CreateCompany.php

@@ -28,32 +28,32 @@ class CreateCompany extends FilamentCreateCompany
                     ->label(__('filament-companies::default.labels.company_name'))
                     ->autofocus()
                     ->maxLength(255)
-                    ->required(),
+                    ->softRequired(),
                 TextInput::make('profile.email')
                     ->label('Company Email')
                     ->email()
-                    ->required(),
+                    ->softRequired(),
                 Select::make('profile.entity_type')
                     ->label('Entity Type')
                     ->options(EntityType::class)
-                    ->required(),
+                    ->softRequired(),
                 Select::make('profile.country')
                     ->label('Country')
                     ->live()
                     ->searchable()
                     ->options(Country::getAvailableCountryOptions())
-                    ->required(),
+                    ->softRequired(),
                 Select::make('locale.language')
                     ->label('Language')
                     ->searchable()
                     ->options(Localization::getAllLanguages())
-                    ->required(),
+                    ->softRequired(),
                 Select::make('currencies.code')
                     ->label('Currency')
                     ->searchable()
                     ->options(CurrencyAccessor::getAllCurrencyOptions())
                     ->optionsLimit(5)
-                    ->required(),
+                    ->softRequired(),
             ])
             ->model(FilamentCompanies::companyModel())
             ->statePath('data');

app/Filament/Company/Pages/Reports.php

@@ -3,6 +3,7 @@
 namespace App\Filament\Company\Pages;
 
 use App\Filament\Company\Pages\Reports\AccountBalances;
+use App\Filament\Company\Pages\Reports\TrialBalance;
 use App\Infolists\Components\ReportEntry;
 use Filament\Infolists\Components\Section;
 use Filament\Infolists\Infolist;
@@ -38,7 +39,7 @@ class Reports extends Page
                             ->description('The sum of all debit and credit balances for all accounts on a single day. This helps to ensure that the books are in balance.')
                             ->icon('heroicon-o-scale')
                             ->iconColor(Color::Sky)
-                            ->url('#'),
+                            ->url(TrialBalance::getUrl()),
                         ReportEntry::make('account_transactions')
                             ->hiddenLabel()
                             ->heading('Account Transactions')

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

@@ -2,149 +2,106 @@
 
 namespace App\Filament\Company\Pages\Reports;
 
-use App\DTO\AccountBalanceReportDTO;
-use App\Filament\Forms\Components\DateRangeSelect;
-use App\Models\Company;
-use App\Services\AccountBalancesExportService;
-use App\Services\AccountService;
-use Barryvdh\DomPDF\Facade\Pdf;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
-use Filament\Forms\Components\DatePicker;
-use Filament\Forms\Components\Split;
+use App\Contracts\ExportableReport;
+use App\DTO\ReportDTO;
+use App\Services\ExportService;
+use App\Services\ReportService;
+use App\Support\Column;
+use App\Transformers\AccountBalanceReportTransformer;
 use Filament\Forms\Form;
-use Filament\Forms\Set;
-use Filament\Pages\Page;
-use Filament\Support\Enums\IconPosition;
-use Filament\Support\Enums\IconSize;
-use Illuminate\Support\Carbon;
+use Filament\Support\Enums\Alignment;
+use Guava\FilamentClusters\Forms\Cluster;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
-class AccountBalances extends Page
+class AccountBalances extends BaseReportPage
 {
-    protected static string $view = 'filament.company.pages.reports.account-balances';
+    protected static string $view = 'filament.company.pages.reports.detailed-report';
 
     protected static ?string $slug = 'reports/account-balances';
 
-    public string $startDate = '';
+    protected static bool $shouldRegisterNavigation = false;
 
-    public string $endDate = '';
+    protected ReportService $reportService;
 
-    public string $dateRange = '';
+    protected ExportService $exportService;
 
-    public string $fiscalYearStartDate = '';
-
-    public string $fiscalYearEndDate = '';
-
-    public Company $company;
-
-    public AccountBalanceReportDTO $accountBalanceReport;
-
-    protected AccountService $accountService;
-
-    protected AccountBalancesExportService $accountBalancesExportService;
-
-    public function boot(AccountService $accountService, AccountBalancesExportService $accountBalancesExportService): void
-    {
-        $this->accountService = $accountService;
-        $this->accountBalancesExportService = $accountBalancesExportService;
-    }
-
-    public function mount(): void
-    {
-        $this->company = auth()->user()->currentCompany;
-        $this->fiscalYearStartDate = $this->company->locale->fiscalYearStartDate();
-        $this->fiscalYearEndDate = $this->company->locale->fiscalYearEndDate();
-        $this->dateRange = $this->getDefaultDateRange();
-        $this->setDateRange(Carbon::parse($this->fiscalYearStartDate), Carbon::parse($this->fiscalYearEndDate));
-
-        $this->loadAccountBalances();
-    }
-
-    public function getDefaultDateRange(): string
-    {
-        return 'FY-' . now()->year;
-    }
-
-    public function loadAccountBalances(): void
+    public function boot(ReportService $reportService, ExportService $exportService): void
     {
-        $this->accountBalanceReport = $this->accountService->buildAccountBalanceReport($this->startDate, $this->endDate);
+        $this->reportService = $reportService;
+        $this->exportService = $exportService;
     }
 
-    protected function getHeaderActions(): array
+    /**
+     * @return array<Column>
+     */
+    public function getTable(): array
     {
         return [
-            ActionGroup::make([
-                Action::make('exportCSV')
-                    ->label('CSV')
-                    ->action(fn () => $this->exportCSV()),
-                Action::make('exportPDF')
-                    ->label('PDF')
-                    ->action(fn () => $this->exportPDF()),
-            ])
-                ->label('Export')
-                ->button()
-                ->outlined()
-                ->dropdownWidth('max-w-[7rem]')
-                ->dropdownPlacement('bottom-end')
-                ->icon('heroicon-c-chevron-down')
-                ->iconSize(IconSize::Small)
-                ->iconPosition(IconPosition::After),
+            Column::make('account_code')
+                ->label('Account Code')
+                ->toggleable()
+                ->alignment(Alignment::Center),
+            Column::make('account_name')
+                ->label('Account')
+                ->alignment(Alignment::Left),
+            Column::make('starting_balance')
+                ->label('Starting Balance')
+                ->toggleable()
+                ->alignment(Alignment::Right),
+            Column::make('debit_balance')
+                ->label('Debit')
+                ->toggleable()
+                ->alignment(Alignment::Right),
+            Column::make('credit_balance')
+                ->label('Credit')
+                ->toggleable()
+                ->alignment(Alignment::Right),
+            Column::make('net_movement')
+                ->label('Net Movement')
+                ->toggleable()
+                ->alignment(Alignment::Right),
+            Column::make('ending_balance')
+                ->label('Ending Balance')
+                ->toggleable()
+                ->alignment(Alignment::Right),
         ];
     }
 
-    public function exportCSV(): StreamedResponse
+    public function form(Form $form): Form
     {
-        return $this->accountBalancesExportService->exportToCsv($this->company, $this->accountBalanceReport, $this->startDate, $this->endDate);
+        return $form
+            ->inlineLabel()
+            ->columns([
+                'lg' => 1,
+                '2xl' => 2,
+            ])
+            ->live()
+            ->schema([
+                $this->getDateRangeFormComponent(),
+                Cluster::make([
+                    $this->getStartDateFormComponent(),
+                    $this->getEndDateFormComponent(),
+                ])->hiddenLabel(),
+            ]);
     }
 
-    public function exportPDF(): StreamedResponse
+    protected function buildReport(array $columns): ReportDTO
     {
-        $pdf = Pdf::loadView('components.company.reports.account-balances', [
-            'accountBalanceReport' => $this->accountBalanceReport,
-            'startDate' => Carbon::parse($this->startDate)->format('M d, Y'),
-            'endDate' => Carbon::parse($this->endDate)->format('M d, Y'),
-        ])->setPaper('a4');
-
-        return response()->streamDownload(function () use ($pdf) {
-            echo $pdf->stream();
-        }, 'account-balances.pdf');
+        return $this->reportService->buildAccountBalanceReport($this->startDate, $this->endDate, $columns);
     }
 
-    public function form(Form $form): Form
+    protected function getTransformer(ReportDTO $reportDTO): ExportableReport
     {
-        return $form
-            ->schema([
-                Split::make([
-                    DateRangeSelect::make('dateRange')
-                        ->label('Date Range')
-                        ->selectablePlaceholder(false)
-                        ->startDateField('startDate')
-                        ->endDateField('endDate'),
-                    DatePicker::make('startDate')
-                        ->label('Start Date')
-                        ->displayFormat('Y-m-d')
-                        ->afterStateUpdated(static function (Set $set) {
-                            $set('dateRange', 'Custom');
-                        }),
-                    DatePicker::make('endDate')
-                        ->label('End Date')
-                        ->displayFormat('Y-m-d')
-                        ->afterStateUpdated(static function (Set $set) {
-                            $set('dateRange', 'Custom');
-                        }),
-                ])->live(),
-            ]);
+        return new AccountBalanceReportTransformer($reportDTO);
     }
 
-    public function setDateRange(Carbon $start, Carbon $end): void
+    public function exportCSV(): StreamedResponse
     {
-        $this->startDate = $start->format('Y-m-d');
-        $this->endDate = $end->isFuture() ? now()->format('Y-m-d') : $end->format('Y-m-d');
+        return $this->exportService->exportToCsv($this->company, $this->report, $this->startDate, $this->endDate);
     }
 
-    public static function shouldRegisterNavigation(): bool
+    public function exportPDF(): StreamedResponse
     {
-        return false;
+        return $this->exportService->exportToPdf($this->company, $this->report, $this->startDate, $this->endDate);
     }
 }

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

@@ -0,0 +1,249 @@
+<?php
+
+namespace App\Filament\Company\Pages\Reports;
+
+use App\Contracts\ExportableReport;
+use App\DTO\ReportDTO;
+use App\Filament\Forms\Components\DateRangeSelect;
+use App\Models\Company;
+use App\Support\Column;
+use Filament\Actions\Action;
+use Filament\Actions\ActionGroup;
+use Filament\Forms\Components\Checkbox;
+use Filament\Forms\Components\Component;
+use Filament\Forms\Components\DatePicker;
+use Filament\Forms\Form;
+use Filament\Forms\Set;
+use Filament\Pages\Page;
+use Filament\Support\Enums\ActionSize;
+use Filament\Support\Enums\IconPosition;
+use Filament\Support\Enums\IconSize;
+use Filament\Support\Facades\FilamentIcon;
+use Illuminate\Support\Carbon;
+use Livewire\Attributes\Computed;
+use Livewire\Attributes\Session;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+abstract class BaseReportPage extends Page
+{
+    #[Session]
+    public string $startDate = '';
+
+    #[Session]
+    public string $endDate = '';
+
+    #[Session]
+    public string $dateRange = '';
+
+    public string $fiscalYearStartDate = '';
+
+    public string $fiscalYearEndDate = '';
+
+    public Company $company;
+
+    #[Session]
+    public array $toggledTableColumns = [];
+
+    abstract protected function buildReport(array $columns): ReportDTO;
+
+    abstract public function exportCSV(): StreamedResponse;
+
+    abstract public function exportPDF(): StreamedResponse;
+
+    abstract protected function getTransformer(ReportDTO $reportDTO): ExportableReport;
+
+    /**
+     * @return array<Column>
+     */
+    abstract public function getTable(): array;
+
+    public function mount(): void
+    {
+        $this->initializeProperties();
+
+        $this->loadDefaultDateRange();
+
+        $this->loadReportData();
+
+        $this->loadDefaultTableColumnToggleState();
+    }
+
+    protected function getForms(): array
+    {
+        return [
+            'toggleTableColumnForm',
+            'form',
+        ];
+    }
+
+    protected function initializeProperties(): void
+    {
+        $this->company = auth()->user()->currentCompany;
+        $this->fiscalYearStartDate = $this->company->locale->fiscalYearStartDate();
+        $this->fiscalYearEndDate = $this->company->locale->fiscalYearEndDate();
+    }
+
+    protected function loadDefaultDateRange(): void
+    {
+        if (empty($this->dateRange)) {
+            $this->dateRange = $this->getDefaultDateRange();
+            $this->setDateRange(Carbon::parse($this->fiscalYearStartDate), Carbon::parse($this->fiscalYearEndDate));
+        }
+    }
+
+    public function loadReportData(): void
+    {
+        unset($this->report);
+    }
+
+    protected function loadDefaultTableColumnToggleState(): void
+    {
+        $tableColumns = $this->getTable();
+
+        if (empty($this->toggledTableColumns)) {
+            foreach ($tableColumns as $column) {
+                if ($column->isToggleable()) {
+                    if ($column->isToggledHiddenByDefault()) {
+                        $this->toggledTableColumns[$column->getName()] = false;
+                    } else {
+                        $this->toggledTableColumns[$column->getName()] = true;
+                    }
+                } else {
+                    $this->toggledTableColumns[$column->getName()] = true;
+                }
+            }
+        }
+
+        foreach ($tableColumns as $column) {
+            $columnName = $column->getName();
+            if (! $column->isToggleable()) {
+                $this->toggledTableColumns[$columnName] = true;
+            }
+
+            if ($column->isToggleable() && $column->isToggledHiddenByDefault() && isset($this->toggledTableColumns[$columnName]) && $this->toggledTableColumns[$columnName]) {
+                $this->toggledTableColumns[$columnName] = false;
+            }
+        }
+    }
+
+    public function getDefaultDateRange(): string
+    {
+        return 'FY-' . now()->year;
+    }
+
+    protected function getToggledColumns(): array
+    {
+        return array_values(
+            array_filter(
+                $this->getTable(),
+                fn (Column $column) => $this->toggledTableColumns[$column->getName()] ?? false,
+            )
+        );
+    }
+
+    #[Computed(persist: true)]
+    public function report(): ExportableReport
+    {
+        $columns = $this->getToggledColumns();
+        $reportDTO = $this->buildReport($columns);
+
+        return $this->getTransformer($reportDTO);
+    }
+
+    public function setDateRange(Carbon $start, Carbon $end): void
+    {
+        $this->startDate = $start->toDateString();
+        $this->endDate = $end->isFuture() ? now()->toDateString() : $end->toDateString();
+    }
+
+    public function toggleColumnsAction(): Action
+    {
+        return Action::make('toggleColumns')
+            ->label(__('filament-tables::table.actions.toggle_columns.label'))
+            ->iconButton()
+            ->size(ActionSize::Large)
+            ->icon(FilamentIcon::resolve('tables::actions.toggle-columns') ?? 'heroicon-m-view-columns')
+            ->color('gray');
+    }
+
+    public function toggleTableColumnForm(Form $form): Form
+    {
+        return $form
+            ->schema($this->getTableColumnToggleFormSchema())
+            ->statePath('toggledTableColumns');
+    }
+
+    /**
+     * @return array<Checkbox>
+     */
+    protected function getTableColumnToggleFormSchema(): array
+    {
+        $schema = [];
+
+        foreach ($this->getTable() as $column) {
+            if ($column->isToggleable()) {
+                $schema[] = Checkbox::make($column->getName())
+                    ->label($column->getLabel());
+            }
+        }
+
+        return $schema;
+    }
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            ActionGroup::make([
+                Action::make('exportCSV')
+                    ->label('CSV')
+                    ->action(fn () => $this->exportCSV()),
+                Action::make('exportPDF')
+                    ->label('PDF')
+                    ->action(fn () => $this->exportPDF()),
+            ])
+                ->label('Export')
+                ->button()
+                ->outlined()
+                ->dropdownWidth('max-w-[7rem]')
+                ->dropdownPlacement('bottom-end')
+                ->icon('heroicon-c-chevron-down')
+                ->iconSize(IconSize::Small)
+                ->iconPosition(IconPosition::After),
+        ];
+    }
+
+    protected function getDateRangeFormComponent(): Component
+    {
+        return DateRangeSelect::make('dateRange')
+            ->label('Date Range')
+            ->selectablePlaceholder(false)
+            ->startDateField('startDate')
+            ->endDateField('endDate');
+    }
+
+    protected function resetDateRange(): void
+    {
+        $this->dateRange = $this->getDefaultDateRange();
+        $this->setDateRange(Carbon::parse($this->fiscalYearStartDate), Carbon::parse($this->fiscalYearEndDate));
+    }
+
+    protected function getStartDateFormComponent(): Component
+    {
+        return DatePicker::make('startDate')
+            ->label('Start Date')
+            ->displayFormat('Y-m-d')
+            ->afterStateUpdated(static function (Set $set) {
+                $set('dateRange', 'Custom');
+            });
+    }
+
+    protected function getEndDateFormComponent(): Component
+    {
+        return DatePicker::make('endDate')
+            ->label('End Date')
+            ->displayFormat('Y-m-d')
+            ->afterStateUpdated(static function (Set $set) {
+                $set('dateRange', 'Custom');
+            });
+    }
+}

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

@@ -0,0 +1,92 @@
+<?php
+
+namespace App\Filament\Company\Pages\Reports;
+
+use App\Contracts\ExportableReport;
+use App\DTO\ReportDTO;
+use App\Services\ExportService;
+use App\Services\ReportService;
+use App\Support\Column;
+use App\Transformers\TrialBalanceReportTransformer;
+use Filament\Forms\Form;
+use Filament\Support\Enums\Alignment;
+use Guava\FilamentClusters\Forms\Cluster;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class TrialBalance extends BaseReportPage
+{
+    protected static string $view = 'filament.company.pages.reports.detailed-report';
+
+    protected static ?string $slug = 'reports/trial-balance';
+
+    protected static bool $shouldRegisterNavigation = false;
+
+    protected ReportService $reportService;
+
+    protected ExportService $exportService;
+
+    public function boot(ReportService $reportService, ExportService $exportService): void
+    {
+        $this->reportService = $reportService;
+        $this->exportService = $exportService;
+    }
+
+    public function getTable(): array
+    {
+        return [
+            Column::make('account_code')
+                ->label('Account Code')
+                ->toggleable()
+                ->alignment(Alignment::Center),
+            Column::make('account_name')
+                ->label('Account')
+                ->alignment(Alignment::Left),
+            Column::make('debit_balance')
+                ->label('Debit')
+                ->toggleable()
+                ->alignment(Alignment::Right),
+            Column::make('credit_balance')
+                ->label('Credit')
+                ->toggleable()
+                ->alignment(Alignment::Right),
+        ];
+    }
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->inlineLabel()
+            ->columns([
+                'lg' => 1,
+                '2xl' => 2,
+            ])
+            ->live()
+            ->schema([
+                $this->getDateRangeFormComponent(),
+                Cluster::make([
+                    $this->getStartDateFormComponent(),
+                    $this->getEndDateFormComponent(),
+                ])->hiddenLabel(),
+            ]);
+    }
+
+    protected function buildReport(array $columns): ReportDTO
+    {
+        return $this->reportService->buildTrialBalanceReport($this->startDate, $this->endDate, $columns);
+    }
+
+    protected function getTransformer(ReportDTO $reportDTO): ExportableReport
+    {
+        return new TrialBalanceReportTransformer($reportDTO);
+    }
+
+    public function exportCSV(): StreamedResponse
+    {
+        return $this->exportService->exportToCsv($this->company, $this->report, $this->startDate, $this->endDate);
+    }
+
+    public function exportPDF(): StreamedResponse
+    {
+        return $this->exportService->exportToPdf($this->company, $this->report, $this->startDate, $this->endDate);
+    }
+}

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/Filament/Company/Resources/Banking/AccountResource/Pages/CreateAccount.php

@@ -11,7 +11,7 @@ class CreateAccount extends CreateRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeCreate(array $data): array

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

@@ -19,9 +19,9 @@ class EditAccount extends EditRecord
         ];
     }
 
-    protected function getRedirectUrl(): ?string
+    protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeSave(array $data): array

app/Filament/Company/Resources/Core/DepartmentResource/Pages/CreateDepartment.php

@@ -11,6 +11,6 @@ class CreateDepartment extends CreateRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 }

app/Filament/Company/Resources/Core/DepartmentResource/Pages/EditDepartment.php

@@ -17,8 +17,8 @@ class EditDepartment extends EditRecord
         ];
     }
 
-    protected function getRedirectUrl(): ?string
+    protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 }

app/Http/Controllers/PlaidWebhookController.php

@@ -29,14 +29,14 @@ class PlaidWebhookController extends Controller
     private function handleDefaultUpdate(array $payload): void
     {
         $newTransactions = $payload['new_transactions'];
-        $itemID = $payload['item_id'];
+        $itemId = $payload['item_id'];
 
-        $company = Company::whereHas('connectedBankAccounts', static function ($query) use ($itemID) {
-            $query->where('item_id', $itemID);
+        $company = Company::whereHas('connectedBankAccounts', static function ($query) use ($itemId) {
+            $query->where('item_id', $itemId);
         })->first();
 
         if ($company && $newTransactions > 0) {
-            ProcessTransactionUpdate::dispatch($company, $itemID)
+            ProcessTransactionUpdate::dispatch($company, $itemId)
                 ->onQueue('transactions');
         }
     }

app/Jobs/ProcessTransactionImport.php

@@ -22,27 +22,13 @@ class ProcessTransactionImport implements ShouldQueue
     use Queueable;
     use SerializesModels;
 
-    protected Company $company;
-
-    protected Account $account;
-
-    protected BankAccount $bankAccount;
-
-    protected ConnectedBankAccount $connectedBankAccount;
-
-    protected string $startDate;
-
-    /**
-     * Create a new job instance.
-     */
-    public function __construct(Company $company, Account $account, BankAccount $bankAccount, ConnectedBankAccount $connectedBankAccount, string $startDate)
-    {
-        $this->company = $company;
-        $this->account = $account;
-        $this->bankAccount = $bankAccount;
-        $this->connectedBankAccount = $connectedBankAccount;
-        $this->startDate = $startDate;
-    }
+    public function __construct(
+        protected Company $company,
+        protected Account $account,
+        protected BankAccount $bankAccount,
+        protected ConnectedBankAccount $connectedBankAccount,
+        protected string $startDate
+    ) {}
 
     /**
      * Execute the job.

app/Jobs/ProcessTransactionUpdate.php

@@ -20,18 +20,10 @@ class ProcessTransactionUpdate implements ShouldQueue
     use Queueable;
     use SerializesModels;
 
-    protected Company $company;
-
-    protected string $item_id;
-
-    /**
-     * Create a new job instance.
-     */
-    public function __construct(Company $company, string $item_id)
-    {
-        $this->company = $company;
-        $this->item_id = $item_id;
-    }
+    public function __construct(
+        protected Company $company,
+        protected string $itemId
+    ) {}
 
     /**
      * Execute the job.
@@ -39,7 +31,7 @@ class ProcessTransactionUpdate implements ShouldQueue
     public function handle(PlaidService $plaidService, TransactionService $transactionService): void
     {
         $connectedBankAccounts = $this->company->connectedBankAccounts()
-            ->where('item_id', $this->item_id)
+            ->where('item_id', $this->itemId)
             ->where('import_transactions', true)
             ->get();
 

app/Listeners/ConfigureChartOfAccounts.php

@@ -72,14 +72,13 @@ 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,
                 ]);
 
                 if ($bankAccount) {
-                    $account->accountable()->associate($bankAccount);
+                    $account->bankAccount()->associate($bankAccount);
                 }
 
                 $account->save();

app/Listeners/CreateConnectedAccount.php

@@ -10,15 +10,12 @@ use Illuminate\Support\Facades\DB;
 
 class CreateConnectedAccount
 {
-    protected PlaidService $plaid;
-
     /**
      * Create the event listener.
      */
-    public function __construct(PlaidService $plaid)
-    {
-        $this->plaid = $plaid;
-    }
+    public function __construct(
+        protected PlaidService $plaidService
+    ) {}
 
     /**
      * Handle the event.
@@ -36,9 +33,9 @@ class CreateConnectedAccount
 
         $company = $event->company;
 
-        $authResponse = $this->plaid->getAccounts($accessToken);
+        $authResponse = $this->plaidService->getAccounts($accessToken);
 
-        $institutionResponse = $this->plaid->getInstitution($authResponse->item->institution_id, $company->profile->country);
+        $institutionResponse = $this->plaidService->getInstitution($authResponse->item->institution_id, $company->profile->country);
 
         $this->processInstitution($authResponse, $institutionResponse, $company, $accessToken);
     }

app/Listeners/HandleTransactionImport.php

@@ -9,15 +9,12 @@ use Illuminate\Support\Facades\DB;
 
 class HandleTransactionImport
 {
-    protected ConnectedBankAccountService $connectedBankAccountService;
-
     /**
      * Create the event listener.
      */
-    public function __construct(ConnectedBankAccountService $connectedBankAccountService)
-    {
-        $this->connectedBankAccountService = $connectedBankAccountService;
-    }
+    public function __construct(
+        protected ConnectedBankAccountService $connectedBankAccountService
+    ) {}
 
     /**
      * Handle the event.

app/Listeners/UpdateCurrencyRates.php

@@ -13,10 +13,9 @@ readonly class UpdateCurrencyRates
     /**
      * Create the event listener.
      */
-    public function __construct(private CurrencyHandler $currencyService)
-    {
-        //
-    }
+    public function __construct(
+        private CurrencyHandler $currencyService
+    ) {}
 
     /**
      * Handle the event.

app/Models/Accounting/Account.php

@@ -7,6 +7,7 @@ use App\Concerns\CompanyOwned;
 use App\Enums\Accounting\AccountCategory;
 use App\Enums\Accounting\AccountType;
 use App\Facades\Accounting;
+use App\Models\Banking\BankAccount;
 use App\Models\Setting\Currency;
 use App\Observers\AccountObserver;
 use Database\Factories\Accounting\AccountFactory;
@@ -17,7 +18,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Support\Carbon;
 
 #[ObservedBy(AccountObserver::class)]
@@ -39,10 +39,9 @@ class Account extends Model
         'name',
         'currency_code',
         'description',
-        'active',
+        'archived',
         'default',
-        'accountable_id',
-        'accountable_type',
+        'bank_account_id',
         'created_by',
         'updated_by',
     ];
@@ -50,7 +49,7 @@ class Account extends Model
     protected $casts = [
         'category' => AccountCategory::class,
         'type' => AccountType::class,
-        'active' => 'boolean',
+        'archived' => 'boolean',
         'default' => 'boolean',
     ];
 
@@ -75,9 +74,9 @@ class Account extends Model
         return $this->belongsTo(Currency::class, 'currency_code', 'code');
     }
 
-    public function accountable(): MorphTo
+    public function bankAccount(): BelongsTo
     {
-        return $this->morphTo();
+        return $this->belongsTo(BankAccount::class, 'bank_account_id');
     }
 
     public function getLastTransactionDate(): ?string

app/Models/Accounting/JournalEntry.php

@@ -7,7 +7,6 @@ use App\Collections\Accounting\JournalEntryCollection;
 use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
 use App\Enums\Accounting\JournalEntryType;
-use App\Models\Banking\BankAccount;
 use Database\Factories\Accounting\JournalEntryFactory;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -46,11 +45,6 @@ class JournalEntry extends Model
         return $this->belongsTo(Transaction::class, 'transaction_id');
     }
 
-    public function bankAccount(): BelongsTo
-    {
-        return $this->account()->where('accountable_type', BankAccount::class);
-    }
-
     public function isUncategorized(): bool
     {
         return $this->account->isUncategorized();

app/Models/Banking/BankAccount.php

@@ -19,7 +19,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
-use Illuminate\Database\Eloquent\Relations\MorphOne;
 
 #[ObservedBy(BankAccountObserver::class)]
 class BankAccount extends Model
@@ -56,9 +55,9 @@ class BankAccount extends Model
         return $this->hasOne(ConnectedBankAccount::class, 'bank_account_id');
     }
 
-    public function account(): MorphOne
+    public function account(): HasOne
     {
-        return $this->morphOne(Account::class, 'accountable');
+        return $this->hasOne(Account::class, 'bank_account_id');
     }
 
     public function institution(): BelongsTo

app/Models/Banking/Institution.php

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Support\Carbon;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Support\Facades\Storage;
 
 class Institution extends Model
@@ -46,34 +46,9 @@ class Institution extends Model
         return $this->hasMany(ConnectedBankAccount::class, 'institution_id');
     }
 
-    public function getLastTransactionDate(): ?string
+    public function latestImport(): HasOne
     {
-        $latestDate = $this->connectedBankAccounts->map(function ($connectedBankAccount) {
-            if ($connectedBankAccount->bankAccount) {
-                return $connectedBankAccount->bankAccount->transactions()->max('posted_at');
-            }
-
-            return null;
-        })->filter()->max();
-
-        if ($latestDate) {
-            return Carbon::parse($latestDate)->diffForHumans();
-        }
-
-        return null;
-    }
-
-    public function getLastImportDate(): ?string
-    {
-        $latestDate = $this->connectedBankAccounts->map(function ($connectedBankAccount) {
-            return $connectedBankAccount->last_imported_at;
-        })->filter()->max();
-
-        if ($latestDate) {
-            return Carbon::parse($latestDate)->diffForHumans();
-        }
-
-        return null;
+        return $this->hasOne(ConnectedBankAccount::class, 'institution_id')->latestOfMany('last_imported_at');
     }
 
     protected function logoUrl(): Attribute

app/Observers/AccountObserver.php

@@ -6,14 +6,15 @@ use App\Enums\Accounting\AccountCategory;
 use App\Enums\Accounting\AccountType;
 use App\Models\Accounting\Account;
 use App\Models\Accounting\AccountSubtype;
-use App\Models\Banking\BankAccount;
 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
@@ -36,13 +37,18 @@ 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);
 
         $account->code = $generatedAccountCode;
-
-        $account->save();
     }
 
     /**
@@ -50,8 +56,9 @@ class AccountObserver
      */
     public function created(Account $account): void
     {
-        if (($account->accountable_type === BankAccount::class) && $account->code === null) {
+        if ($account->bankAccount && $account->code === null) {
             $this->setFieldsForBankAccount($account);
+            $account->save();
         }
     }
 }

app/Providers/CurrencyServiceProvider.php

@@ -21,7 +21,5 @@ class CurrencyServiceProvider extends ServiceProvider
         });
     }
 
-    public function boot(): void
-    {
-    }
+    public function boot(): void {}
 }

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/Providers/SquireServiceProvider.php

@@ -10,10 +10,7 @@ use Squire\Repository;
 
 class SquireServiceProvider extends ServiceProvider
 {
-    public function register(): void
-    {
-
-    }
+    public function register(): void {}
 
     public function boot(): void
     {

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/AccountBalancesExportService.php

@@ -1,76 +0,0 @@
-<?php
-
-namespace App\Services;
-
-use App\DTO\AccountBalanceReportDTO;
-use App\Models\Company;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-
-class AccountBalancesExportService
-{
-    public function exportToCsv(Company $company, AccountBalanceReportDTO $accountBalanceReport, string $startDate, string $endDate): StreamedResponse
-    {
-        // Construct the filename
-        $filename = $company->name . ' Account Balances ' . $startDate . ' to ' . $endDate . '.csv';
-
-        $headers = [
-            'Content-Type' => 'text/csv',
-            'Content-Disposition' => 'attachment; filename="' . $filename . '"',
-        ];
-
-        $callback = static function () use ($company, $startDate, $endDate, $accountBalanceReport) {
-            $file = fopen('php://output', 'wb');
-
-            fputcsv($file, ['Account Balances']);
-            fputcsv($file, [$company->name]);
-            fputcsv($file, ['Date Range: ' . $startDate . ' to ' . $endDate]);
-            fputcsv($file, []);
-
-            fputcsv($file, ['ACCOUNT CODE', 'ACCOUNT', 'STARTING BALANCE', 'DEBIT', 'CREDIT', 'NET MOVEMENT', 'ENDING BALANCE']);
-
-            foreach ($accountBalanceReport->categories as $accountCategoryName => $accountCategory) {
-                fputcsv($file, ['', $accountCategoryName]);
-
-                foreach ($accountCategory->accounts as $account) {
-                    fputcsv($file, [
-                        $account->accountCode,
-                        $account->accountName,
-                        $account->balance->startingBalance ?? '',
-                        $account->balance->debitBalance,
-                        $account->balance->creditBalance,
-                        $account->balance->netMovement,
-                        $account->balance->endingBalance ?? '',
-                    ]);
-                }
-
-                // Category Summary row
-                fputcsv($file, [
-                    '',
-                    'Total ' . $accountCategoryName,
-                    $accountCategory->summary->startingBalance ?? '',
-                    $accountCategory->summary->debitBalance,
-                    $accountCategory->summary->creditBalance,
-                    $accountCategory->summary->netMovement,
-                    $accountCategory->summary->endingBalance ?? '',
-                ]);
-
-                fputcsv($file, []);
-            }
-
-            // Final Row for overall totals
-            fputcsv($file, [
-                '',
-                'Total for all accounts',
-                '',
-                $accountBalanceReport->overallTotal->debitBalance,
-                $accountBalanceReport->overallTotal->creditBalance,
-                '',
-                '',
-            ]);
-
-            fclose($file);
-        };
-
-        return response()->streamDownload($callback, $filename, $headers);
-    }
-}

app/Services/AccountService.php

@@ -3,10 +3,6 @@
 namespace App\Services;
 
 use App\Contracts\AccountHandler;
-use App\DTO\AccountBalanceDTO;
-use App\DTO\AccountBalanceReportDTO;
-use App\DTO\AccountCategoryDTO;
-use App\DTO\AccountDTO;
 use App\Enums\Accounting\AccountCategory;
 use App\Models\Accounting\Account;
 use App\Models\Accounting\Transaction;
@@ -14,16 +10,12 @@ use App\Models\Banking\BankAccount;
 use App\Repositories\Accounting\JournalEntryRepository;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\ValueObjects\Money;
-use Illuminate\Database\Eloquent\Collection;
 
 class AccountService implements AccountHandler
 {
-    protected JournalEntryRepository $journalEntryRepository;
-
-    public function __construct(JournalEntryRepository $journalEntryRepository)
-    {
-        $this->journalEntryRepository = $journalEntryRepository;
-    }
+    public function __construct(
+        protected JournalEntryRepository $journalEntryRepository
+    ) {}
 
     public function getDebitBalance(Account $account, string $startDate, string $endDate): Money
     {
@@ -63,18 +55,19 @@ class AccountService implements AccountHandler
 
     public function getEndingBalance(Account $account, string $startDate, string $endDate): ?Money
     {
+        $netMovement = $this->getNetMovement($account, $startDate, $endDate)->getAmount();
+
         if (in_array($account->category, [AccountCategory::Expense, AccountCategory::Revenue], true)) {
-            return null;
+            return new Money($netMovement, $account->currency_code);
         }
 
         $startingBalance = $this->getStartingBalance($account, $startDate)?->getAmount();
-        $netMovement = $this->getNetMovement($account, $startDate, $endDate)->getAmount();
         $endingBalance = $startingBalance + $netMovement;
 
         return new Money($endingBalance, $account->currency_code);
     }
 
-    public function calculateNetMovementByCategory(AccountCategory $category, int $debitBalance, int $creditBalance): int
+    private function calculateNetMovementByCategory(AccountCategory $category, int $debitBalance, int $creditBalance): int
     {
         return match ($category) {
             AccountCategory::Asset, AccountCategory::Expense => $debitBalance - $creditBalance,
@@ -102,102 +95,20 @@ class AccountService implements AccountHandler
         return $balances;
     }
 
-    public function formatBalances(array $balances): AccountBalanceDTO
-    {
-        $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
-
-        foreach ($balances as $key => $balance) {
-            $balances[$key] = money($balance, $defaultCurrency)->format();
-        }
-
-        return new AccountBalanceDTO(
-            startingBalance: $balances['starting_balance'] ?? null,
-            debitBalance: $balances['debit_balance'],
-            creditBalance: $balances['credit_balance'],
-            netMovement: $balances['net_movement'] ?? null,
-            endingBalance: $balances['ending_balance'] ?? null,
-        );
-    }
-
-    public function buildAccountBalanceReport(string $startDate, string $endDate): AccountBalanceReportDTO
-    {
-        $allCategories = $this->getAccountCategoryOrder();
-
-        $categoryGroupedAccounts = Account::whereHas('journalEntries')
-            ->select('id', 'name', 'currency_code', 'category', 'code')
-            ->get()
-            ->groupBy(fn (Account $account) => $account->category->getPluralLabel())
-            ->sortBy(static fn (Collection $groupedAccounts, string $key) => array_search($key, $allCategories, true));
-
-        $accountCategories = [];
-        $reportTotalBalances = [
-            'debit_balance' => 0,
-            'credit_balance' => 0,
-        ];
-
-        foreach ($allCategories as $categoryName) {
-            $accountsInCategory = $categoryGroupedAccounts[$categoryName] ?? collect();
-            $categorySummaryBalances = [
-                'debit_balance' => 0,
-                'credit_balance' => 0,
-                'net_movement' => 0,
-            ];
-
-            if (! in_array($categoryName, [AccountCategory::Expense->getPluralLabel(), AccountCategory::Revenue->getPluralLabel()], true)) {
-                $categorySummaryBalances['starting_balance'] = 0;
-                $categorySummaryBalances['ending_balance'] = 0;
-            }
-
-            $categoryAccounts = [];
-
-            foreach ($accountsInCategory as $account) {
-                /** @var Account $account */
-                $accountBalances = $this->getBalances($account, $startDate, $endDate);
-
-                if (array_sum($accountBalances) === 0) {
-                    continue;
-                }
-
-                foreach ($accountBalances as $accountBalanceType => $accountBalance) {
-                    $categorySummaryBalances[$accountBalanceType] += $accountBalance;
-                }
-
-                $formattedAccountBalances = $this->formatBalances($accountBalances);
-
-                $categoryAccounts[] = new AccountDTO(
-                    $account->name,
-                    $account->code,
-                    $formattedAccountBalances,
-                );
-            }
-
-            $reportTotalBalances['debit_balance'] += $categorySummaryBalances['debit_balance'];
-            $reportTotalBalances['credit_balance'] += $categorySummaryBalances['credit_balance'];
-
-            $formattedCategorySummaryBalances = $this->formatBalances($categorySummaryBalances);
-
-            $accountCategories[$categoryName] = new AccountCategoryDTO(
-                $categoryAccounts,
-                $formattedCategorySummaryBalances,
-            );
-        }
-
-        $formattedReportTotalBalances = $this->formatBalances($reportTotalBalances);
-
-        return new AccountBalanceReportDTO($accountCategories, $formattedReportTotalBalances);
-    }
-
     public function getTotalBalanceForAllBankAccounts(string $startDate, string $endDate): Money
     {
-        $bankAccountsAccounts = Account::where('accountable_type', BankAccount::class)
+        $bankAccounts = BankAccount::with('account')
             ->get();
 
         $totalBalance = 0;
 
-        // Get ending balance for each bank account
-        foreach ($bankAccountsAccounts as $account) {
-            $endingBalance = $this->getEndingBalance($account, $startDate, $endDate)?->getAmount() ?? 0;
-            $totalBalance += $endingBalance;
+        foreach ($bankAccounts as $bankAccount) {
+            $account = $bankAccount->account;
+
+            if ($account) {
+                $endingBalance = $this->getEndingBalance($account, $startDate, $endDate)?->getAmount() ?? 0;
+                $totalBalance += $endingBalance;
+            }
         }
 
         return new Money($totalBalance, CurrencyAccessor::getDefaultCurrency());

app/Services/ConnectedBankAccountService.php

@@ -11,15 +11,10 @@ use App\Repositories\Banking\ConnectedBankAccountRepository;
 
 class ConnectedBankAccountService
 {
-    protected AccountSubtypeRepository $accountSubtypeRepository;
-
-    protected ConnectedBankAccountRepository $connectedBankAccountRepository;
-
-    public function __construct(AccountSubtypeRepository $accountSubtypeRepository, ConnectedBankAccountRepository $connectedBankAccountRepository)
-    {
-        $this->accountSubtypeRepository = $accountSubtypeRepository;
-        $this->connectedBankAccountRepository = $connectedBankAccountRepository;
-    }
+    public function __construct(
+        protected AccountSubtypeRepository $accountSubtypeRepository,
+        protected ConnectedBankAccountRepository $connectedBankAccountRepository
+    ) {}
 
     public function getOrProcessBankAccountForConnectedBankAccount(Company $company, ConnectedBankAccount $connectedBankAccount, int | string $selectedBankAccountId): BankAccount
     {

app/Services/CurrencyService.php

@@ -10,25 +10,18 @@ use Illuminate\Support\Facades\Log;
 
 class CurrencyService implements CurrencyHandler
 {
-    protected ?string $api_key;
-
-    protected ?string $base_url;
-
-    protected Client $client;
-
-    public function __construct(?string $api_key, ?string $base_url, Client $client)
-    {
-        $this->api_key = $api_key;
-        $this->base_url = $base_url;
-        $this->client = $client;
-    }
+    public function __construct(
+        protected ?string $apiKey,
+        protected ?string $baseUrl,
+        protected Client $client
+    ) {}
 
     /**
      * Determine if the Currency Exchange Rate feature is enabled.
      */
     public function isEnabled(): bool
     {
-        return filled($this->api_key) && filled($this->base_url);
+        return filled($this->apiKey) && filled($this->baseUrl);
     }
 
     public function getSupportedCurrencies(): ?array
@@ -38,7 +31,7 @@ class CurrencyService implements CurrencyHandler
         }
 
         return Cache::remember('supported_currency_codes', now()->addMonth(), function () {
-            $response = $this->client->get("{$this->base_url}/{$this->api_key}/codes");
+            $response = $this->client->get("{$this->baseUrl}/{$this->apiKey}/codes");
 
             if ($response->getStatusCode() === 200) {
                 $responseData = json_decode($response->getBody()->getContents(), true);
@@ -106,7 +99,7 @@ class CurrencyService implements CurrencyHandler
     public function updateCurrencyRatesCache(string $baseCurrency): ?array
     {
         try {
-            $response = $this->client->get("{$this->base_url}/{$this->api_key}/latest/{$baseCurrency}");
+            $response = $this->client->get("{$this->baseUrl}/{$this->apiKey}/latest/{$baseCurrency}");
 
             if ($response->getStatusCode() === 200) {
                 $responseData = json_decode($response->getBody()->getContents(), true);

app/Services/ExportService.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Services;
+
+use App\Contracts\ExportableReport;
+use App\Models\Company;
+use Barryvdh\DomPDF\Facade\Pdf;
+use Illuminate\Support\Carbon;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class ExportService
+{
+    public function exportToCsv(Company $company, ExportableReport $report, string $startDate, string $endDate): StreamedResponse
+    {
+        $filename = $company->name . ' ' . $report->getTitle() . ' ' . $startDate . ' to ' . $endDate . '.csv';
+
+        $headers = [
+            'Content-Type' => 'text/csv',
+            'Content-Disposition' => 'attachment; filename="' . $filename . '"',
+        ];
+
+        $callback = function () use ($report, $company, $startDate, $endDate) {
+            $file = fopen('php://output', 'wb');
+
+            fputcsv($file, [$report->getTitle()]);
+            fputcsv($file, [$company->name]);
+            fputcsv($file, ['Date Range: ' . $startDate . ' to ' . $endDate]);
+            fputcsv($file, []);
+
+            fputcsv($file, $report->getHeaders());
+
+            foreach ($report->getCategories() as $category) {
+                fputcsv($file, $category->header);
+
+                foreach ($category->data as $accountRow) {
+                    fputcsv($file, $accountRow);
+                }
+
+                fputcsv($file, $category->summary);
+                fputcsv($file, []); // Empty row for spacing
+            }
+
+            fputcsv($file, $report->getOverallTotals());
+
+            fclose($file);
+        };
+
+        return response()->streamDownload($callback, $filename, $headers);
+    }
+
+    public function exportToPdf(Company $company, ExportableReport $report, string $startDate, string $endDate): StreamedResponse
+    {
+        $pdf = Pdf::loadView('components.company.reports.report-pdf', [
+            'company' => $company,
+            'report' => $report,
+            'startDate' => Carbon::parse($startDate)->format('M d, Y'),
+            'endDate' => Carbon::parse($endDate)->format('M d, Y'),
+        ])->setPaper('a4');
+
+        return response()->streamDownload(function () use ($pdf) {
+            echo $pdf->stream();
+        }, strtolower(str_replace(' ', '-', $company->name . '-' . $report->getTitle())) . '.pdf');
+    }
+}

app/Services/PlaidService.php

@@ -15,15 +15,15 @@ class PlaidService
 {
     public const API_VERSION = '2020-09-14';
 
-    protected ?string $client_id;
+    protected ?string $clientId;
 
-    protected ?string $client_secret;
+    protected ?string $clientSecret;
 
     protected ?string $environment;
 
-    protected ?string $webhook_url;
+    protected ?string $webhookUrl;
 
-    protected ?string $base_url;
+    protected ?string $baseUrl;
 
     protected HttpClient $client;
 
@@ -50,18 +50,18 @@ class PlaidService
     {
         $this->client = $client;
         $this->config = $config;
-        $this->client_id = $this->config->get('plaid.client_id');
-        $this->client_secret = $this->config->get('plaid.client_secret');
+        $this->clientId = $this->config->get('plaid.client_id');
+        $this->clientSecret = $this->config->get('plaid.client_secret');
         $this->environment = $this->config->get('plaid.environment', 'sandbox');
-        $this->webhook_url = $this->config->get('plaid.webhook_url');
+        $this->webhookUrl = $this->config->get('plaid.webhook_url');
 
         $this->setBaseUrl($this->environment);
     }
 
-    public function setClientCredentials(?string $client_id, ?string $client_secret): self
+    public function setClientCredentials(?string $clientId, ?string $clientSecret): self
     {
-        $this->client_id = $client_id ?? $this->client_id;
-        $this->client_secret = $client_secret ?? $this->client_secret;
+        $this->clientId = $clientId ?? $this->clientId;
+        $this->clientSecret = $clientSecret ?? $this->clientSecret;
 
         return $this;
     }
@@ -77,7 +77,7 @@ class PlaidService
 
     public function setBaseUrl(?string $environment): void
     {
-        $this->base_url = match ($environment) {
+        $this->baseUrl = match ($environment) {
             'development' => 'https://development.plaid.com',
             'production' => 'https://production.plaid.com',
             default => 'https://sandbox.plaid.com', // Default to sandbox, including if environment is null
@@ -86,7 +86,7 @@ class PlaidService
 
     public function getBaseUrl(): string
     {
-        return $this->base_url;
+        return $this->baseUrl;
     }
 
     public function getEnvironment(): string
@@ -99,12 +99,12 @@ class PlaidService
         $request = $this->client->withHeaders([
             'Plaid-Version' => self::API_VERSION,
             'Content-Type' => 'application/json',
-        ])->baseUrl($this->base_url);
+        ])->baseUrl($this->baseUrl);
 
         if ($method === 'post') {
             $request = $request->withHeaders([
-                'PLAID-CLIENT-ID' => $this->client_id,
-                'PLAID-SECRET' => $this->client_secret,
+                'PLAID-CLIENT-ID' => $this->clientId,
+                'PLAID-SECRET' => $this->clientSecret,
             ]);
         }
 
@@ -181,12 +181,12 @@ class PlaidService
         );
     }
 
-    public function createLinkToken(string $client_name, string $language, array $country_codes, array $user, array $products): object
+    public function createLinkToken(string $clientName, string $language, array $countryCodes, array $user, array $products): object
     {
         $data = [
-            'client_name' => $client_name,
+            'client_name' => $clientName,
             'language' => $language,
-            'country_codes' => $country_codes,
+            'country_codes' => $countryCodes,
             'user' => (object) $user,
         ];
 
@@ -194,16 +194,18 @@ class PlaidService
             $data['products'] = $products;
         }
 
-        if (! empty($this->webhook_url)) {
-            $data['webhook'] = $this->webhook_url;
+        if (! empty($this->webhookUrl)) {
+            $data['webhook'] = $this->webhookUrl;
         }
 
         return $this->sendRequest('link/token/create', $data);
     }
 
-    public function exchangePublicToken(string $public_token): object
+    public function exchangePublicToken(string $publicToken): object
     {
-        $data = compact('public_token');
+        $data = [
+            'public_token' => $publicToken,
+        ];
 
         return $this->sendRequest('item/public_token/exchange', $data);
     }
@@ -218,7 +220,7 @@ class PlaidService
         return $this->sendRequest('accounts/get', $data);
     }
 
-    public function getInstitution(string $institution_id, string $country): object
+    public function getInstitution(string $institutionId, string $country): object
     {
         $options = [
             'include_optional_metadata' => true,
@@ -226,49 +228,57 @@ class PlaidService
 
         $plaidCountry = $this->getCountry($country);
 
-        return $this->getInstitutionById($institution_id, [$plaidCountry], $options);
+        return $this->getInstitutionById($institutionId, [$plaidCountry], $options);
     }
 
-    public function getInstitutionById(string $institution_id, array $country_codes, array $options = []): object
+    public function getInstitutionById(string $institutionId, array $countryCodes, array $options = []): object
     {
         $data = [
-            'institution_id' => $institution_id,
-            'country_codes' => $country_codes,
+            'institution_id' => $institutionId,
+            'country_codes' => $countryCodes,
             'options' => (object) $options,
         ];
 
         return $this->sendRequest('institutions/get_by_id', $data);
     }
 
-    public function getTransactions(string $access_token, string $start_date, string $end_date, array $options = []): object
+    public function getTransactions(string $accessToken, string $startDate, string $endDate, array $options = []): object
     {
         $data = [
-            'access_token' => $access_token,
-            'start_date' => $start_date,
-            'end_date' => $end_date,
+            'access_token' => $accessToken,
+            'start_date' => $startDate,
+            'end_date' => $endDate,
             'options' => (object) $options,
         ];
 
         return $this->sendRequest('transactions/get', $data);
     }
 
-    public function fireSandboxWebhook(string $access_token, string $webhook_code, string $webhook_type): object
+    public function fireSandboxWebhook(string $accessToken, string $webhookCode, string $webhookType): object
     {
-        $data = compact('access_token', 'webhook_code', 'webhook_type');
+        $data = [
+            'access_token' => $accessToken,
+            'webhook_code' => $webhookCode,
+            'webhook_type' => $webhookType,
+        ];
 
         return $this->sendRequest('sandbox/item/fire_webhook', $data);
     }
 
-    public function refreshTransactions(string $access_token): object
+    public function refreshTransactions(string $accessToken): object
     {
-        $data = compact('access_token');
+        $data = [
+            'access_token' => $accessToken,
+        ];
 
         return $this->sendRequest('transactions/refresh', $data);
     }
 
-    public function removeItem(string $access_token): object
+    public function removeItem(string $accessToken): object
     {
-        $data = compact('access_token');
+        $data = [
+            'access_token' => $accessToken,
+        ];
 
         return $this->sendRequest('item/remove', $data);
     }

app/Services/ReportService.php

@@ -0,0 +1,170 @@
+<?php
+
+namespace App\Services;
+
+use App\DTO\AccountBalanceDTO;
+use App\DTO\AccountCategoryDTO;
+use App\DTO\AccountDTO;
+use App\DTO\ReportDTO;
+use App\Enums\Accounting\AccountCategory;
+use App\Models\Accounting\Account;
+use App\Utilities\Currency\CurrencyAccessor;
+use Illuminate\Database\Eloquent\Collection;
+
+class ReportService
+{
+    public function __construct(
+        protected AccountService $accountService,
+    ) {}
+
+    public function formatBalances(array $balances): AccountBalanceDTO
+    {
+        $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
+
+        foreach ($balances as $key => $balance) {
+            $balances[$key] = money($balance, $defaultCurrency)->format();
+        }
+
+        return new AccountBalanceDTO(
+            startingBalance: $balances['starting_balance'] ?? null,
+            debitBalance: $balances['debit_balance'],
+            creditBalance: $balances['credit_balance'],
+            netMovement: $balances['net_movement'] ?? null,
+            endingBalance: $balances['ending_balance'] ?? null,
+        );
+    }
+
+    private function filterBalances(array $balances, array $fields): array
+    {
+        return array_filter($balances, static fn ($key) => in_array($key, $fields, true), ARRAY_FILTER_USE_KEY);
+    }
+
+    private function getCategoryGroupedAccounts(array $allCategories): Collection
+    {
+        return Account::whereHas('journalEntries')
+            ->select('id', 'name', 'currency_code', 'category', 'code')
+            ->get()
+            ->groupBy(fn (Account $account) => $account->category->getPluralLabel())
+            ->sortBy(static fn (Collection $groupedAccounts, string $key) => array_search($key, $allCategories, true));
+    }
+
+    public function buildAccountBalanceReport(string $startDate, string $endDate, array $columns = []): ReportDTO
+    {
+        $allCategories = $this->accountService->getAccountCategoryOrder();
+
+        $categoryGroupedAccounts = $this->getCategoryGroupedAccounts($allCategories);
+
+        $balanceFields = ['starting_balance', 'debit_balance', 'credit_balance', 'net_movement', 'ending_balance'];
+
+        return $this->buildReport(
+            $allCategories,
+            $categoryGroupedAccounts,
+            fn (Account $account) => $this->accountService->getBalances($account, $startDate, $endDate),
+            $balanceFields,
+            $columns,
+            fn (string $categoryName, array &$categorySummaryBalances) => $this->adjustAccountBalanceCategoryFields($categoryName, $categorySummaryBalances),
+        );
+    }
+
+    public function buildTrialBalanceReport(string $startDate, string $endDate, array $columns = []): ReportDTO
+    {
+        $allCategories = $this->accountService->getAccountCategoryOrder();
+
+        $categoryGroupedAccounts = $this->getCategoryGroupedAccounts($allCategories);
+
+        $balanceFields = ['debit_balance', 'credit_balance'];
+
+        return $this->buildReport($allCategories, $categoryGroupedAccounts, function (Account $account) use ($startDate, $endDate) {
+            $endingBalance = $this->accountService->getEndingBalance($account, $startDate, $endDate)?->getAmount() ?? 0;
+
+            if ($endingBalance === 0) {
+                return [];
+            }
+
+            return $this->calculateTrialBalance($account->category, $endingBalance);
+        }, $balanceFields, $columns);
+    }
+
+    private function buildReport(array $allCategories, Collection $categoryGroupedAccounts, callable $balanceCalculator, array $balanceFields, array $allFields, ?callable $initializeCategoryBalances = null): ReportDTO
+    {
+        $accountCategories = [];
+        $reportTotalBalances = array_fill_keys($balanceFields, 0);
+
+        foreach ($allCategories as $categoryName) {
+            $accountsInCategory = $categoryGroupedAccounts[$categoryName] ?? collect();
+            $categorySummaryBalances = array_fill_keys($balanceFields, 0);
+
+            if ($initializeCategoryBalances) {
+                $initializeCategoryBalances($categoryName, $categorySummaryBalances);
+            }
+
+            $categoryAccounts = [];
+
+            foreach ($accountsInCategory as $account) {
+                /** @var Account $account */
+                $accountBalances = $balanceCalculator($account);
+
+                if (array_sum($accountBalances) === 0) {
+                    continue;
+                }
+
+                foreach ($accountBalances as $accountBalanceType => $accountBalance) {
+                    if (array_key_exists($accountBalanceType, $categorySummaryBalances)) {
+                        $categorySummaryBalances[$accountBalanceType] += $accountBalance;
+                    }
+                }
+
+                $filteredAccountBalances = $this->filterBalances($accountBalances, $balanceFields);
+                $formattedAccountBalances = $this->formatBalances($filteredAccountBalances);
+
+                $categoryAccounts[] = new AccountDTO(
+                    $account->name,
+                    $account->code,
+                    $formattedAccountBalances,
+                );
+            }
+
+            foreach ($balanceFields as $field) {
+                if (array_key_exists($field, $categorySummaryBalances)) {
+                    $reportTotalBalances[$field] += $categorySummaryBalances[$field];
+                }
+            }
+
+            $filteredCategorySummaryBalances = $this->filterBalances($categorySummaryBalances, $balanceFields);
+            $formattedCategorySummaryBalances = $this->formatBalances($filteredCategorySummaryBalances);
+
+            $accountCategories[$categoryName] = new AccountCategoryDTO(
+                $categoryAccounts,
+                $formattedCategorySummaryBalances,
+            );
+        }
+
+        $formattedReportTotalBalances = $this->formatBalances($reportTotalBalances);
+
+        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $allFields);
+    }
+
+    private function adjustAccountBalanceCategoryFields(string $categoryName, array &$categorySummaryBalances): void
+    {
+        if (in_array($categoryName, [AccountCategory::Expense->getPluralLabel(), AccountCategory::Revenue->getPluralLabel()], true)) {
+            unset($categorySummaryBalances['starting_balance'], $categorySummaryBalances['ending_balance']);
+        }
+    }
+
+    private function calculateTrialBalance(AccountCategory $category, int $endingBalance): array
+    {
+        if (in_array($category, [AccountCategory::Asset, AccountCategory::Expense], true)) {
+            if ($endingBalance >= 0) {
+                return ['debit_balance' => $endingBalance, 'credit_balance' => 0];
+            }
+
+            return ['debit_balance' => 0, 'credit_balance' => abs($endingBalance)];
+        }
+
+        if ($endingBalance >= 0) {
+            return ['debit_balance' => 0, 'credit_balance' => $endingBalance];
+        }
+
+        return ['debit_balance' => abs($endingBalance), 'credit_balance' => 0];
+    }
+}

app/Support/Column.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Support;
+
+use Filament\Support\Components\Component;
+use Filament\Support\Concerns\HasAlignment;
+use Filament\Support\Enums\Alignment;
+use Filament\Tables\Columns\Concerns\CanBeHidden;
+use Filament\Tables\Columns\Concerns\CanBeToggled;
+use Filament\Tables\Columns\Concerns\HasLabel;
+use Filament\Tables\Columns\Concerns\HasName;
+
+class Column extends Component
+{
+    use CanBeHidden;
+    use CanBeToggled;
+    use HasAlignment;
+    use HasLabel;
+    use HasName;
+
+    final public function __construct(string $name)
+    {
+        $this->name($name);
+    }
+
+    public static function make(string $name): static
+    {
+        $static = app(static::class, ['name' => $name]);
+        $static->configure();
+
+        return $static;
+    }
+
+    public function getAlignmentClass(): string
+    {
+        return match ($this->getAlignment()) {
+            Alignment::Center, Alignment::Justify, Alignment::Between => 'text-center',
+            Alignment::Left, Alignment::Start => 'text-left',
+            Alignment::Right, Alignment::End => 'text-right',
+            default => '',
+        };
+    }
+}

app/Transformers/AccountBalanceReportTransformer.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace App\Transformers;
+
+use App\DTO\AccountDTO;
+use App\DTO\ReportCategoryDTO;
+use App\Support\Column;
+
+class AccountBalanceReportTransformer extends BaseReportTransformer
+{
+    public function getTitle(): string
+    {
+        return 'Account Balances';
+    }
+
+    public function getHeaders(): array
+    {
+        return array_map(fn (Column $column) => $column->getLabel(), $this->getColumns());
+    }
+
+    /**
+     * @return ReportCategoryDTO[]
+     */
+    public function getCategories(): array
+    {
+        $categories = [];
+
+        foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
+            // Initialize header with empty strings
+            $header = [];
+
+            foreach ($this->getColumns() as $index => $column) {
+                if ($column->getName() === 'account_name') {
+                    $header[$index] = $accountCategoryName;
+                } else {
+                    $header[$index] = '';
+                }
+            }
+
+            $data = array_map(function (AccountDTO $account) {
+                $row = [];
+
+                foreach ($this->getColumns() as $column) {
+                    $row[] = match ($column->getName()) {
+                        'account_code' => $account->accountCode,
+                        'account_name' => $account->accountName,
+                        'starting_balance' => $account->balance->startingBalance ?? '',
+                        'debit_balance' => $account->balance->debitBalance,
+                        'credit_balance' => $account->balance->creditBalance,
+                        'net_movement' => $account->balance->netMovement ?? '',
+                        'ending_balance' => $account->balance->endingBalance ?? '',
+                        default => '',
+                    };
+                }
+
+                return $row;
+            }, $accountCategory->accounts);
+
+            $summary = [];
+
+            foreach ($this->getColumns() as $column) {
+                $summary[] = match ($column->getName()) {
+                    'account_name' => 'Total ' . $accountCategoryName,
+                    'starting_balance' => $accountCategory->summary->startingBalance ?? '',
+                    'debit_balance' => $accountCategory->summary->debitBalance,
+                    'credit_balance' => $accountCategory->summary->creditBalance,
+                    'net_movement' => $accountCategory->summary->netMovement ?? '',
+                    'ending_balance' => $accountCategory->summary->endingBalance ?? '',
+                    default => '',
+                };
+            }
+
+            $categories[] = new ReportCategoryDTO(
+                header: $header,
+                data: $data,
+                summary: $summary,
+            );
+        }
+
+        return $categories;
+    }
+
+    public function getOverallTotals(): array
+    {
+        $totals = [];
+
+        foreach ($this->getColumns() as $column) {
+            $totals[] = match ($column->getName()) {
+                'account_name' => 'Total for all accounts',
+                'debit_balance' => $this->report->overallTotal->debitBalance,
+                'credit_balance' => $this->report->overallTotal->creditBalance,
+                default => '',
+            };
+        }
+
+        return $totals;
+    }
+}

app/Transformers/BaseReportTransformer.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Transformers;
+
+use App\Contracts\ExportableReport;
+use App\DTO\ReportDTO;
+use Filament\Support\Enums\Alignment;
+use Livewire\Wireable;
+
+abstract class BaseReportTransformer implements ExportableReport, Wireable
+{
+    protected ReportDTO $report;
+
+    public function __construct(ReportDTO $report)
+    {
+        $this->report = $report;
+    }
+
+    public function getColumns(): array
+    {
+        return $this->report->fields;
+    }
+
+    public function getAlignmentClass(int $index): string
+    {
+        $column = $this->getColumns()[$index];
+
+        if ($column->getAlignment() === Alignment::Right) {
+            return 'text-right';
+        }
+
+        if ($column->getAlignment() === Alignment::Center) {
+            return 'text-center';
+        }
+
+        return 'text-left';
+    }
+
+    public function toLivewire(): array
+    {
+        return [
+            'report' => $this->report->toLivewire(),
+        ];
+    }
+
+    public static function fromLivewire($value): static
+    {
+        return new static(
+            ReportDTO::fromLivewire($value['report']),
+        );
+    }
+}

app/Transformers/TrialBalanceReportTransformer.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace App\Transformers;
+
+use App\DTO\AccountDTO;
+use App\DTO\ReportCategoryDTO;
+use App\Support\Column;
+
+class TrialBalanceReportTransformer extends BaseReportTransformer
+{
+    public function getTitle(): string
+    {
+        return 'Trial Balance';
+    }
+
+    public function getHeaders(): array
+    {
+        return array_map(fn (Column $column) => $column->getLabel(), $this->getColumns());
+    }
+
+    /**
+     * @return ReportCategoryDTO[]
+     */
+    public function getCategories(): array
+    {
+        $categories = [];
+
+        foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
+            // Initialize header with empty strings
+            $header = [];
+
+            foreach ($this->getColumns() as $index => $column) {
+                if ($column->getName() === 'account_name') {
+                    $header[$index] = $accountCategoryName;
+                } else {
+                    $header[$index] = '';
+                }
+            }
+
+            $data = array_map(function (AccountDTO $account) {
+                $row = [];
+
+                foreach ($this->getColumns() as $column) {
+                    $row[] = match ($column->getName()) {
+                        'account_code' => $account->accountCode,
+                        'account_name' => $account->accountName,
+                        'debit_balance' => $account->balance->debitBalance,
+                        'credit_balance' => $account->balance->creditBalance,
+                        default => '',
+                    };
+                }
+
+                return $row;
+            }, $accountCategory->accounts);
+
+            $summary = [];
+
+            foreach ($this->getColumns() as $column) {
+                $summary[] = match ($column->getName()) {
+                    'account_name' => 'Total ' . $accountCategoryName,
+                    'debit_balance' => $accountCategory->summary->debitBalance,
+                    'credit_balance' => $accountCategory->summary->creditBalance,
+                    default => '',
+                };
+            }
+
+            $categories[] = new ReportCategoryDTO(
+                header: $header,
+                data: $data,
+                summary: $summary,
+            );
+        }
+
+        return $categories;
+    }
+
+    public function getOverallTotals(): array
+    {
+        $totals = [];
+
+        foreach ($this->getColumns() as $column) {
+            $totals[] = match ($column->getName()) {
+                'account_name' => 'Total for all accounts',
+                'debit_balance' => $this->report->overallTotal->debitBalance,
+                'credit_balance' => $this->report->overallTotal->creditBalance,
+                default => '',
+            };
+        }
+
+        return $totals;
+    }
+}

app/ValueObjects/Money.php

@@ -7,17 +7,12 @@ use App\Utilities\Currency\CurrencyConverter;
 
 class Money
 {
-    private int $amount;
-
-    private string $currencyCode;
-
     private ?int $convertedAmount = null;
 
-    public function __construct(int $amount, string $currencyCode)
-    {
-        $this->amount = $amount;
-        $this->currencyCode = $currencyCode;
-    }
+    public function __construct(
+        private readonly int $amount,
+        private readonly string $currencyCode
+    ) {}
 
     public function getAmount(): int
     {

app/View/Models/InvoiceViewModel.php

@@ -11,15 +11,10 @@ class InvoiceViewModel
 {
     use HasFont;
 
-    public DocumentDefault $invoice;
-
-    public ?array $data = [];
-
-    public function __construct(DocumentDefault $invoice, ?array $data = null)
-    {
-        $this->invoice = $invoice;
-        $this->data = $data;
-    }
+    public function __construct(
+        public DocumentDefault $invoice,
+        public ?array $data = null
+    ) {}
 
     public function logo(): ?string
     {

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,

composer.json

@@ -35,7 +35,8 @@
         "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^8.0",
         "phpunit/phpunit": "^10.5",
-        "spatie/laravel-ignition": "^2.4"
+        "spatie/laravel-ignition": "^2.4",
+        "spatie/laravel-ray": "^1.36"
     },
     "autoload": {
         "psr-4": {

database/migrations/2023_09_03_100000_create_accounting_tables.php

@@ -36,6 +36,18 @@ return new class extends Migration
             $table->timestamps();
         });
 
+        Schema::create('bank_accounts', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('company_id')->constrained()->cascadeOnDelete();
+            $table->foreignId('institution_id')->nullable()->constrained('institutions')->nullOnDelete();
+            $table->string('type')->default(BankAccountType::DEFAULT);
+            $table->string('number', 20)->nullable();
+            $table->boolean('enabled')->default(true);
+            $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
+            $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
+            $table->timestamps();
+        });
+
         Schema::create('accounts', function (Blueprint $table) {
             $table->id();
             $table->foreignId('company_id')->constrained()->cascadeOnDelete();
@@ -47,10 +59,9 @@ 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->unsignedBigInteger('accountable_id')->nullable();
-            $table->string('accountable_type')->nullable();
+            $table->foreignId('bank_account_id')->nullable()->constrained('bank_accounts')->cascadeOnDelete();
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();
@@ -58,18 +69,6 @@ return new class extends Migration
             $table->unique(['company_id', 'code']);
         });
 
-        Schema::create('bank_accounts', function (Blueprint $table) {
-            $table->id();
-            $table->foreignId('company_id')->constrained()->cascadeOnDelete();
-            $table->foreignId('institution_id')->nullable()->constrained('institutions')->nullOnDelete();
-            $table->string('type')->default(BankAccountType::DEFAULT);
-            $table->string('number', 20)->nullable();
-            $table->boolean('enabled')->default(true);
-            $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
-            $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
-            $table->timestamps();
-        });
-
         Schema::create('connected_bank_accounts', function (Blueprint $table) {
             $table->id();
             $table->foreignId('company_id')->constrained()->cascadeOnDelete();

package.json

@@ -7,13 +7,13 @@
     },
     "devDependencies": {
         "@tailwindcss/forms": "^0.5.7",
-        "@tailwindcss/typography": "^0.5.10",
-        "autoprefixer": "^10.4.18",
-        "axios": "^1.6.4",
+        "@tailwindcss/typography": "^0.5.13",
+        "autoprefixer": "^10.4.19",
+        "axios": "^1.7.2",
         "laravel-vite-plugin": "^1.0",
-        "postcss": "^8.4.35",
-        "postcss-nesting": "^12.1.0",
-        "tailwindcss": "^3.4.1",
-        "vite": "^5.0"
+        "postcss": "^8.4.38",
+        "postcss-nesting": "^12.1.5",
+        "tailwindcss": "^3.4.4",
+        "vite": "^5.3"
     }
 }

resources/data/lang/en.json

@@ -187,5 +187,7 @@
     "Available": "Available",
     "Live Rate": "Live Rate",
     "Edit": "Edit",
-    "Notes": "Notes"
+    "Notes": "Notes",
+    "Terms": "Terms",
+    "Ending Balance": "Ending Balance"
 }

resources/views/components/company/reports/account-balances.blade.php

@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Account Balances</title>
-    <style>
-        @page {
-            size: A4;
-            margin: 8.5mm 8.5mm 30mm 8.5mm;
-        }
-
-        .header {
-            color: #374151;
-        }
-
-        .table-class th,
-        .table-class td {
-            text-align: right;
-            color: #374151;
-        }
-
-        /* Align the first column header and data to the left */
-        .table-class th:first-child, .table-class td:first-child {
-            text-align: left;
-        }
-
-        .header {
-            margin-bottom: 1rem; /* Space between header and table */
-        }
-
-        .header .title,
-        .header .company-name,
-        .header .date-range {
-            margin-bottom: 0.125rem; /* Uniform space between header elements */
-        }
-
-        .title { font-size: 1.5rem; }
-        .company-name { font-size: 1.125rem; font-weight: 600; }
-        .date-range { font-size: 0.875rem; }
-
-        .table-class {
-            width: 100%;
-            border-collapse: collapse;
-        }
-
-        .table-class th,
-        .table-class td {
-            padding: 0.75rem;
-            font-size: 0.75rem;
-            line-height: 1rem;
-            border-bottom: 1px solid #d1d5db; /* Gray border for all rows */
-        }
-
-        .category-row > td {
-            background-color: #f3f4f6; /* Gray background for category names */
-            font-weight: 600;
-        }
-
-        .table-body tr { background-color: #ffffff; /* White background for other rows */ }
-
-        .spacer-row > td { height: 0.75rem; }
-
-        .summary-row > td,
-        .table-footer-row > td {
-            font-weight: 600;
-            background-color: #ffffff; /* White background for footer */
-        }
-    </style>
-</head>
-<body>
-    <div class="header">
-        <div class="title">Account Balances</div>
-        <div class="company-name">{{ auth()->user()->currentCompany->name }}</div>
-        <div class="date-range">Date Range: {{ $startDate }} to {{ $endDate }}</div>
-    </div>
-    <table class="table-class">
-        <thead class="table-head" style="display: table-row-group;">
-            <tr>
-                <th>Account</th>
-                <th>Starting Balance</th>
-                <th>Debit</th>
-                <th>Credit</th>
-                <th>Net Movement</th>
-                <th>Ending Balance</th>
-            </tr>
-        </thead>
-        @foreach($accountBalanceReport->categories as $accountCategoryName => $accountCategory)
-            <tbody>
-            <tr class="category-row">
-                <td colspan="6">{{ $accountCategoryName }}</td>
-            </tr>
-            @foreach($accountCategory->accounts as $account)
-                <tr>
-                    <td>{{ $account->accountName }}</td>
-                    <td>{{ $account->balance->startingBalance ?? '' }}</td>
-                    <td>{{ $account->balance->debitBalance }}</td>
-                    <td>{{ $account->balance->creditBalance }}</td>
-                    <td>{{ $account->balance->netMovement }}</td>
-                    <td>{{ $account->balance->endingBalance ?? '' }}</td>
-                </tr>
-            @endforeach
-            <tr class="summary-row">
-                <td>Total {{ $accountCategoryName }}</td>
-                <td>{{ $accountCategory->summary->startingBalance ?? '' }}</td>
-                <td>{{ $accountCategory->summary->debitBalance }}</td>
-                <td>{{ $accountCategory->summary->creditBalance }}</td>
-                <td>{{ $accountCategory->summary->netMovement }}</td>
-                <td>{{ $accountCategory->summary->endingBalance ?? '' }}</td>
-            </tr>
-            <tr class="spacer-row">
-                <td colspan="6"></td>
-            </tr>
-            </tbody>
-        @endforeach
-        <tfoot>
-            <tr class="table-footer-row">
-                <td>Total for all accounts</td>
-                <td></td>
-                <td>{{ $accountBalanceReport->overallTotal->debitBalance }}</td>
-                <td>{{ $accountBalanceReport->overallTotal->creditBalance }}</td>
-                <td></td>
-                <td></td>
-            </tr>
-        </tfoot>
-    </table>
-</body>

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

@@ -0,0 +1,148 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{{ $report->getTitle() }}</title>
+    <style>
+        @page {
+            size: A4;
+            margin: 8.5mm 8.5mm 30mm 8.5mm;
+        }
+
+        .header {
+            color: #374151;
+            margin-bottom: 1rem;
+        }
+
+        .table-head {
+            display: table-row-group;
+        }
+
+        .text-left {
+            text-align: left;
+        }
+
+        .text-right {
+            text-align: right;
+        }
+
+        .text-center {
+            text-align: center;
+        }
+
+        .table-class th,
+        .table-class td {
+            color: #374151;
+        }
+
+        .header .title,
+        .header .company-name,
+        .header .date-range {
+            margin-bottom: 0.125rem; /* Uniform space between header elements */
+        }
+
+        .title {
+            font-size: 1.5rem;
+        }
+
+        .company-name {
+            font-size: 1.125rem;
+            font-weight: 600;
+        }
+
+        .date-range {
+            font-size: 0.875rem;
+        }
+
+        .table-class {
+            width: 100%;
+            border-collapse: collapse;
+        }
+
+        .table-class th,
+        .table-class td {
+            padding: 0.75rem;
+            font-size: 0.75rem;
+            line-height: 1rem;
+            border-bottom: 1px solid #d1d5db; /* Gray border for all rows */
+        }
+
+        .category-header-row > td {
+            background-color: #f3f4f6; /* Gray background for category names */
+            font-weight: 600;
+        }
+
+        .table-body tr {
+            background-color: #ffffff; /* White background for other rows */
+        }
+
+        .spacer-row > td {
+            height: 0.75rem;
+        }
+
+        .category-summary-row > td,
+        .table-footer-row > td {
+            font-weight: 600;
+            background-color: #ffffff; /* White background for footer */
+        }
+    </style>
+</head>
+<body>
+<div class="header">
+    <div class="title">{{ $report->getTitle() }}</div>
+    <div class="company-name">{{ $company->name }}</div>
+    <div class="date-range">Date Range: {{ $startDate }} to {{ $endDate }}</div>
+</div>
+<table class="table-class">
+    <thead class="table-head">
+    <tr>
+        @foreach($report->getHeaders() as $index => $header)
+            <th class="{{ $report->getAlignmentClass($index) }}">
+                {{ $header }}
+            </th>
+        @endforeach
+    </tr>
+    </thead>
+    @foreach($report->getCategories() as $category)
+        <tbody>
+        <tr class="category-header-row">
+            @foreach($category->header as $index => $header)
+                <td class="{{ $report->getAlignmentClass($index) }}">
+                    {{ $header }}
+                </td>
+            @endforeach
+        </tr>
+        @foreach($category->data as $account)
+            <tr>
+                @foreach($account as $index => $cell)
+                    <td class="{{ $report->getAlignmentClass($index) }}">
+                        {{ $cell }}
+                    </td>
+                @endforeach
+            </tr>
+        @endforeach
+        <tr class="category-summary-row">
+            @foreach($category->summary as $index => $cell)
+                <td class="{{ $report->getAlignmentClass($index) }}">
+                    {{ $cell }}
+                </td>
+            @endforeach
+        </tr>
+        <tr class="spacer-row">
+            <td colspan="{{ count($report->getHeaders()) }}"></td>
+        </tr>
+        </tbody>
+    @endforeach
+    <tfoot>
+    <tr class="table-footer-row">
+        @foreach ($report->getOverallTotals() as $index => $total)
+            <td class="{{ $report->getAlignmentClass($index) }}">
+                {{ $total }}
+            </td>
+        @endforeach
+    </tr>
+    </tfoot>
+</table>
+</body>
+</html>

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

@@ -0,0 +1,62 @@
+<table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
+    <thead class="divide-y divide-gray-200 dark:divide-white/5">
+        <tr class="bg-gray-50 dark:bg-white/5">
+            @foreach($report->getHeaders() as $index => $header)
+                <th wire:key="header-{{ $index }}" class="px-3 py-3.5 sm:first-of-type:ps-6 sm:last-of-type:pe-6 {{ $report->getAlignmentClass($index) }}">
+                    <span class="text-sm font-semibold text-gray-950 dark:text-white">
+                        {{ $header }}
+                    </span>
+                </th>
+            @endforeach
+        </tr>
+    </thead>
+    @foreach($report->getCategories() as $categoryIndex => $category)
+        <tbody wire:key="category-{{ $categoryIndex }}" 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 $headerIndex => $header)
+                    <x-filament-tables::cell wire:key="category-{{ $categoryIndex }}-header-{{ $headerIndex }}" class="{{ $report->getAlignmentClass($headerIndex) }}">
+                        <div class="px-3 py-2 text-sm font-semibold text-gray-950 dark:text-white">
+                            {{ $header }}
+                        </div>
+                    </x-filament-tables::cell>
+                @endforeach
+            </tr>
+            @foreach($category->data as $dataIndex => $account)
+                <tr wire:key="category-{{ $categoryIndex }}-data-{{ $dataIndex }}">
+                    @foreach($account as $cellIndex => $cell)
+                        <x-filament-tables::cell wire:key="category-{{ $categoryIndex }}-data-{{ $dataIndex }}-cell-{{ $cellIndex }}" class="{{ $report->getAlignmentClass($cellIndex) }}">
+                            <div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">
+                                {{ $cell }}
+                            </div>
+                        </x-filament-tables::cell>
+                    @endforeach
+                </tr>
+            @endforeach
+            <tr wire:key="category-{{ $categoryIndex }}-summary">
+                @foreach($category->summary as $summaryIndex => $cell)
+                    <x-filament-tables::cell wire:key="category-{{ $categoryIndex }}-summary-{{ $summaryIndex }}" class="{{ $report->getAlignmentClass($summaryIndex) }}">
+                        <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
+                            {{ $cell }}
+                        </div>
+                    </x-filament-tables::cell>
+                @endforeach
+            </tr>
+            <tr wire:key="category-{{ $categoryIndex }}-spacer">
+                <x-filament-tables::cell colspan="{{ count($report->getHeaders()) }}">
+                    <div class="px-3 py-2 leading-6 invisible">Hidden Text</div>
+                </x-filament-tables::cell>
+            </tr>
+        </tbody>
+    @endforeach
+    <tfoot>
+        <tr class="bg-gray-50 dark:bg-white/5">
+            @foreach($report->getOverallTotals() as $index => $total)
+                <x-filament-tables::cell wire:key="footer-total-{{ $index }}" class="{{ $report->getAlignmentClass($index) }}">
+                    <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
+                        {{ $total }}
+                    </div>
+                </x-filament-tables::cell>
+            @endforeach
+        </tr>
+    </tfoot>
+</table>

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/create-company.blade.php

@@ -1,10 +0,0 @@
-<x-filament-panels::page.simple>
-    <x-filament-panels::form wire:submit="register">
-        {{ $this->form }}
-
-        <x-filament-panels::form.actions
-            :actions="$this->getCachedFormActions()"
-            :full-width="$this->hasFullWidthFormActions()"
-        />
-    </x-filament-panels::form>
-</x-filament-panels::page.simple>

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

@@ -1,75 +0,0 @@
-<x-filament-panels::page>
-    <div class="flex flex-col gap-y-6">
-        <x-filament-tables::container>
-            <div class="p-6 divide-y divide-gray-200 dark:divide-white/5">
-                <form wire:submit.prevent="loadAccountBalances" class="w-full">
-                    <div class="flex flex-col md:flex-row items-end justify-center gap-4 md:gap-6">
-                        <div class="flex-grow">
-                            {{ $this->form }}
-                        </div>
-                        <x-filament::button type="submit" class="mt-4 md:mt-0">
-                            Update Report
-                        </x-filament::button>
-                    </div>
-                </form>
-            </div>
-            <div class="divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10">
-                <table class="w-full table-auto divide-y divide-gray-200 text-start dark:divide-white/5">
-                    <thead class="divide-y divide-gray-200 dark:divide-white/5">
-                        <tr class="bg-gray-50 dark:bg-white/5">
-                            <x-filament-tables::header-cell>Account</x-filament-tables::header-cell>
-                            <x-filament-tables::header-cell alignment="end">Starting Balance</x-filament-tables::header-cell>
-                            <x-filament-tables::header-cell alignment="end">Debit</x-filament-tables::header-cell>
-                            <x-filament-tables::header-cell alignment="end">Credit</x-filament-tables::header-cell>
-                            <x-filament-tables::header-cell alignment="end">Net Movement</x-filament-tables::header-cell>
-                            <x-filament-tables::header-cell alignment="end">Ending Balance</x-filament-tables::header-cell>
-                        </tr>
-                    </thead>
-                    @foreach($accountBalanceReport->categories as $accountCategoryName => $accountCategory)
-                        <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
-                        <tr class="bg-gray-50 dark:bg-white/5">
-                            <x-filament-tables::cell colspan="6">
-                                <div class="px-3 py-2 text-sm font-medium text-gray-950 dark:text-white">{{ $accountCategoryName }}</div>
-                            </x-filament-tables::cell>
-                        </tr>
-                        @foreach($accountCategory->accounts as $account)
-                            <x-filament-tables::row>
-                                <x-filament-tables::cell><div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">{{ $account->accountName }}</div></x-filament-tables::cell>
-                                <x-filament-tables::cell class="text-right"><div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">{{ $account->balance->startingBalance ?? '' }}</div></x-filament-tables::cell>
-                                <x-filament-tables::cell class="text-right"><div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">{{ $account->balance->debitBalance }}</div></x-filament-tables::cell>
-                                <x-filament-tables::cell class="text-right"><div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">{{ $account->balance->creditBalance }}</div></x-filament-tables::cell>
-                                <x-filament-tables::cell class="text-right"><div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">{{ $account->balance->netMovement }}</div></x-filament-tables::cell>
-                                <x-filament-tables::cell class="text-right"><div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">{{ $account->balance->endingBalance ?? '' }}</div></x-filament-tables::cell>
-                            </x-filament-tables::row>
-                        @endforeach
-                        <x-filament-tables::row>
-                            <x-filament-tables::cell><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">Total {{ $accountCategoryName }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $accountCategory->summary->startingBalance ?? '' }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $accountCategory->summary->debitBalance }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $accountCategory->summary->creditBalance }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $accountCategory->summary->netMovement }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $accountCategory->summary->endingBalance ?? '' }}</div></x-filament-tables::cell>
-                        </x-filament-tables::row>
-                        <x-filament-tables::row>
-                            <x-filament-tables::cell colspan="6">
-                                <div class="px-3 py-2 invisible">Hidden Text</div>
-                            </x-filament-tables::cell>
-                        </x-filament-tables::row>
-                        </tbody>
-                    @endforeach
-                    <tfoot>
-                        <tr class="bg-gray-50 dark:bg-white/5">
-                            <x-filament-tables::cell><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">Total for all accounts</div></x-filament-tables::cell>
-                            <x-filament-tables::cell><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white"></div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $accountBalanceReport->overallTotal->debitBalance }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $accountBalanceReport->overallTotal->creditBalance }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white"></div></x-filament-tables::cell>
-                            <x-filament-tables::cell><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white"></div></x-filament-tables::cell>
-                        </tr>
-                    </tfoot>
-                </table>
-            </div>
-            <div class="es-table__footer-ctn border-t border-gray-200"></div>
-        </x-filament-tables::container>
-    </div>
-</x-filament-panels::page>

resources/views/filament/company/pages/reports/detailed-report.blade.php

@@ -0,0 +1,25 @@
+<x-filament-panels::page>
+    <div class="flex flex-col gap-y-6">
+        <x-filament-tables::container>
+            <div class="p-6 divide-y divide-gray-200 dark:divide-white/5">
+                <form wire:submit.prevent="loadReportData">
+                    <div class="flex flex-col lg:flex-row items-start lg:items-center justify-center gap-4 lg:gap-12">
+                        {{ $this->form }}
+                        <x-filament-tables::column-toggle.dropdown
+                            class="my-auto"
+                            :form="$this->toggleTableColumnForm"
+                            :trigger-action="$this->toggleColumnsAction"
+                        />
+                        <x-filament::button type="submit" class="flex-shrink-0">
+                            Update Report
+                        </x-filament::button>
+                    </div>
+                </form>
+            </div>
+            <div class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10">
+                <x-company.tables.reports.detailed-report :report="$this->report" />
+            </div>
+            <div class="es-table__footer-ctn border-t border-gray-200"></div>
+        </x-filament-tables::container>
+    </div>
+</x-filament-panels::page>

resources/views/livewire/company/service/connected-account/list-institutions.blade.php

@@ -23,9 +23,9 @@
                             {{ $institution->name }}
                         </h3>
 
-                        @if($institution->getLastImportDate())
+                        @if($institution->latestImport)
                             <p class="connected-account-section-header-description text-sm leading-6 text-gray-500 dark:text-gray-400">
-                                {{ __('Last updated') }} {{ $institution->getLastImportDate() }}
+                                {{ __('Last updated') }} {{ $institution->latestImport->last_imported_at->diffForHumans() }}
                             </p>
                         @endif
                     </div>