Trial Balance report and refactor

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/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(
         /**

app/Events/CompanyConfigured.php

@@ -13,13 +13,8 @@ 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,11 @@ 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,12 @@ 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,15 @@ 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,10 @@ 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,11 @@ 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,13 @@ 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,14 @@ 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/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,73 +2,40 @@
 
 namespace App\Filament\Company\Pages\Reports;
 
-use App\DTO\AccountBalanceReportDTO;
-use App\Filament\Forms\Components\DateRangeSelect;
-use App\Models\Company;
+use App\DTO\ReportDTO;
 use App\Services\AccountBalancesExportService;
-use App\Services\AccountService;
+use App\Services\ReportService;
 use Barryvdh\DomPDF\Facade\Pdf;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
-use Filament\Forms\Components\DatePicker;
-use Filament\Forms\Components\Split;
-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 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 $slug = 'reports/account-balances';
 
-    public string $startDate = '';
+    protected static bool $shouldRegisterNavigation = false;
 
-    public string $endDate = '';
+    protected ReportService $reportService;
 
-    public string $dateRange = '';
-
-    public string $fiscalYearStartDate = '';
-
-    public string $fiscalYearEndDate = '';
-
-    public Company $company;
-
-    public AccountBalanceReportDTO $accountBalanceReport;
-
-    protected AccountService $accountService;
+    public ReportDTO $accountBalanceReport;
 
     protected AccountBalancesExportService $accountBalancesExportService;
 
-    public function boot(AccountService $accountService, AccountBalancesExportService $accountBalancesExportService): void
+    public function boot(ReportService $reportService, AccountBalancesExportService $accountBalancesExportService): void
     {
-        $this->accountService = $accountService;
+        $this->reportService = $reportService;
         $this->accountBalancesExportService = $accountBalancesExportService;
     }
 
-    public function mount(): void
+    public function loadReportData(): 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
-    {
-        $this->accountBalanceReport = $this->accountService->buildAccountBalanceReport($this->startDate, $this->endDate);
+        $this->accountBalanceReport = $this->reportService->buildAccountBalanceReport($this->startDate, $this->endDate);
     }
 
     protected function getHeaderActions(): array
@@ -110,41 +77,4 @@ class AccountBalances extends Page
             echo $pdf->stream();
         }, 'account-balances.pdf');
     }
-
-    public function form(Form $form): Form
-    {
-        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(),
-            ]);
-    }
-
-    public function setDateRange(Carbon $start, Carbon $end): void
-    {
-        $this->startDate = $start->format('Y-m-d');
-        $this->endDate = $end->isFuture() ? now()->format('Y-m-d') : $end->format('Y-m-d');
-    }
-
-    public static function shouldRegisterNavigation(): bool
-    {
-        return false;
-    }
 }

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

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Filament\Company\Pages\Reports;
+
+use App\Filament\Forms\Components\DateRangeSelect;
+use App\Models\Company;
+use Filament\Forms\Components\DatePicker;
+use Filament\Forms\Components\Split;
+use Filament\Forms\Form;
+use Filament\Forms\Set;
+use Filament\Pages\Page;
+use Illuminate\Support\Carbon;
+
+abstract class BaseReportPage extends Page
+{
+    public string $startDate = '';
+
+    public string $endDate = '';
+
+    public string $dateRange = '';
+
+    public string $fiscalYearStartDate = '';
+
+    public string $fiscalYearEndDate = '';
+
+    public Company $company;
+
+    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->loadReportData();
+    }
+
+    abstract protected function loadReportData(): void;
+
+    public function getDefaultDateRange(): string
+    {
+        return 'FY-' . now()->year;
+    }
+
+    public function form(Form $form): Form
+    {
+        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(),
+            ]);
+    }
+
+    public function setDateRange(Carbon $start, Carbon $end): void
+    {
+        $this->startDate = $start->format('Y-m-d');
+        $this->endDate = $end->isFuture() ? now()->format('Y-m-d') : $end->format('Y-m-d');
+    }
+}

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

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Filament\Company\Pages\Reports;
+
+use App\DTO\ReportDTO;
+use App\Services\ReportService;
+
+class TrialBalance extends BaseReportPage
+{
+    protected static string $view = 'filament.company.pages.reports.trial-balance';
+
+    protected static ?string $slug = 'reports/trial-balance';
+
+    protected static bool $shouldRegisterNavigation = false;
+
+    protected ReportService $reportService;
+
+    public ReportDTO $trialBalanceReport;
+
+    public function boot(ReportService $reportService): void
+    {
+        $this->reportService = $reportService;
+    }
+
+    public function getDefaultDateRange(): string
+    {
+        return 'FY-' . now()->year;
+    }
+
+    public function loadReportData(): void
+    {
+        $this->trialBalanceReport = $this->reportService->buildTrialBalanceReport($this->startDate, $this->endDate);
+    }
+}

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,26 +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
+    ) {
     }
 
     /**

app/Jobs/ProcessTransactionUpdate.php

@@ -20,17 +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
+    ) {
     }
 
     /**
@@ -39,7 +32,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/CreateConnectedAccount.php

@@ -10,14 +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
+    ) {
     }
 
     /**
@@ -36,9 +34,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,14 +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
+    ) {
     }
 
     /**

app/Listeners/UpdateCurrencyRates.php

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

app/Services/AccountBalancesExportService.php

@@ -2,13 +2,13 @@
 
 namespace App\Services;
 
-use App\DTO\AccountBalanceReportDTO;
+use App\DTO\ReportDTO;
 use App\Models\Company;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class AccountBalancesExportService
 {
-    public function exportToCsv(Company $company, AccountBalanceReportDTO $accountBalanceReport, string $startDate, string $endDate): StreamedResponse
+    public function exportToCsv(Company $company, ReportDTO $accountBalanceReport, string $startDate, string $endDate): StreamedResponse
     {
         // Construct the filename
         $filename = $company->name . ' Account Balances ' . $startDate . ' to ' . $endDate . '.csv';

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,15 +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 +56,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,91 +96,6 @@ 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
     {
         $bankAccounts = BankAccount::with('account')
@@ -194,7 +103,6 @@ class AccountService implements AccountHandler
 
         $totalBalance = 0;
 
-        // Get ending balance for each bank account
         foreach ($bankAccounts as $bankAccount) {
             $account = $bankAccount->account;
 

app/Services/ConnectedBankAccountService.php

@@ -11,14 +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,17 +10,11 @@ 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
+    ) {
     }
 
     /**
@@ -28,7 +22,7 @@ class CurrencyService implements CurrencyHandler
      */
     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 +32,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 +100,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/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));
+    }
+
+    private function buildReport(array $allCategories, Collection $categoryGroupedAccounts, callable $balanceCalculator, array $fields, ?callable $initializeCategoryBalances = null): ReportDTO
+    {
+        $accountCategories = [];
+        $reportTotalBalances = array_fill_keys($fields, 0);
+
+        foreach ($allCategories as $categoryName) {
+            $accountsInCategory = $categoryGroupedAccounts[$categoryName] ?? collect();
+            $categorySummaryBalances = array_fill_keys($fields, 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, $fields);
+                $formattedAccountBalances = $this->formatBalances($filteredAccountBalances);
+
+                $categoryAccounts[] = new AccountDTO(
+                    $account->name,
+                    $account->code,
+                    $formattedAccountBalances,
+                );
+            }
+
+            foreach ($fields as $field) {
+                if (array_key_exists($field, $categorySummaryBalances)) {
+                    $reportTotalBalances[$field] += $categorySummaryBalances[$field];
+                }
+            }
+
+            $filteredCategorySummaryBalances = $this->filterBalances($categorySummaryBalances, $fields);
+            $formattedCategorySummaryBalances = $this->formatBalances($filteredCategorySummaryBalances);
+
+            $accountCategories[$categoryName] = new AccountCategoryDTO(
+                $categoryAccounts,
+                $formattedCategorySummaryBalances,
+            );
+        }
+
+        $formattedReportTotalBalances = $this->formatBalances($reportTotalBalances);
+
+        return new ReportDTO($accountCategories, $formattedReportTotalBalances);
+    }
+
+    public function buildAccountBalanceReport(string $startDate, string $endDate): ReportDTO
+    {
+        $allCategories = $this->accountService->getAccountCategoryOrder();
+
+        $categoryGroupedAccounts = $this->getCategoryGroupedAccounts($allCategories);
+
+        $fields = ['starting_balance', 'debit_balance', 'credit_balance', 'net_movement', 'ending_balance'];
+
+        return $this->buildReport(
+            $allCategories,
+            $categoryGroupedAccounts,
+            fn (Account $account) => $this->accountService->getBalances($account, $startDate, $endDate),
+            $fields,
+            fn (string $categoryName, array &$categorySummaryBalances) => $this->adjustAccountBalanceCategoryFields($categoryName, $categorySummaryBalances),
+        );
+    }
+
+    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']);
+        }
+    }
+
+    public function buildTrialBalanceReport(string $startDate, string $endDate): ReportDTO
+    {
+        $allCategories = $this->accountService->getAccountCategoryOrder();
+
+        $categoryGroupedAccounts = $this->getCategoryGroupedAccounts($allCategories);
+
+        $fields = ['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);
+        }, $fields);
+    }
+
+    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/ValueObjects/Money.php

@@ -7,16 +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,14 +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

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.308.1",
+            "version": "3.308.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "bf5f1221d4c5c67d3213150fb91dfb5ce627227b"
+                "reference": "7fa0625056fa1fcf6732f89ba37b3f630d78de59"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bf5f1221d4c5c67d3213150fb91dfb5ce627227b",
-                "reference": "bf5f1221d4c5c67d3213150fb91dfb5ce627227b",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7fa0625056fa1fcf6732f89ba37b3f630d78de59",
+                "reference": "7fa0625056fa1fcf6732f89ba37b3f630d78de59",
                 "shasum": ""
             },
             "require": {
@@ -586,9 +586,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.308.1"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.308.3"
             },
-            "time": "2024-05-22T18:05:56+00:00"
+            "time": "2024-05-24T18:29:40+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -1985,16 +1985,16 @@
         },
         {
             "name": "filament/actions",
-            "version": "v3.2.81",
+            "version": "v3.2.82",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
-                "reference": "05e19bf192dfc7eb13989543c4fae4c41ee08124"
+                "reference": "889cb3538090cfe0eef1ca51ce7808646133b7ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/actions/zipball/05e19bf192dfc7eb13989543c4fae4c41ee08124",
-                "reference": "05e19bf192dfc7eb13989543c4fae4c41ee08124",
+                "url": "https://api.github.com/repos/filamentphp/actions/zipball/889cb3538090cfe0eef1ca51ce7808646133b7ed",
+                "reference": "889cb3538090cfe0eef1ca51ce7808646133b7ed",
                 "shasum": ""
             },
             "require": {
@@ -2034,20 +2034,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-05-20T16:26:41+00:00"
+            "time": "2024-05-23T12:08:12+00:00"
         },
         {
             "name": "filament/filament",
-            "version": "v3.2.81",
+            "version": "v3.2.82",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
-                "reference": "3fb5cbeb32b02ef196a750441c7ac452c273efab"
+                "reference": "b73e49d6ef02dba8f118d2934435748ed4feffa2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/3fb5cbeb32b02ef196a750441c7ac452c273efab",
-                "reference": "3fb5cbeb32b02ef196a750441c7ac452c273efab",
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/b73e49d6ef02dba8f118d2934435748ed4feffa2",
+                "reference": "b73e49d6ef02dba8f118d2934435748ed4feffa2",
                 "shasum": ""
             },
             "require": {
@@ -2099,20 +2099,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-05-20T16:26:45+00:00"
+            "time": "2024-05-23T12:08:29+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v3.2.81",
+            "version": "v3.2.82",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "9ab84e46226acdbbf48e1f73fa1d141d566eab73"
+                "reference": "c97fb3c5a6e5dd0d4d9cdbaa8b43c99c0cc35a01"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/9ab84e46226acdbbf48e1f73fa1d141d566eab73",
-                "reference": "9ab84e46226acdbbf48e1f73fa1d141d566eab73",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/c97fb3c5a6e5dd0d4d9cdbaa8b43c99c0cc35a01",
+                "reference": "c97fb3c5a6e5dd0d4d9cdbaa8b43c99c0cc35a01",
                 "shasum": ""
             },
             "require": {
@@ -2155,20 +2155,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-05-20T16:26:41+00:00"
+            "time": "2024-05-23T12:08:13+00:00"
         },
         {
             "name": "filament/infolists",
-            "version": "v3.2.81",
+            "version": "v3.2.82",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
-                "reference": "214c92c446277bb6599758a29ad885e79b11e6b0"
+                "reference": "d473d1b11ad32c917cf6e3610411fd790b8c1e27"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/214c92c446277bb6599758a29ad885e79b11e6b0",
-                "reference": "214c92c446277bb6599758a29ad885e79b11e6b0",
+                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/d473d1b11ad32c917cf6e3610411fd790b8c1e27",
+                "reference": "d473d1b11ad32c917cf6e3610411fd790b8c1e27",
                 "shasum": ""
             },
             "require": {
@@ -2206,11 +2206,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-05-16T11:11:37+00:00"
+            "time": "2024-05-23T12:08:25+00:00"
         },
         {
             "name": "filament/notifications",
-            "version": "v3.2.81",
+            "version": "v3.2.82",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
@@ -2262,16 +2262,16 @@
         },
         {
             "name": "filament/support",
-            "version": "v3.2.81",
+            "version": "v3.2.82",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
-                "reference": "1435caac4c2a454ab0eb11fc6590628eda36aa0b"
+                "reference": "f32b841309d01c4538d8f128d67ec213969747e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/support/zipball/1435caac4c2a454ab0eb11fc6590628eda36aa0b",
-                "reference": "1435caac4c2a454ab0eb11fc6590628eda36aa0b",
+                "url": "https://api.github.com/repos/filamentphp/support/zipball/f32b841309d01c4538d8f128d67ec213969747e9",
+                "reference": "f32b841309d01c4538d8f128d67ec213969747e9",
                 "shasum": ""
             },
             "require": {
@@ -2316,20 +2316,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-05-20T16:26:41+00:00"
+            "time": "2024-05-23T12:08:37+00:00"
         },
         {
             "name": "filament/tables",
-            "version": "v3.2.81",
+            "version": "v3.2.82",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
-                "reference": "9f0141c7076c096b90cf1e22b45d7ddc3db9c8d5"
+                "reference": "6c183a98ee19f491f229dbca732f0b00ad9e31be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/9f0141c7076c096b90cf1e22b45d7ddc3db9c8d5",
-                "reference": "9f0141c7076c096b90cf1e22b45d7ddc3db9c8d5",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/6c183a98ee19f491f229dbca732f0b00ad9e31be",
+                "reference": "6c183a98ee19f491f229dbca732f0b00ad9e31be",
                 "shasum": ""
             },
             "require": {
@@ -2369,11 +2369,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-05-20T16:26:45+00:00"
+            "time": "2024-05-23T12:08:36+00:00"
         },
         {
             "name": "filament/widgets",
-            "version": "v3.2.81",
+            "version": "v3.2.82",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
@@ -3874,40 +3874,39 @@
         },
         {
             "name": "league/csv",
-            "version": "9.15.0",
+            "version": "9.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/csv.git",
-                "reference": "fa7e2441c0bc9b2360f4314fd6c954f7ff40d435"
+                "reference": "998280c6c34bd67d8125fdc8b45bae28d761b440"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/csv/zipball/fa7e2441c0bc9b2360f4314fd6c954f7ff40d435",
-                "reference": "fa7e2441c0bc9b2360f4314fd6c954f7ff40d435",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/998280c6c34bd67d8125fdc8b45bae28d761b440",
+                "reference": "998280c6c34bd67d8125fdc8b45bae28d761b440",
                 "shasum": ""
             },
             "require": {
                 "ext-filter": "*",
-                "ext-json": "*",
-                "ext-mbstring": "*",
                 "php": "^8.1.2"
             },
             "require-dev": {
-                "doctrine/collections": "^2.1.4",
+                "doctrine/collections": "^2.2.2",
                 "ext-dom": "*",
                 "ext-xdebug": "*",
-                "friendsofphp/php-cs-fixer": "^v3.22.0",
+                "friendsofphp/php-cs-fixer": "^3.57.1",
                 "phpbench/phpbench": "^1.2.15",
-                "phpstan/phpstan": "^1.10.57",
-                "phpstan/phpstan-deprecation-rules": "^1.1.4",
-                "phpstan/phpstan-phpunit": "^1.3.15",
-                "phpstan/phpstan-strict-rules": "^1.5.2",
-                "phpunit/phpunit": "^10.5.9",
-                "symfony/var-dumper": "^6.4.2"
+                "phpstan/phpstan": "^1.11.1",
+                "phpstan/phpstan-deprecation-rules": "^1.2.0",
+                "phpstan/phpstan-phpunit": "^1.4.0",
+                "phpstan/phpstan-strict-rules": "^1.6.0",
+                "phpunit/phpunit": "^10.5.16 || ^11.1.3",
+                "symfony/var-dumper": "^6.4.6 || ^7.0.7"
             },
             "suggest": {
                 "ext-dom": "Required to use the XMLConverter and the HTMLConverter classes",
-                "ext-iconv": "Needed to ease transcoding CSV using iconv stream filters"
+                "ext-iconv": "Needed to ease transcoding CSV using iconv stream filters",
+                "ext-mbstring": "Needed to ease transcoding CSV using mb stream filters"
             },
             "type": "library",
             "extra": {
@@ -3959,7 +3958,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-02-20T20:00:00+00:00"
+            "time": "2024-05-24T11:04:54+00:00"
         },
         {
             "name": "league/flysystem",

package-lock.json

@@ -1079,9 +1079,9 @@
             "dev": true
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.778",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.778.tgz",
-            "integrity": "sha512-C6q/xcUJf/2yODRxAVCfIk4j3y3LMsD0ehiE2RQNV2cxc8XU62gR6vvYh3+etSUzlgTfil+qDHI1vubpdf0TOA==",
+            "version": "1.4.783",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.783.tgz",
+            "integrity": "sha512-bT0jEz/Xz1fahQpbZ1D7LgmPYZ3iHVY39NcWWro1+hA2IvjiPeaXtfSqrQ+nXjApMvQRE2ASt1itSLRrebHMRQ==",
             "dev": true
         },
         "node_modules/emoji-regex": {
@@ -1273,16 +1273,16 @@
             }
         },
         "node_modules/glob": {
-            "version": "10.3.16",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.16.tgz",
-            "integrity": "sha512-JDKXl1DiuuHJ6fVS2FXjownaavciiHNUU4mOvV/B793RLh05vZL1rcPnCSaOgv1hDT6RDlY7AB7ZUvFYAtPgAw==",
+            "version": "10.4.1",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz",
+            "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==",
             "dev": true,
             "dependencies": {
                 "foreground-child": "^3.1.0",
                 "jackspeak": "^3.1.2",
-                "minimatch": "^9.0.1",
-                "minipass": "^7.0.4",
-                "path-scurry": "^1.11.0"
+                "minimatch": "^9.0.4",
+                "minipass": "^7.1.2",
+                "path-scurry": "^1.11.1"
             },
             "bin": {
                 "glob": "dist/esm/bin.mjs"
@@ -1543,9 +1543,9 @@
             }
         },
         "node_modules/minipass": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.1.tgz",
-            "integrity": "sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==",
+            "version": "7.1.2",
+            "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+            "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
             "dev": true,
             "engines": {
                 "node": ">=16 || 14 >=14.17"
@@ -1833,9 +1833,9 @@
             }
         },
         "node_modules/postcss-nesting": {
-            "version": "12.1.4",
-            "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-12.1.4.tgz",
-            "integrity": "sha512-CcHOq94K137E+U4Ommu7pexcpp0Tjm24zl4UcqWs1oSLAr5cLI+jLrqQ5h/bdjhMX6cMbzunyustVNnvrzF8Zg==",
+            "version": "12.1.5",
+            "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-12.1.5.tgz",
+            "integrity": "sha512-N1NgI1PDCiAGWPTYrwqm8wpjv0bgDmkYHH72pNsqTCv9CObxjxftdYu6AKtGN+pnJa7FQjMm3v4sp8QJbFsYdQ==",
             "dev": true,
             "funding": [
                 {
@@ -1850,7 +1850,7 @@
             "dependencies": {
                 "@csstools/selector-resolve-nested": "^1.1.0",
                 "@csstools/selector-specificity": "^3.1.1",
-                "postcss-selector-parser": "^6.0.13"
+                "postcss-selector-parser": "^6.1.0"
             },
             "engines": {
                 "node": "^14 || ^16 || >=18"

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

@@ -2,7 +2,7 @@
     <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">
+                <form wire:submit.prevent="loadReportData" class="w-full">
                     <div class="flex flex-col md:flex-row items-end justify-center gap-4 md:gap-6">
                         <div class="flex-grow">
                             {{ $this->form }}

resources/views/filament/company/pages/reports/trial-balance.blade.php

@@ -0,0 +1,64 @@
+<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" 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">Debit</x-filament-tables::header-cell>
+                            <x-filament-tables::header-cell alignment="end">Credit</x-filament-tables::header-cell>
+                        </tr>
+                    </thead>
+                    @foreach($trialBalanceReport->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="3">
+                                <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->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::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->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::row>
+                        <x-filament-tables::row>
+                            <x-filament-tables::cell colspan="3">
+                                <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 class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $trialBalanceReport->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">{{ $trialBalanceReport->overallTotal->creditBalance }}</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>
+