refactor: Service logic

app/DTO/AccountBalanceDTO.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\DTO;
+
+use Livewire\Wireable;
+
+class AccountBalanceDTO implements Wireable
+{
+    public function __construct(
+        public ?string $startingBalance,
+        public string $debitBalance,
+        public string $creditBalance,
+        public ?string $netMovement,
+        public ?string $endingBalance,
+    ) {
+    }
+
+    public function toLivewire(): array
+    {
+        return [
+            'startingBalance' => $this->startingBalance,
+            'debitBalance' => $this->debitBalance,
+            'creditBalance' => $this->creditBalance,
+            'netMovement' => $this->netMovement,
+            'endingBalance' => $this->endingBalance,
+        ];
+    }
+
+    public static function fromLivewire($value): static
+    {
+        return new static(
+            $value['startingBalance'],
+            $value['debitBalance'],
+            $value['creditBalance'],
+            $value['netMovement'],
+            $value['endingBalance'],
+        );
+    }
+}

app/DTO/AccountBalanceReportDTO.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\DTO;
+
+use Livewire\Wireable;
+
+class AccountBalanceReportDTO implements Wireable
+{
+    public function __construct(
+        /**
+         * @var AccountCategoryDTO[]
+         */
+        public array $categories,
+        public AccountBalanceDTO $overallTotal,
+    ) {
+    }
+
+    public function toLivewire(): array
+    {
+        return [
+            'categories' => $this->categories,
+            'overallTotal' => $this->overallTotal->toLivewire(),
+        ];
+    }
+
+    public static function fromLivewire($value): static
+    {
+        return new static(
+            $value['categories'],
+            AccountBalanceDTO::fromLivewire($value['overallTotal']),
+        );
+    }
+}

app/DTO/AccountCategoryDTO.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\DTO;
+
+use Livewire\Wireable;
+
+class AccountCategoryDTO implements Wireable
+{
+    /**
+     * @param  AccountDTO[]  $accounts
+     */
+    public function __construct(
+        public array $accounts,
+        public AccountBalanceDTO $summary,
+    ) {
+    }
+
+    public function toLivewire(): array
+    {
+        return [
+            'accounts' => $this->accounts,
+            'summary' => $this->summary->toLivewire(),
+        ];
+    }
+
+    public static function fromLivewire($value): static
+    {
+        return new static(
+            $value['accounts'],
+            AccountBalanceDTO::fromLivewire($value['summary']),
+        );
+    }
+}

app/DTO/AccountDTO.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\DTO;
+
+use Livewire\Wireable;
+
+class AccountDTO implements Wireable
+{
+    public function __construct(
+        public string $accountName,
+        public string $accountCode,
+        public AccountBalanceDTO $balance,
+    ) {
+    }
+
+    public function toLivewire(): array
+    {
+        return [
+            'accountName' => $this->accountName,
+            'accountCode' => $this->accountCode,
+            'balance' => $this->balance->toLivewire(),
+        ];
+    }
+
+    public static function fromLivewire($value): static
+    {
+        return new static(
+            $value['accountName'],
+            $value['accountCode'],
+            AccountBalanceDTO::fromLivewire($value['balance']),
+        );
+    }
+}

app/Enums/Accounting/AccountCategory.php

@@ -17,35 +17,25 @@ enum AccountCategory: string implements HasLabel
         return $this->name;
     }
 
-    public function getTypes(): array
+    public function getPluralLabel(): ?string
     {
         return match ($this) {
-            self::Asset => [
-                AccountType::CurrentAsset,
-                AccountType::NonCurrentAsset,
-                AccountType::ContraAsset,
-            ],
-            self::Liability => [
-                AccountType::CurrentLiability,
-                AccountType::NonCurrentLiability,
-                AccountType::ContraLiability,
-            ],
-            self::Equity => [
-                AccountType::Equity,
-                AccountType::ContraEquity,
-            ],
-            self::Revenue => [
-                AccountType::OperatingRevenue,
-                AccountType::NonOperatingRevenue,
-                AccountType::ContraRevenue,
-                AccountType::UncategorizedRevenue,
-            ],
-            self::Expense => [
-                AccountType::OperatingExpense,
-                AccountType::NonOperatingExpense,
-                AccountType::ContraExpense,
-                AccountType::UncategorizedExpense,
-            ],
+            self::Asset => 'Assets',
+            self::Liability => 'Liabilities',
+            self::Equity => 'Equity',
+            self::Revenue => 'Revenue',
+            self::Expense => 'Expenses',
         };
     }
+
+    public static function fromPluralLabel(string $label): ?self
+    {
+        foreach (self::cases() as $case) {
+            if ($case->getPluralLabel() === $label) {
+                return $case;
+            }
+        }
+
+        return null;
+    }
 }

app/Enums/BankAccountSubtype.php

@@ -1,166 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-use Filament\Support\Contracts\HasLabel;
-
-enum BankAccountSubtype: string implements HasLabel
-{
-    // Depository Types
-
-    case Checking = 'checking';
-    case Savings = 'savings';
-    case HealthSavingsAccountCash = 'cash_hsa';
-    case CertificateOfDeposit = 'cd';
-    case MoneyMarket = 'money_market';
-    case Paypal = 'paypal';
-    case Prepaid = 'prepaid';
-    case CashManagement = 'cash_management';
-    case ElectronicBenefitsTransfer = 'ebt';
-
-    // Credit Types
-    case CreditCard = 'credit_card';
-    case PaypalCredit = 'paypal_credit';
-
-    // Loan Types
-    case Auto = 'auto';
-    case Business = 'business';
-    case Commercial = 'commercial';
-    case Construction = 'construction';
-    case Consumer = 'consumer';
-    case HomeEquity = 'home_equity';
-    case Loan = 'loan'; // Generic loan
-    case Mortgage = 'mortgage';
-    case Overdraft = 'overdraft';
-    case LineOfCredit = 'line_of_credit'; // Pre-approved line of credit
-    case Student = 'student';
-    case Other = 'other';
-
-    // Investment Types
-    case CollegeSavings529 = '529';
-    case Retirement401a = '401a';
-    case Retirement401K = '401k';
-    case Retirement403b = '403b';
-    case DeferredCompensation457b = '457b';
-    case Brokerage = 'brokerage';
-    case CashIndividualSavingsAccount = 'cash_isa';
-    case CryptoCurrencyExchange = 'crypto_exchange';
-    case EducationSavingsAccount = 'esa';
-    case FixedAnnuity = 'fixed_annuity';
-    case GuaranteedInvestmentCertificate = 'gic';
-    case HealthReimbursementArrangement = 'hra';
-    case HealthSavingsAccountNonCash = 'non_cash_hsa';
-    case IndividualRetirementAccount = 'ira';
-    case IndividualSavingsAccount = 'isa';
-    case KeoghPlan = 'keogh';
-    case LifeIncomeFund = 'lif';
-    case LifeInsuranceAccount = 'life_insurance';
-    case LockedInRetirementAccount = 'lira'; // Instead of LIRA
-    case LockedInRetirementIncomeFund = 'lrif'; // Instead of LRIF
-    case LockedInRetirementSavingsPlan = 'lrsp'; // Instead of LRSP
-    case MutualFundAccount = 'mutual_fund'; // Instead of MutualFund
-    case CryptoCurrencyWallet = 'non_custodial_wallet'; // Instead of NonCustodialWallet
-    case NonTaxableBrokerageAccount = 'non_taxable_brokerage_account'; // Instead of NonTaxableBrokerageAccount
-    case AnnuityAccountOther = 'other_annuity'; // Instead of OtherAnnuity
-    case InsuranceAccountOther = 'other_insurance'; // Instead of OtherInsurance
-    case PensionAccount = 'pension'; // Instead of Pension
-    case PrescribedRetirementIncomeFund = 'prif'; // Instead of PRIF
-    case ProfitSharingPlanAccount = 'profit_sharing_plan'; // Instead of ProfitSharingPlan
-    case QualifyingShareAccount = 'qshr'; // Instead of QSHR
-    case RegisteredDisabilitySavingsPlan = 'rdsp'; // Instead of RDSP
-    case RegisteredEducationSavingsPlan = 'resp'; // Instead of RESP
-    case RetirementAccountOther = 'retirement'; // Instead of Retirement
-    case RestrictedLifeIncomeFund = 'rlif'; // Instead of RLIF
-    case RothIRA = 'roth'; // Instead of Roth
-    case Roth401k = 'roth_401k'; // Instead of RothFourOhOneK
-    case RegisteredRetirementIncomeFund = 'rrif'; // Instead of RRIF
-    case RegisteredRetirementSavingsPlan = 'rrsp'; // Instead of RRSP
-    case SalaryReductionSEPPlan = 'sarsep'; // Instead of SARSEP
-    case SimplifiedEmployeePensionIRA = 'sep_ira'; // Instead of SEPIRA
-    case SavingsIncentiveMatchPlanForEmployeesIRA = 'simple_ira'; // Instead of SIMPLEIRA
-    case SelfInvestedPersonalPension = 'sipp'; // Instead of SIPP
-    case StockPlanAccount = 'stock_plan'; // Instead of StockPlan
-    case TaxFreeSavingsAccount = 'tfsa'; // Instead of TFSA
-    case TrustAccount = 'trust'; // Instead of Trust
-    case UniformGiftToMinorsAct = 'ugma'; // Instead of UGMA
-    case UniformTransfersToMinorsAct = 'utma'; // Instead of UTMA
-    case VariableAnnuityAccount = 'variable_annuity'; // Instead of VariableAnnuity
-
-    public function getLabel(): ?string
-    {
-        $label = match ($this) {
-            self::Checking => 'Checking',
-            self::Savings => 'Savings',
-            self::HealthSavingsAccountCash => 'Health Savings Account (Cash)',
-            self::CertificateOfDeposit => 'Certificate of Deposit',
-            self::MoneyMarket => 'Money Market',
-            self::Paypal => 'PayPal',
-            self::Prepaid => 'Prepaid',
-            self::CashManagement => 'Cash Management',
-            self::ElectronicBenefitsTransfer => 'Electronic Benefits Transfer (EBT)',
-            self::CreditCard => 'Credit Card',
-            self::PaypalCredit => 'PayPal Credit',
-            self::Auto => 'Auto',
-            self::Business => 'Business',
-            self::Commercial => 'Commercial',
-            self::Construction => 'Construction',
-            self::Consumer => 'Consumer',
-            self::HomeEquity => 'Home Equity',
-            self::Loan => 'Loan',
-            self::Mortgage => 'Mortgage',
-            self::Overdraft => 'Overdraft',
-            self::LineOfCredit => 'Line of Credit',
-            self::Student => 'Student',
-            self::Other => 'Other',
-            self::CollegeSavings529 => '529 College Savings Plan',
-            self::Retirement401a => '401(a)',
-            self::Retirement401K => '401(k)',
-            self::Retirement403b => '403(b)',
-            self::DeferredCompensation457b => '457(b)',
-            self::Brokerage => 'Brokerage',
-            self::CashIndividualSavingsAccount => 'Cash Individual Savings Account (ISA)',
-            self::CryptoCurrencyExchange => 'Crypto Currency Exchange',
-            self::EducationSavingsAccount => 'Education Savings Account (ESA)',
-            self::FixedAnnuity => 'Fixed Annuity',
-            self::GuaranteedInvestmentCertificate => 'Guaranteed Investment Certificate (GIC)',
-            self::HealthSavingsAccountNonCash => 'Health Savings Account (Non-Cash)',
-            self::IndividualRetirementAccount => 'Individual Retirement Account (IRA)',
-            self::IndividualSavingsAccount => 'Individual Savings Account (ISA)',
-            self::KeoghPlan => 'Keogh Plan',
-            self::LifeIncomeFund => 'Life Income Fund (LIF)',
-            self::LifeInsuranceAccount => 'Life Insurance Account',
-            self::LockedInRetirementAccount => 'Locked-In Retirement Account (LIRA)',
-            self::LockedInRetirementIncomeFund => 'Locked-In Retirement Income Fund (LRIF)',
-            self::LockedInRetirementSavingsPlan => 'Locked-In Retirement Savings Plan (LRSP)',
-            self::MutualFundAccount => 'Mutual Fund Account',
-            self::CryptoCurrencyWallet => 'Non-Custodial Wallet',
-            self::NonTaxableBrokerageAccount => 'Non-Taxable Brokerage Account',
-            self::AnnuityAccountOther => 'Other Annuity',
-            self::InsuranceAccountOther => 'Other Insurance',
-            self::PensionAccount => 'Pension',
-            self::PrescribedRetirementIncomeFund => 'Prescribed Retirement Income Fund (PRIF)',
-            self::ProfitSharingPlanAccount => 'Profit Sharing Plan',
-            self::QualifyingShareAccount => 'Qualifying Share Account (QSHR)',
-            self::RegisteredDisabilitySavingsPlan => 'Registered Disability Savings Plan (RDSP)',
-            self::RegisteredEducationSavingsPlan => 'Registered Education Savings Plan (RESP)',
-            self::RetirementAccountOther => 'Retirement',
-            self::RestrictedLifeIncomeFund => 'Restricted Life Income Fund (RLIF)',
-            self::RothIRA => 'Roth IRA',
-            self::Roth401k => 'Roth 401(k)',
-            self::RegisteredRetirementIncomeFund => 'Registered Retirement Income Fund (RRIF)',
-            self::RegisteredRetirementSavingsPlan => 'Registered Retirement Savings Plan (RRSP)',
-            self::SalaryReductionSEPPlan => 'Salary Reduction SEP Plan (SARSEP)',
-            self::SimplifiedEmployeePensionIRA => 'Simplified Employee Pension IRA (SEP IRA)',
-            self::SavingsIncentiveMatchPlanForEmployeesIRA => 'Savings Incentive Match Plan for Employees IRA (SIMPLE IRA)',
-            self::SelfInvestedPersonalPension => 'Self-Invested Personal Pension (SIPP)',
-            self::StockPlanAccount => 'Stock Plan',
-            self::TaxFreeSavingsAccount => 'Tax-Free Savings Account (TFSA)',
-            self::TrustAccount => 'Trust',
-            self::UniformGiftToMinorsAct => 'Uniform Gift to Minors Act (UGMA)',
-            self::UniformTransfersToMinorsAct => 'Uniform Transfers to Minors Act (UTMA)',
-            self::VariableAnnuityAccount => 'Variable Annuity',
-        };
-
-        return $label;
-    }
-}

app/Enums/BankAccountType.php

@@ -18,91 +18,4 @@ enum BankAccountType: string implements HasLabel
     {
         return translate($this->name);
     }
-
-    public function getSubtypes(): array
-    {
-        return match ($this) {
-            self::Depository => [
-                BankAccountSubtype::Checking,
-                BankAccountSubtype::Savings,
-                BankAccountSubtype::HealthSavingsAccountCash,
-                BankAccountSubtype::CertificateOfDeposit,
-                BankAccountSubtype::MoneyMarket,
-                BankAccountSubtype::Paypal,
-                BankAccountSubtype::Prepaid,
-                BankAccountSubtype::CashManagement,
-                BankAccountSubtype::ElectronicBenefitsTransfer,
-            ],
-            self::Credit => [
-                BankAccountSubtype::CreditCard,
-                BankAccountSubtype::PaypalCredit,
-            ],
-            self::Loan => [
-                BankAccountSubtype::Auto,
-                BankAccountSubtype::Business,
-                BankAccountSubtype::Commercial,
-                BankAccountSubtype::Construction,
-                BankAccountSubtype::Consumer,
-                BankAccountSubtype::HomeEquity,
-                BankAccountSubtype::Loan,
-                BankAccountSubtype::Mortgage,
-                BankAccountSubtype::Overdraft,
-                BankAccountSubtype::LineOfCredit,
-                BankAccountSubtype::Student,
-                BankAccountSubtype::Other,
-            ],
-            self::Investment => [
-                BankAccountSubtype::CollegeSavings529,
-                BankAccountSubtype::Retirement401a,
-                BankAccountSubtype::Retirement401K,
-                BankAccountSubtype::Retirement403b,
-                BankAccountSubtype::DeferredCompensation457b,
-                BankAccountSubtype::Brokerage,
-                BankAccountSubtype::CashIndividualSavingsAccount,
-                BankAccountSubtype::CryptoCurrencyExchange,
-                BankAccountSubtype::EducationSavingsAccount,
-                BankAccountSubtype::FixedAnnuity,
-                BankAccountSubtype::GuaranteedInvestmentCertificate,
-                BankAccountSubtype::HealthSavingsAccountNonCash,
-                BankAccountSubtype::IndividualRetirementAccount,
-                BankAccountSubtype::IndividualSavingsAccount,
-                BankAccountSubtype::KeoghPlan,
-                BankAccountSubtype::LifeIncomeFund,
-                BankAccountSubtype::LifeInsuranceAccount,
-                BankAccountSubtype::LockedInRetirementAccount,
-                BankAccountSubtype::LockedInRetirementIncomeFund,
-                BankAccountSubtype::LockedInRetirementSavingsPlan,
-                BankAccountSubtype::MutualFundAccount,
-                BankAccountSubtype::CryptoCurrencyWallet,
-                BankAccountSubtype::NonTaxableBrokerageAccount,
-                BankAccountSubtype::AnnuityAccountOther,
-                BankAccountSubtype::InsuranceAccountOther,
-                BankAccountSubtype::PensionAccount,
-                BankAccountSubtype::PrescribedRetirementIncomeFund,
-                BankAccountSubtype::ProfitSharingPlanAccount,
-                BankAccountSubtype::QualifyingShareAccount,
-                BankAccountSubtype::RegisteredDisabilitySavingsPlan,
-                BankAccountSubtype::RegisteredEducationSavingsPlan,
-                BankAccountSubtype::RetirementAccountOther,
-                BankAccountSubtype::RestrictedLifeIncomeFund,
-                BankAccountSubtype::RothIRA,
-                BankAccountSubtype::Roth401k,
-                BankAccountSubtype::RegisteredRetirementIncomeFund,
-                BankAccountSubtype::RegisteredRetirementSavingsPlan,
-                BankAccountSubtype::SalaryReductionSEPPlan,
-                BankAccountSubtype::SimplifiedEmployeePensionIRA,
-                BankAccountSubtype::SavingsIncentiveMatchPlanForEmployeesIRA,
-                BankAccountSubtype::SelfInvestedPersonalPension,
-                BankAccountSubtype::StockPlanAccount,
-                BankAccountSubtype::TaxFreeSavingsAccount,
-                BankAccountSubtype::TrustAccount,
-                BankAccountSubtype::UniformGiftToMinorsAct,
-                BankAccountSubtype::UniformTransfersToMinorsAct,
-                BankAccountSubtype::VariableAnnuityAccount,
-            ],
-            self::Other => [
-                BankAccountSubtype::Other,
-            ],
-        };
-    }
 }

app/Enums/CategoryType.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-use Filament\Support\Contracts\HasLabel;
-
-enum CategoryType: string implements HasLabel
-{
-    case Expense = 'expense';
-    case Income = 'income';
-    case Item = 'item';
-    case Other = 'other';
-
-    public function getLabel(): ?string
-    {
-        return translate($this->name);
-    }
-}

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

@@ -3,8 +3,10 @@
 namespace App\Filament\Company\Pages\Accounting;
 
 use App\Enums\Accounting\AccountCategory;
+use App\Models\Accounting\Account;
 use App\Models\Accounting\Account as ChartModel;
 use App\Models\Accounting\AccountSubtype;
+use App\Services\AccountService;
 use App\Utilities\Accounting\AccountCode;
 use App\Utilities\Currency\CurrencyAccessor;
 use Filament\Actions\Action;
@@ -39,11 +41,27 @@ class AccountChart extends Page
     #[Url]
     public ?string $activeTab = null;
 
+    protected AccountService $accountService;
+
+    public function boot(AccountService $accountService): void
+    {
+        $this->accountService = $accountService;
+    }
+
     public function mount(): void
     {
         $this->activeTab = $this->activeTab ?? AccountCategory::Asset->value;
     }
 
+    public function getAccountBalance(Account $account): ?string
+    {
+        $company = $account->company;
+        $startDate = $company->locale->fiscalYearStartDate();
+        $endDate = $company->locale->fiscalYearEndDate();
+
+        return $this->accountService->getEndingBalance($account, $startDate, $endDate)?->formatted();
+    }
+
     protected function configureAction(Action $action): void
     {
         $action

app/Filament/Company/Pages/Reports.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Filament\Company\Pages;
+
+use App\Filament\Company\Pages\Reports\AccountBalances;
+use App\Infolists\Components\ReportEntry;
+use Filament\Infolists\Components\Section;
+use Filament\Infolists\Infolist;
+use Filament\Pages\Page;
+use Filament\Support\Colors\Color;
+
+class Reports extends Page
+{
+    protected static ?string $navigationIcon = 'heroicon-o-document-text';
+
+    protected static string $view = 'filament.company.pages.reports';
+
+    public function reportsInfolist(Infolist $infolist): Infolist
+    {
+        return $infolist
+            ->state([])
+            ->schema([
+                Section::make('Detailed Reports')
+                    ->aside()
+                    ->description('Dig into the details of your business’s transactions, balances, and accounts.')
+                    ->extraAttributes(['class' => 'es-report-card'])
+                    ->schema([
+                        ReportEntry::make('account_balances')
+                            ->hiddenLabel()
+                            ->heading('Account Balances')
+                            ->description('Summary view of balances and activity for all accounts.')
+                            ->icon('heroicon-o-currency-dollar')
+                            ->iconColor(Color::Teal)
+                            ->url(AccountBalances::getUrl()),
+                        ReportEntry::make('trial_balance')
+                            ->hiddenLabel()
+                            ->heading('Trial Balance')
+                            ->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('#'),
+                        ReportEntry::make('account_transactions')
+                            ->hiddenLabel()
+                            ->heading('Account Transactions')
+                            ->description('A record of all transactions for a company. The general ledger is the core of a company\'s financial records.')
+                            ->icon('heroicon-o-adjustments-horizontal')
+                            ->iconColor(Color::Amber)
+                            ->url('#'),
+                    ]),
+            ]);
+    }
+}

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

@@ -0,0 +1,263 @@
+<?php
+
+namespace App\Filament\Company\Pages\Reports;
+
+use App\DTO\AccountBalanceReportDTO;
+use App\Models\Company;
+use App\Services\AccountBalancesExportService;
+use App\Services\AccountService;
+use Barryvdh\DomPDF\Facade\Pdf;
+use Carbon\CarbonPeriod;
+use Filament\Actions\Action;
+use Filament\Actions\ActionGroup;
+use Filament\Forms\Components\DatePicker;
+use Filament\Forms\Components\Select;
+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
+{
+    protected static string $view = 'filament.company.pages.reports.account-balances';
+
+    protected static ?string $slug = 'reports/account-balances';
+
+    public string $startDate = '';
+
+    public string $endDate = '';
+
+    public string $dateRange = '';
+
+    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->updateDateRange($this->dateRange);
+
+        $this->loadAccountBalances();
+    }
+
+    public function getDefaultDateRange(): string
+    {
+        return 'FY-' . now()->year;
+    }
+
+    public function loadAccountBalances(): void
+    {
+        $startTime = microtime(true);
+        $this->accountBalanceReport = $this->accountService->buildAccountBalanceReport($this->startDate, $this->endDate);
+        $endTime = microtime(true);
+        $executionTime = ($endTime - $startTime);
+        info('Account balance report loaded in ' . $executionTime . ' seconds');
+    }
+
+    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),
+        ];
+    }
+
+    public function exportCSV(): StreamedResponse
+    {
+        return $this->accountBalancesExportService->exportToCsv($this->company, $this->accountBalanceReport, $this->startDate, $this->endDate);
+    }
+
+    public function exportPDF(): StreamedResponse
+    {
+        $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')->setOption(['defaultFont' => 'sans-serif', 'isPhpEnabled' => true]);
+
+        return response()->streamDownload(function () use ($pdf) {
+            echo $pdf->stream();
+        }, 'account-balances.pdf');
+    }
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Split::make([
+                    Select::make('dateRange')
+                        ->label('Date Range')
+                        ->options($this->getDateRangeOptions())
+                        ->selectablePlaceholder(false)
+                        ->afterStateUpdated(function ($state) {
+                            $this->updateDateRange($state);
+                        }),
+                    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 getDateRangeOptions(): array
+    {
+        $earliestDate = Carbon::parse($this->accountService->getEarliestTransactionDate());
+        $currentDate = now();
+        $fiscalYearStartCurrent = Carbon::parse($this->fiscalYearStartDate);
+
+        $options = [
+            'Fiscal Year' => [],
+            'Fiscal Quarter' => [],
+            'Calendar Year' => [],
+            'Calendar Quarter' => [],
+            'Month' => [],
+            'Custom' => [],
+        ];
+
+        $period = CarbonPeriod::create($earliestDate, '1 month', $currentDate);
+
+        foreach ($period as $date) {
+            $options['Fiscal Year']['FY-' . $date->year] = $date->year;
+
+            $fiscalYearStart = $fiscalYearStartCurrent->copy()->subYears($currentDate->year - $date->year);
+
+            for ($i = 0; $i < 4; $i++) {
+                $quarterNumber = $i + 1;
+                $quarterStart = $fiscalYearStart->copy()->addMonths(($quarterNumber - 1) * 3);
+                $quarterEnd = $quarterStart->copy()->addMonths(3)->subDay();
+
+                if ($quarterStart->lessThanOrEqualTo($currentDate) && $quarterEnd->greaterThanOrEqualTo($earliestDate)) {
+                    $options['Fiscal Quarter']['FQ-' . $quarterNumber . '-' . $date->year] = 'Q' . $quarterNumber . ' ' . $date->year;
+                }
+            }
+
+            $options['Calendar Year']['Y-' . $date->year] = $date->year;
+            $quarterKey = 'Q-' . $date->quarter . '-' . $date->year;
+            $options['Calendar Quarter'][$quarterKey] = 'Q' . $date->quarter . ' ' . $date->year;
+            $options['Month']['M-' . $date->format('Y-m')] = $date->format('F Y');
+            $options['Custom']['Custom'] = 'Custom';
+        }
+
+        $options['Fiscal Year'] = array_reverse($options['Fiscal Year'], true);
+        $options['Fiscal Quarter'] = array_reverse($options['Fiscal Quarter'], true);
+        $options['Calendar Year'] = array_reverse($options['Calendar Year'], true);
+        $options['Calendar Quarter'] = array_reverse($options['Calendar Quarter'], true);
+        $options['Month'] = array_reverse($options['Month'], true);
+
+        return $options;
+    }
+
+    public function updateDateRange($state): void
+    {
+        [$type, $param1, $param2] = explode('-', $state) + [null, null, null];
+        $this->processDateRange($type, $param1, $param2);
+    }
+
+    public function processDateRange($type, $param1, $param2): void
+    {
+        match ($type) {
+            'FY' => $this->processFiscalYear($param1),
+            'FQ' => $this->processFiscalQuarter($param1, $param2),
+            'Y' => $this->processCalendarYear($param1),
+            'Q' => $this->processCalendarQuarter($param1, $param2),
+            'M' => $this->processMonth("{$param1}-{$param2}"),
+        };
+    }
+
+    public function processFiscalYear($year): void
+    {
+        $currentYear = now()->year;
+        $diff = $currentYear - $year;
+        $fiscalYearStart = Carbon::parse($this->fiscalYearStartDate)->subYears($diff);
+        $fiscalYearEnd = Carbon::parse($this->fiscalYearEndDate)->subYears($diff);
+        $this->setDateRange($fiscalYearStart, $fiscalYearEnd);
+    }
+
+    public function processFiscalQuarter($quarter, $year): void
+    {
+        $currentYear = now()->year;
+        $diff = $currentYear - $year;
+        $fiscalYearStart = Carbon::parse($this->company->locale->fiscal_year_start_date)->subYears($diff);
+        $quarterStart = $fiscalYearStart->copy()->addMonths(($quarter - 1) * 3);
+        $quarterEnd = $quarterStart->copy()->addMonths(3)->subDay();
+        $this->setDateRange($quarterStart, $quarterEnd);
+    }
+
+    public function processCalendarYear($year): void
+    {
+        $start = Carbon::createFromDate($year)->startOfYear();
+        $end = Carbon::createFromDate($year)->endOfYear();
+        $this->setDateRange($start, $end);
+    }
+
+    public function processCalendarQuarter($quarter, $year): void
+    {
+        $month = ($quarter - 1) * 3 + 1;
+        $start = Carbon::createFromDate($year, $month, 1);
+        $end = Carbon::createFromDate($year, $month, 1)->endOfQuarter();
+        $this->setDateRange($start, $end);
+    }
+
+    public function processMonth($yearMonth): void
+    {
+        $start = Carbon::parse($yearMonth)->startOfMonth();
+        $end = Carbon::parse($yearMonth)->endOfMonth();
+        $this->setDateRange($start, $end);
+    }
+
+    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/Setting/CompanyDefault.php

@@ -116,7 +116,6 @@ class CompanyDefault extends Page
             ->schema([
                 $this->getGeneralSection(),
                 $this->getModifiersSection(),
-                $this->getCategoriesSection(),
             ])
             ->model($this->record)
             ->statePath('data')
@@ -222,27 +221,6 @@ class CompanyDefault extends Page
             ])->columns();
     }
 
-    protected function getCategoriesSection(): Component
-    {
-        return Section::make('Categories')
-            ->schema([
-                Select::make('income_category_id')
-                    ->softRequired()
-                    ->localizeLabel()
-                    ->relationship('incomeCategory', 'name')
-                    ->saveRelationshipsUsing(null)
-                    ->required()
-                    ->preload(),
-                Select::make('expense_category_id')
-                    ->softRequired()
-                    ->localizeLabel()
-                    ->relationship('expenseCategory', 'name')
-                    ->saveRelationshipsUsing(null)
-                    ->searchable()
-                    ->preload(),
-            ])->columns();
-    }
-
     public function renderBadgeOptionLabel(string $label, string $color = 'primary', string $size = 'sm'): string
     {
         return Blade::render('<x-filament::badge color="' . $color . '" size="' . $size . '">' . e($label) . '</x-filament::badge>');

app/Filament/Company/Pages/Setting/Localization.php

@@ -13,19 +13,20 @@ use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Facades\Filament;
 use Filament\Forms\Components\Component;
-use Filament\Forms\Components\DatePicker;
+use Filament\Forms\Components\Group;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
 use Filament\Forms\Get;
+use Filament\Forms\Set;
 use Filament\Notifications\Notification;
 use Filament\Pages\Concerns\InteractsWithFormActions;
 use Filament\Pages\Page;
 use Filament\Support\Exceptions\Halt;
+use Guava\FilamentClusters\Forms\Cluster;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Str;
 use Livewire\Attributes\Locked;
 
 use function Filament\authorize;
@@ -168,27 +169,6 @@ class Localization extends Page
 
         return Section::make('Financial & Fiscal')
             ->schema([
-                DatePicker::make('fiscal_year_start')
-                    ->localizeLabel()
-                    ->live()
-                    ->extraAttributes(['wire:key' => Str::random()]) // Required to reinitialize the datepicker when the date_format state changes
-                    ->maxDate(static fn (Get $get) => $get('fiscal_year_end'))
-                    ->displayFormat(static function (LocalizationModel $record, Get $get) {
-                        return $get('date_format') ?? DateFormat::DEFAULT;
-                    })
-                    ->seconds(false)
-                    ->softRequired(),
-                DatePicker::make('fiscal_year_end')
-                    ->softRequired()
-                    ->localizeLabel()
-                    ->live()
-                    ->extraAttributes(['wire:key' => Str::random()]) // Required to reinitialize the datepicker when the date_format state changes
-                    ->minDate(static fn (Get $get) => $get('fiscal_year_start'))
-                    ->disabled(static fn (Get $get): bool => ! filled($get('fiscal_year_start')))
-                    ->displayFormat(static function (LocalizationModel $record, Get $get) {
-                        return $get('date_format') ?? DateFormat::DEFAULT;
-                    })
-                    ->seconds(false),
                 Select::make('number_format')
                     ->softRequired()
                     ->localizeLabel()
@@ -197,6 +177,34 @@ class Localization extends Page
                     ->softRequired()
                     ->localizeLabel('Percent Position')
                     ->boolean($beforeNumber, $afterNumber, $selectPosition),
+                Group::make()
+                    ->schema([
+                        Cluster::make([
+                            Select::make('fiscal_year_end_month')
+                                ->softRequired()
+                                ->options(array_combine(range(1, 12), array_map(static fn ($month) => now()->month($month)->monthName, range(1, 12))))
+                                ->afterStateUpdated(static fn (Set $set) => $set('fiscal_year_end_day', null))
+                                ->columnSpan(2)
+                                ->live(),
+                            Select::make('fiscal_year_end_day')
+                                ->placeholder('Day')
+                                ->softRequired()
+                                ->columnSpan(1)
+                                ->options(function (Get $get) {
+                                    $month = $get('fiscal_year_end_month');
+
+                                    $daysInMonth = now()->month($month)->daysInMonth;
+
+                                    return array_combine(range(1, $daysInMonth), range(1, $daysInMonth));
+                                })
+                                ->live(),
+                        ])
+                            ->columns(3)
+                            ->columnSpan(2)
+                            ->required()
+                            ->markAsRequired(false)
+                            ->label('Fiscal Year End'),
+                    ])->columns(3),
             ])->columns();
     }
 

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

@@ -2,8 +2,10 @@
 
 namespace App\Filament\Company\Resources\Accounting;
 
+use App\Enums\Accounting\AccountCategory;
 use App\Enums\DateFormat;
 use App\Filament\Company\Resources\Accounting\TransactionResource\Pages;
+use App\Models\Accounting\Account;
 use App\Models\Accounting\Transaction;
 use App\Models\Banking\BankAccount;
 use App\Models\Setting\Localization;
@@ -11,9 +13,11 @@ use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Support\Enums\FontWeight;
+use Filament\Support\Enums\MaxWidth;
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
 
 class TransactionResource extends Resource
 {
@@ -26,25 +30,44 @@ class TransactionResource extends Resource
         return $form
             ->schema([
                 Forms\Components\DatePicker::make('posted_at')
-                    ->label('Posted At')
+                    ->label('Date')
                     ->required()
-                    ->default(now()),
+                    ->displayFormat('Y-m-d')
+                    ->default(now()->format('Y-m-d')),
                 Forms\Components\TextInput::make('description')
                     ->label('Description'),
-                Forms\Components\Select::make('type')
-                    ->label('Type')
-                    ->options([
-                        'expense' => 'Expense',
-                        'income' => 'Income',
-                        'transfer' => 'Transfer',
-                    ])
+                Forms\Components\Select::make('bank_account_id')
+                    ->label('Account')
+                    ->options(fn () => static::getBankAccountOptions())
+                    ->live()
+                    ->searchable()
+                    ->preload()
                     ->required(),
                 Forms\Components\Select::make('method')
-                    ->label('Method')
+                    ->label('Type')
+                    ->live()
                     ->options([
                         'deposit' => 'Deposit',
                         'withdrawal' => 'Withdrawal',
                     ])
+                    ->default('deposit')
+                    ->afterStateUpdated(static function (Forms\Set $set, $state) {
+                        if ($state === 'deposit') {
+                            $account = Account::where('category', AccountCategory::Revenue)
+                                ->where('name', 'Uncategorized Income')->first();
+
+                            if ($account->exists()) {
+                                $set('account_id', $account->id);
+                            }
+                        } else {
+                            $account = Account::where('category', AccountCategory::Expense)
+                                ->where('name', 'Uncategorized Expense')->first();
+
+                            if ($account->exists()) {
+                                $set('account_id', $account->id);
+                            }
+                        }
+                    })
                     ->required(),
                 Forms\Components\TextInput::make('amount')
                     ->label('Amount')
@@ -60,12 +83,17 @@ class TransactionResource extends Resource
                         return 'USD';
                     })
                     ->required(),
-                Forms\Components\Select::make('category_id')
+                Forms\Components\Select::make('account_id')
                     ->label('Category')
-                    ->relationship('category', 'name')
+                    ->options(static fn (Forms\Get $get) => static::getAccountOptions($get('method')))
                     ->searchable()
                     ->preload()
                     ->required(),
+                Forms\Components\Textarea::make('notes')
+                    ->label('Notes')
+                    ->autosize()
+                    ->rows(10)
+                    ->columnSpanFull(),
             ]);
     }
 
@@ -75,6 +103,7 @@ class TransactionResource extends Resource
             ->columns([
                 Tables\Columns\TextColumn::make('posted_at')
                     ->label('Date')
+                    ->sortable()
                     ->formatStateUsing(static function ($state) {
                         $dateFormat = Localization::firstOrFail()->date_format->value ?? DateFormat::DEFAULT;
 
@@ -86,14 +115,8 @@ class TransactionResource extends Resource
                 Tables\Columns\TextColumn::make('description')
                     ->limit(50)
                     ->label('Description'),
-                Tables\Columns\TextColumn::make('category.name')
-                    ->label('Category')
-                    ->html()
-                    ->formatStateUsing(static function ($state, Transaction $record) {
-                        $color = $record->category->color ?? '#000000';
-
-                        return "<span style='display: inline-block; width: 8px; height: 8px; background-color: {$color}; border-radius: 50%; margin-right: 3px;'></span> {$state}";
-                    }),
+                Tables\Columns\TextColumn::make('account.name')
+                    ->label('Category'),
                 Tables\Columns\TextColumn::make('amount')
                     ->label('Amount')
                     ->sortable()
@@ -106,7 +129,21 @@ class TransactionResource extends Resource
                 //
             ])
             ->actions([
-                Tables\Actions\EditAction::make(),
+                Tables\Actions\EditAction::make()
+                    ->modalWidth(MaxWidth::ThreeExtraLarge)
+                    ->stickyModalHeader()
+                    ->stickyModalFooter()
+                    ->mutateFormDataUsing(static function (array $data): array {
+                        $method = $data['method'];
+
+                        if ($method === 'deposit') {
+                            $data['type'] = 'income';
+                        } else {
+                            $data['type'] = 'expense';
+                        }
+
+                        return $data;
+                    }),
             ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([
@@ -125,9 +162,30 @@ class TransactionResource extends Resource
     public static function getPages(): array
     {
         return [
-            'index' => Pages\ListTransactions::route('/'),
-            'create' => Pages\CreateTransaction::route('/create'),
-            'edit' => Pages\EditTransaction::route('/{record}/edit'),
+            'index' => Pages\ManageTransaction::route('/'),
         ];
     }
+
+    public static function getBankAccountOptions(): array
+    {
+        $bankAccounts = BankAccount::with('account.subtype')->get();
+
+        return $bankAccounts->groupBy('account.subtype.name')
+            ->map(fn (Collection $bankAccounts) => $bankAccounts->pluck('account.name', 'id'))
+            ->toArray();
+    }
+
+    public static function getAccountOptions(mixed $method)
+    {
+        $excludedCategory = match ($method) {
+            'deposit' => AccountCategory::Expense,
+            'withdrawal' => AccountCategory::Revenue,
+        };
+
+        $accounts = Account::whereNot('category', $excludedCategory)->get();
+
+        return $accounts->groupBy(fn (Account $account) => $account->category->getLabel())
+            ->map(fn (Collection $accounts, string $category) => $accounts->mapWithKeys(fn (Account $account) => [$account->id => $account->name]))
+            ->toArray();
+    }
 }

app/Filament/Company/Resources/Accounting/TransactionResource/Pages/ManageTransaction.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Filament\Company\Resources\Accounting\TransactionResource\Pages;
+
+use App\Enums\Accounting\AccountCategory;
+use App\Filament\Company\Resources\Accounting\TransactionResource;
+use App\Models\Accounting\Account;
+use App\Models\Banking\BankAccount;
+use Filament\Actions;
+use Filament\Resources\Pages\ManageRecords;
+use Filament\Support\Enums\MaxWidth;
+
+class ManageTransaction extends ManageRecords
+{
+    public static string $resource = TransactionResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\CreateAction::make('addIncome')
+                ->label('Add Income')
+                ->modalWidth(MaxWidth::ThreeExtraLarge)
+                ->stickyModalHeader()
+                ->stickyModalFooter()
+                ->button()
+                ->outlined()
+                ->fillForm(static fn (): array => [
+                    'method' => 'deposit',
+                    'posted_at' => now()->format('Y-m-d'),
+                    'bank_account_id' => BankAccount::first()->isEnabled() ? BankAccount::first()->id : null,
+                    'amount' => '0.00',
+                    'account_id' => Account::where('category', AccountCategory::Revenue)->where('name', 'Uncategorized Income')->first()->id,
+                ])
+                ->mutateFormDataUsing(function (array $data): array {
+                    $method = $data['method'];
+
+                    if ($method === 'deposit') {
+                        $data['type'] = 'income';
+                    } else {
+                        $data['type'] = 'expense';
+                    }
+
+                    return $data;
+                }),
+            Actions\CreateAction::make('addExpense')
+                ->label('Add Expense')
+                ->modalWidth(MaxWidth::ThreeExtraLarge)
+                ->stickyModalHeader()
+                ->stickyModalFooter()
+                ->button()
+                ->outlined()
+                ->fillForm(static fn (): array => [
+                    'method' => 'withdrawal',
+                    'posted_at' => now()->format('Y-m-d'),
+                    'bank_account_id' => BankAccount::first()->isEnabled() ? BankAccount::first()->id : null,
+                    'amount' => '0.00',
+                    'account_id' => Account::where('category', AccountCategory::Expense)->where('name', 'Uncategorized Expense')->first()->id,
+                ])
+                ->mutateFormDataUsing(function (array $data): array {
+                    $method = $data['method'];
+
+                    if ($method === 'deposit') {
+                        $data['type'] = 'income';
+                    } else {
+                        $data['type'] = 'expense';
+                    }
+
+                    return $data;
+                }),
+        ];
+    }
+}

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

@@ -9,6 +9,7 @@ use App\Facades\Forex;
 use App\Filament\Company\Resources\Banking\AccountResource\Pages;
 use App\Models\Accounting\AccountSubtype;
 use App\Models\Banking\BankAccount;
+use App\Services\AccountService;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use BackedEnum;
@@ -62,6 +63,7 @@ class AccountResource extends Resource
                             ->options(BankAccountType::class)
                             ->localizeLabel()
                             ->searchable()
+                            ->columnSpan(1)
                             ->default(BankAccountType::DEFAULT)
                             ->live()
                             ->afterStateUpdated(static function (Forms\Set $set, $state, ?BankAccount $record, string $operation) {
@@ -77,6 +79,7 @@ class AccountResource extends Resource
                             })
                             ->required(),
                         Forms\Components\Group::make()
+                            ->columnStart(2)
                             ->relationship('account')
                             ->schema([
                                 Forms\Components\Select::make('subtype_id')
@@ -93,94 +96,85 @@ class AccountResource extends Resource
                             ]),
                         Forms\Components\Group::make()
                             ->relationship('account')
+                            ->columns(2)
+                            ->columnSpanFull()
                             ->schema([
                                 Forms\Components\TextInput::make('name')
                                     ->maxLength(100)
                                     ->localizeLabel()
                                     ->required(),
-                            ]),
-                        Forms\Components\TextInput::make('number')
-                            ->localizeLabel('Account Number')
-                            ->unique(ignoreRecord: true, modifyRuleUsing: static function (Unique $rule, $state) {
-                                $companyId = Auth::user()->currentCompany->id;
-
-                                return $rule->where('company_id', $companyId)->where('number', $state);
-                            })
-                            ->maxLength(20)
-                            ->validationAttribute('account number')
-                            ->required(),
-                        ToggleButton::make('enabled')
-                            ->localizeLabel('Default'),
-                    ])->columns(),
-                Forms\Components\Section::make('Financial Details')
-                    ->relationship('account')
-                    ->schema([
-                        Forms\Components\Select::make('currency_code')
-                            ->localizeLabel('Currency')
-                            ->relationship('currency', 'name')
-                            ->default(CurrencyAccessor::getDefaultCurrency())
-                            ->preload()
-                            ->searchable()
-                            ->live()
-                            ->afterStateUpdated(static function (Forms\Set $set, $state, $old, Forms\Get $get) {
-                                $starting_balance = CurrencyConverter::convertAndSet($state, $old, $get('starting_balance'));
-
-                                if ($starting_balance !== null) {
-                                    $set('starting_balance', $starting_balance);
-                                }
-                            })
-                            ->required()
-                            ->createOptionForm([
-                                Forms\Components\Select::make('code')
-                                    ->localizeLabel()
+                                Forms\Components\Select::make('currency_code')
+                                    ->localizeLabel('Currency')
+                                    ->relationship('currency', 'name')
+                                    ->default(CurrencyAccessor::getDefaultCurrency())
+                                    ->preload()
                                     ->searchable()
-                                    ->options(CurrencyAccessor::getAvailableCurrencies())
                                     ->live()
-                                    ->afterStateUpdated(static function (callable $set, $state) {
-                                        if ($state === null) {
-                                            return;
-                                        }
-
-                                        $currency_code = currency($state);
-                                        $defaultCurrencyCode = currency()->getCurrency();
-                                        $forexEnabled = Forex::isEnabled();
-                                        $exchangeRate = $forexEnabled ? Forex::getCachedExchangeRate($defaultCurrencyCode, $state) : null;
-
-                                        $set('name', $currency_code->getName() ?? '');
+                                    ->required()
+                                    ->createOptionForm([
+                                        Forms\Components\Select::make('code')
+                                            ->localizeLabel()
+                                            ->searchable()
+                                            ->options(CurrencyAccessor::getAvailableCurrencies())
+                                            ->live()
+                                            ->afterStateUpdated(static function (callable $set, $state) {
+                                                if ($state === null) {
+                                                    return;
+                                                }
+
+                                                $currency_code = currency($state);
+                                                $defaultCurrencyCode = currency()->getCurrency();
+                                                $forexEnabled = Forex::isEnabled();
+                                                $exchangeRate = $forexEnabled ? Forex::getCachedExchangeRate($defaultCurrencyCode, $state) : null;
+
+                                                $set('name', $currency_code->getName() ?? '');
+
+                                                if ($forexEnabled && $exchangeRate !== null) {
+                                                    $set('rate', $exchangeRate);
+                                                }
+                                            })
+                                            ->required(),
+                                        Forms\Components\TextInput::make('name')
+                                            ->localizeLabel()
+                                            ->maxLength(100)
+                                            ->required(),
+                                        Forms\Components\TextInput::make('rate')
+                                            ->localizeLabel()
+                                            ->numeric()
+                                            ->required(),
+                                    ])->createOptionAction(static function (Forms\Components\Actions\Action $action) {
+                                        return $action
+                                            ->label('Add Currency')
+                                            ->slideOver()
+                                            ->modalWidth('md')
+                                            ->action(static function (array $data) {
+                                                return DB::transaction(static function () use ($data) {
+                                                    $code = $data['code'];
+                                                    $name = $data['name'];
+                                                    $rate = $data['rate'];
+
+                                                    return (new CreateCurrency())->create($code, $name, $rate);
+                                                });
+                                            });
+                                    }),
+                            ]),
+                        Forms\Components\Group::make()
+                            ->columns(2)
+                            ->columnSpanFull()
+                            ->schema([
+                                Forms\Components\TextInput::make('number')
+                                    ->localizeLabel('Account Number')
+                                    ->unique(ignoreRecord: true, modifyRuleUsing: static function (Unique $rule, $state) {
+                                        $companyId = Auth::user()->currentCompany->id;
 
-                                        if ($forexEnabled && $exchangeRate !== null) {
-                                            $set('rate', $exchangeRate);
-                                        }
+                                        return $rule->where('company_id', $companyId)->where('number', $state);
                                     })
+                                    ->maxLength(20)
+                                    ->validationAttribute('account number')
                                     ->required(),
-                                Forms\Components\TextInput::make('name')
-                                    ->localizeLabel()
-                                    ->maxLength(100)
-                                    ->required(),
-                                Forms\Components\TextInput::make('rate')
-                                    ->localizeLabel()
-                                    ->numeric()
-                                    ->required(),
-                            ])->createOptionAction(static function (Forms\Components\Actions\Action $action) {
-                                return $action
-                                    ->label('Add Currency')
-                                    ->slideOver()
-                                    ->modalWidth('md')
-                                    ->action(static function (array $data) {
-                                        return DB::transaction(static function () use ($data) {
-                                            $code = $data['code'];
-                                            $name = $data['name'];
-                                            $rate = $data['rate'];
-
-                                            return (new CreateCurrency())->create($code, $name, $rate);
-                                        });
-                                    });
-                            }),
-                        Forms\Components\TextInput::make('starting_balance')
-                            ->required()
-                            ->localizeLabel()
-                            ->dehydrated()
-                            ->money(static fn (Forms\Get $get) => $get('currency_code')),
+                                ToggleButton::make('enabled')
+                                    ->localizeLabel('Default'),
+                            ]),
                     ])->columns(),
             ]);
     }
@@ -198,10 +192,16 @@ class AccountResource extends Resource
                     ->iconPosition('after')
                     ->description(static fn (BankAccount $record) => $record->mask ?: 'N/A')
                     ->sortable(),
-                Tables\Columns\TextColumn::make('account.ending_balance')
+                Tables\Columns\TextColumn::make('account.code') // Just so I could display the balance in the table for now
                     ->localizeLabel('Current Balance')
                     ->sortable()
-                    ->currency(static fn (BankAccount $record) => $record->account->currency_code, true),
+                    ->formatStateUsing(function (BankAccount $record) {
+                        $accountService = app(AccountService::class);
+                        $startDate = $record->account->company->locale->fiscalYearStartDate();
+                        $endDate = $record->account->company->locale->fiscalYearEndDate();
+
+                        return $accountService->getEndingBalance($record->account, $startDate, $endDate)?->formatted();
+                    }),
             ])
             ->filters([
                 //

app/Filament/Company/Resources/Setting/CategoryResource.php

@@ -1,188 +0,0 @@
-<?php
-
-namespace App\Filament\Company\Resources\Setting;
-
-use App\Enums\Accounting\AccountCategory;
-use App\Enums\CategoryType;
-use App\Filament\Company\Resources\Setting\CategoryResource\Pages;
-use App\Models\Accounting\Account;
-use App\Models\Setting\Category;
-use BackedEnum;
-use Closure;
-use Exception;
-use Filament\Facades\Filament;
-use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Support\Enums\FontWeight;
-use Filament\Tables;
-use Filament\Tables\Table;
-use Wallo\FilamentSelectify\Components\ToggleButton;
-
-class CategoryResource extends Resource
-{
-    protected static ?string $model = Category::class;
-
-    protected static ?string $modelLabel = 'Category';
-
-    protected static ?string $navigationIcon = 'heroicon-o-folder';
-
-    protected static ?string $navigationGroup = 'Settings';
-
-    protected static ?string $slug = 'settings/categories';
-
-    public static function getModelLabel(): string
-    {
-        $modelLabel = static::$modelLabel;
-
-        return translate($modelLabel);
-    }
-
-    public static function getNavigationParentItem(): ?string
-    {
-        if (Filament::hasTopNavigation()) {
-            return translate('Finance');
-        }
-
-        return null;
-    }
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->columns(1)
-            ->schema([
-                Forms\Components\TextInput::make('name')
-                    ->localizeLabel()
-                    ->required()
-                    ->maxLength(255)
-                    ->rule(static function (Forms\Get $get, Forms\Components\Component $component): Closure {
-                        return static function (string $attribute, $value, Closure $fail) use ($get, $component) {
-                            $existingCategory = Category::where('company_id', auth()->user()->currentCompany->id)
-                                ->where('name', $value)
-                                ->where('type', $get('type'))
-                                ->first();
-
-                            if ($existingCategory && $existingCategory->getKey() !== $component->getRecord()?->getKey()) {
-                                $message = translate('The :Type :record ":name" already exists.', [
-                                    'Type' => $existingCategory->type->getLabel(),
-                                    'record' => strtolower(static::getModelLabel()),
-                                    'name' => $value,
-                                ]);
-
-                                $fail($message);
-                            }
-                        };
-                    }),
-                Forms\Components\Select::make('type')
-                    ->localizeLabel()
-                    ->options(CategoryType::class)
-                    ->live()
-                    ->required()
-                    ->afterStateUpdated(static function (Forms\Set $set, $state, ?Category $record, string $operation) {
-                        $accountOptions = static::getAccountOptions($state);
-
-                        if ($operation === 'create') {
-                            $set('account_id', null);
-                        } elseif ($operation === 'edit' && $record !== null) {
-                            if (! array_key_exists($record->account_id, $accountOptions)) {
-                                $set('account_id', null);
-                            } else {
-                                $set('account_id', $record->account_id);
-                            }
-                        }
-                    }),
-                Forms\Components\Select::make('account_id')
-                    ->label('Account')
-                    ->searchable()
-                    ->preload()
-                    ->options(static function (Forms\Get $get) {
-                        return static::getAccountOptions($get('type'));
-                    }),
-                Forms\Components\ColorPicker::make('color')
-                    ->localizeLabel()
-                    ->required(),
-                ToggleButton::make('enabled')
-                    ->localizeLabel('Default')
-                    ->onLabel(Category::enabledLabel())
-                    ->offLabel(Category::disabledLabel()),
-            ]);
-    }
-
-    /**
-     * @throws Exception
-     */
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('name')
-                    ->localizeLabel()
-                    ->weight(FontWeight::Medium)
-                    ->icon(static fn (Category $record) => $record->isEnabled() ? 'heroicon-o-lock-closed' : null)
-                    ->tooltip(static function (Category $record) {
-                        $tooltipMessage = translate('Default :Type :Record', [
-                            'Type' => $record->type->getLabel(),
-                            'Record' => static::getModelLabel(),
-                        ]);
-
-                        return $record->isEnabled() ? $tooltipMessage : null;
-                    })
-                    ->iconPosition('after')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('type')
-                    ->localizeLabel()
-                    ->sortable()
-                    ->searchable(),
-                Tables\Columns\ColorColumn::make('color')
-                    ->localizeLabel()
-                    ->copyable(),
-            ])
-            ->filters([
-                Tables\Filters\SelectFilter::make('type')
-                    ->label('Type')
-                    ->multiple()
-                    ->searchable()
-                    ->options(CategoryType::class),
-            ])
-            ->actions([
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                ]),
-            ])
-            ->checkIfRecordIsSelectableUsing(static function (Category $record) {
-                return $record->isDisabled();
-            });
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ManageCategory::route('/'),
-        ];
-    }
-
-    public static function getAccountOptions($typeValue): array
-    {
-        $typeString = $typeValue instanceof BackedEnum ? $typeValue->value : $typeValue;
-
-        $accountCategory = match ($typeString) {
-            CategoryType::Income->value => AccountCategory::Revenue,
-            CategoryType::Expense->value => AccountCategory::Expense,
-            default => null,
-        };
-
-        if ($accountCategory) {
-            $accounts = Account::where('category', $accountCategory)->get();
-        } else {
-            $accounts = Account::all();
-        }
-
-        return $accounts->pluck('name', 'id')->toArray();
-    }
-}

app/Filament/Company/Resources/Setting/CategoryResource/Pages/ManageCategory.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Filament\Company\Resources\Setting\CategoryResource\Pages;
-
-use App\Enums\CategoryType;
-use App\Filament\Company\Resources\Setting\CategoryResource;
-use App\Models\Setting\Category;
-use App\Traits\HandlesResourceRecordCreation;
-use App\Traits\HandlesResourceRecordUpdate;
-use Filament\Actions;
-use Filament\Resources\Pages\ManageRecords;
-use Filament\Support\Enums\MaxWidth;
-use Filament\Tables;
-use Illuminate\Database\Eloquent\Model;
-
-class ManageCategory extends ManageRecords
-{
-    use HandlesResourceRecordCreation;
-    use HandlesResourceRecordUpdate;
-
-    protected static string $resource = CategoryResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\CreateAction::make()
-                ->using(function (array $data): Model {
-                    $user = auth()->user();
-
-                    $evaluatedTypes = [CategoryType::Income, CategoryType::Expense];
-
-                    return $this->handleRecordCreationWithUniqueField($data, new Category(), $user, 'type', $evaluatedTypes);
-                })
-                ->modalWidth(MaxWidth::TwoExtraLarge),
-        ];
-    }
-
-    protected function configureEditAction(Tables\Actions\EditAction $action): void
-    {
-        parent::configureEditAction($action);
-
-        $action
-            ->modalWidth(MaxWidth::TwoExtraLarge)
-            ->using(function (Model $record, array $data): Model {
-                $user = auth()->user();
-
-                $evaluatedTypes = [CategoryType::Income, CategoryType::Expense];
-
-                return $this->handleRecordUpdateWithUniqueField($record, $data, $user, 'type', $evaluatedTypes);
-            });
-    }
-}

app/Filament/Company/Resources/Setting/DiscountResource.php

@@ -160,10 +160,6 @@ class DiscountResource extends Resource
                     ->iconPosition('after')
                     ->searchable()
                     ->sortable(),
-                Tables\Columns\TextColumn::make('computation')
-                    ->localizeLabel()
-                    ->searchable()
-                    ->sortable(),
                 Tables\Columns\TextColumn::make('rate')
                     ->localizeLabel()
                     ->rate(static fn (Discount $record) => $record->computation->value)

app/Infolists/Components/ReportEntry.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Infolists\Components;
+
+use Filament\Infolists\Components\Entry;
+use Filament\Support\Concerns\HasDescription;
+use Filament\Support\Concerns\HasHeading;
+use Filament\Support\Concerns\HasIcon;
+use Filament\Support\Concerns\HasIconColor;
+
+class ReportEntry extends Entry
+{
+    use HasDescription;
+    use HasHeading;
+    use HasIcon;
+    use HasIconColor;
+
+    protected string $view = 'infolists.components.report-entry';
+}

app/Listeners/ConfigureChartOfAccounts.php

@@ -47,8 +47,6 @@ class ConfigureChartOfAccounts
                 $this->createDefaultAccounts($company, $subtype, $subtypeConfig);
             }
         }
-
-        $this->linkCategoriesToAccounts($company);
     }
 
     private function createDefaultAccounts(Company $company, AccountSubtype $subtype, array $subtypeConfig): void
@@ -75,18 +73,4 @@ class ConfigureChartOfAccounts
             }
         }
     }
-
-    private function linkCategoriesToAccounts(Company $company): void
-    {
-        $categories = config('chart-of-accounts.category_account_map');
-
-        foreach ($categories as $categoryName => $accountName) {
-            $category = $company->categories()->where('name', $categoryName)->first();
-            $account = $company->accounts()->where('name', $accountName)->first();
-
-            if ($category && $account) {
-                $category->update(['account_id' => $account->id]);
-            }
-        }
-    }
 }

app/Listeners/ConfigureCompanyNavigation.php

@@ -12,7 +12,6 @@ use App\Filament\Company\Pages\Setting\Invoice;
 use App\Filament\Company\Pages\Setting\Localization;
 use App\Filament\Company\Resources\Banking\AccountResource;
 use App\Filament\Company\Resources\Core\DepartmentResource;
-use App\Filament\Company\Resources\Setting\CategoryResource;
 use App\Filament\Company\Resources\Setting\CurrencyResource;
 use App\Filament\Company\Resources\Setting\DiscountResource;
 use App\Filament\Company\Resources\Setting\TaxResource;
@@ -69,7 +68,6 @@ class ConfigureCompanyNavigation
     {
         return NavigationGroup::make('Settings')
             ->items([
-                ...CategoryResource::getNavigationItems(),
                 ...CurrencyResource::getNavigationItems(),
                 ...DiscountResource::getNavigationItems(),
                 ...TaxResource::getNavigationItems(),

app/Listeners/HandleTransactionImport.php

@@ -4,10 +4,10 @@ namespace App\Listeners;
 
 use App\Events\StartTransactionImport;
 use App\Models\Accounting\Account;
+use App\Models\Banking\BankAccount;
 use App\Models\Banking\ConnectedBankAccount;
 use App\Models\Company;
-use App\Services\AccountService;
-use App\Services\BankAccountService;
+use App\Services\ConnectedBankAccountService;
 use App\Services\PlaidService;
 use App\Services\TransactionService;
 use Illuminate\Support\Carbon;
@@ -17,20 +17,17 @@ class HandleTransactionImport
 {
     protected PlaidService $plaid;
 
-    protected BankAccountService $bankAccountService;
-
-    protected AccountService $accountService;
+    protected ConnectedBankAccountService $connectedBankAccountService;
 
     protected TransactionService $transactionService;
 
     /**
      * Create the event listener.
      */
-    public function __construct(PlaidService $plaid, BankAccountService $bankAccountService, AccountService $accountService, TransactionService $transactionService)
+    public function __construct(PlaidService $plaid, ConnectedBankAccountService $connectedBankAccountService, TransactionService $transactionService)
     {
         $this->plaid = $plaid;
-        $this->bankAccountService = $bankAccountService;
-        $this->accountService = $accountService;
+        $this->connectedBankAccountService = $connectedBankAccountService;
         $this->transactionService = $transactionService;
     }
 
@@ -53,18 +50,18 @@ class HandleTransactionImport
 
         $accessToken = $connectedBankAccount->access_token;
 
-        $bankAccount = $this->bankAccountService->getOrProcessBankAccount($company, $connectedBankAccount, $selectedBankAccountId);
-        $account = $this->accountService->getOrProcessAccount($bankAccount, $company, $connectedBankAccount);
+        $bankAccount = $this->connectedBankAccountService->getOrProcessBankAccountForConnectedBankAccount($company, $connectedBankAccount, $selectedBankAccountId);
+        $account = $this->connectedBankAccountService->getOrProcessAccountForConnectedBankAccount($bankAccount, $company, $connectedBankAccount);
 
         $connectedBankAccount->update([
             'bank_account_id' => $bankAccount->id,
             'import_transactions' => true,
         ]);
 
-        $this->processTransactions($startDate, $company, $connectedBankAccount, $accessToken, $account);
+        $this->processTransactions($company, $account, $bankAccount, $connectedBankAccount, $startDate, $accessToken);
     }
 
-    public function processTransactions(string $startDate, Company $company, ConnectedBankAccount $connectedBankAccount, string $accessToken, Account $account): void
+    public function processTransactions(Company $company, Account $account, BankAccount $bankAccount, ConnectedBankAccount $connectedBankAccount, string $startDate, string $accessToken): void
     {
         $endDate = Carbon::now()->toDateString();
         $startDate = Carbon::parse($startDate)->toDateString();
@@ -74,11 +71,12 @@ class HandleTransactionImport
         ]);
 
         if (filled($transactionsResponse->transactions)) {
-            $transactions = array_reverse($transactionsResponse->transactions);
+            $postedTransactions = array_filter($transactionsResponse->transactions, static fn ($transaction) => $transaction->pending === false);
+            $transactions = array_reverse($postedTransactions);
             $currentBalance = $transactionsResponse->accounts[0]->balances->current;
 
-            $this->transactionService->createStartingBalanceIfNeeded($company, $account, $connectedBankAccount, $transactions, $currentBalance, $startDate);
-            $this->transactionService->storeTransactions($company, $account, $connectedBankAccount, $transactions);
+            $this->transactionService->createStartingBalanceIfNeeded($company, $account, $bankAccount, $transactions, $currentBalance, $startDate);
+            $this->transactionService->storeTransactions($company, $bankAccount, $transactions);
         }
     }
 }

app/Listeners/SyncAssociatedModels.php

@@ -45,8 +45,6 @@ class SyncAssociatedModels
             'purchase_tax_id' => 'purchaseTax',
             'sales_discount_id' => 'salesDiscount',
             'purchase_discount_id' => 'purchaseDiscount',
-            'income_category_id' => 'incomeCategory',
-            'expense_category_id' => 'expenseCategory',
         ];
 
         foreach ($diff as $key => $value) {

app/Listeners/SyncWithCompanyDefaults.php

@@ -2,7 +2,6 @@
 
 namespace App\Listeners;
 
-use App\Enums\CategoryType;
 use App\Enums\DiscountType;
 use App\Enums\TaxType;
 use App\Events\CompanyDefaultEvent;
@@ -58,7 +57,6 @@ class SyncWithCompanyDefaults
         match ($modelName) {
             'Discount' => $this->handleDiscount($default, $type, $model->getKey()),
             'Tax' => $this->handleTax($default, $type, $model->getKey()),
-            'Category' => $this->handleCategory($default, $type, $model->getKey()),
             'Currency' => $default->currency_code = $model->getAttribute('code'),
             'BankAccount' => $default->bank_account_id = $model->getKey(),
             default => null,
@@ -90,16 +88,4 @@ class SyncWithCompanyDefaults
             $type === TaxType::Purchase => $default->purchase_tax_id = $key,
         };
     }
-
-    private function handleCategory($default, $type, $key): void
-    {
-        if (! in_array($type, [CategoryType::Income, CategoryType::Expense], true)) {
-            return;
-        }
-
-        match (true) {
-            $type === CategoryType::Income => $default->income_category_id = $key,
-            $type === CategoryType::Expense => $default->expense_category_id = $key,
-        };
-    }
 }

app/Livewire/Company/Service/ConnectedAccount/ListInstitutions.php

@@ -4,10 +4,12 @@ namespace App\Livewire\Company\Service\ConnectedAccount;
 
 use App\Events\PlaidSuccess;
 use App\Events\StartTransactionImport;
+use App\Models\Accounting\Account;
 use App\Models\Banking\BankAccount;
 use App\Models\Banking\ConnectedBankAccount;
 use App\Models\Banking\Institution;
 use App\Models\User;
+use App\Services\AccountService;
 use App\Services\PlaidService;
 use Filament\Actions\Action;
 use Filament\Actions\Concerns\InteractsWithActions;
@@ -36,13 +38,16 @@ class ListInstitutions extends Component implements HasActions, HasForms
 
     protected PlaidService $plaidService;
 
+    protected AccountService $accountService;
+
     public User $user;
 
     public string $modalWidth;
 
-    public function boot(PlaidService $plaidService): void
+    public function boot(PlaidService $plaidService, AccountService $accountService): void
     {
         $this->plaidService = $plaidService;
+        $this->accountService = $accountService;
     }
 
     public function mount(): void
@@ -57,6 +62,15 @@ class ListInstitutions extends Component implements HasActions, HasForms
             ->get();
     }
 
+    public function getAccountBalance(Account $account): ?string
+    {
+        $company = $account->company;
+        $startDate = $company->locale->fiscalYearStartDate();
+        $endDate = $company->locale->fiscalYearEndDate();
+
+        return $this->accountService->getEndingBalance($account, $startDate, $endDate)?->formatted();
+    }
+
     public function startImportingTransactions(): Action
     {
         return Action::make('startImportingTransactions')

app/Models/Accounting/Account.php

@@ -2,10 +2,8 @@
 
 namespace App\Models\Accounting;
 
-use App\Casts\MoneyCast;
 use App\Enums\Accounting\AccountCategory;
 use App\Enums\Accounting\AccountType;
-use App\Models\Setting\Category;
 use App\Models\Setting\Currency;
 use App\Observers\AccountObserver;
 use App\Traits\Blamable;
@@ -17,7 +15,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\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Wallo\FilamentCompanies\FilamentCompanies;
 
@@ -39,11 +36,6 @@ class Account extends Model
         'code',
         'name',
         'currency_code',
-        'starting_balance',
-        'debit_balance',
-        'credit_balance',
-        'net_movement',
-        'ending_balance',
         'description',
         'active',
         'default',
@@ -56,11 +48,6 @@ class Account extends Model
     protected $casts = [
         'category' => AccountCategory::class,
         'type' => AccountType::class,
-        'starting_balance' => MoneyCast::class,
-        'debit_balance' => MoneyCast::class,
-        'credit_balance' => MoneyCast::class,
-        'net_movement' => MoneyCast::class,
-        'ending_balance' => MoneyCast::class,
         'active' => 'boolean',
         'default' => 'boolean',
     ];
@@ -70,11 +57,6 @@ class Account extends Model
         return $this->belongsTo(FilamentCompanies::companyModel(), 'company_id');
     }
 
-    public function categories(): HasMany
-    {
-        return $this->hasMany(Category::class, 'account_id');
-    }
-
     public function subtype(): BelongsTo
     {
         return $this->belongsTo(AccountSubtype::class, 'subtype_id');
@@ -111,16 +93,9 @@ class Account extends Model
         return $this->morphTo();
     }
 
-    public function transactions(): HasManyThrough
+    public function transactions(): HasMany
     {
-        return $this->hasManyThrough(
-            Transaction::class,
-            JournalEntry::class,
-            'account_id',
-            'id',
-            'id',
-            'transaction_id',
-        );
+        return $this->hasMany(Transaction::class, 'account_id');
     }
 
     public function journalEntries(): HasMany

app/Models/Accounting/Transaction.php

@@ -5,7 +5,6 @@ namespace App\Models\Accounting;
 use App\Casts\MoneyCast;
 use App\Models\Banking\BankAccount;
 use App\Models\Common\Contact;
-use App\Models\Setting\Category;
 use App\Observers\TransactionObserver;
 use App\Traits\Blamable;
 use App\Traits\CompanyOwned;
@@ -27,8 +26,8 @@ class Transaction extends Model
 
     protected $fillable = [
         'company_id',
-        'category_id',
-        'bank_account_id', // 'account_id' => 'bank_account_id'
+        'account_id', // Account from Chart of Accounts (Income/Expense accounts)
+        'bank_account_id', // Cash or Bank Account
         'contact_id',
         'type',
         'method',
@@ -56,9 +55,14 @@ class Transaction extends Model
         return $this->belongsTo(FilamentCompanies::companyModel(), 'company_id');
     }
 
-    public function category(): BelongsTo
+    public function account(): BelongsTo
     {
-        return $this->belongsTo(Category::class, 'category_id');
+        return $this->belongsTo(Account::class, 'account_id');
+    }
+
+    public function bankAccount(): BelongsTo
+    {
+        return $this->belongsTo(BankAccount::class, 'bank_account_id');
     }
 
     public function contact(): BelongsTo
@@ -71,11 +75,6 @@ class Transaction extends Model
         return $this->hasMany(JournalEntry::class, 'transaction_id');
     }
 
-    public function bankAccount(): BelongsTo
-    {
-        return $this->belongsTo(BankAccount::class, 'bank_account_id');
-    }
-
     public function createdBy(): BelongsTo
     {
         return $this->belongsTo(FilamentCompanies::userModel(), 'created_by');

app/Models/Banking/ConnectedBankAccount.php

@@ -3,11 +3,13 @@
 namespace App\Models\Banking;
 
 use App\Enums\BankAccountType;
+use App\Models\Accounting\Account;
 use App\Traits\Blamable;
 use App\Traits\CompanyOwned;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasOneThrough;
 use Wallo\FilamentCompanies\FilamentCompanies;
 
 class ConnectedBankAccount extends Model
@@ -61,6 +63,18 @@ class ConnectedBankAccount extends Model
         return $this->belongsTo(BankAccount::class, 'bank_account_id');
     }
 
+    public function account(): HasOneThrough
+    {
+        return $this->hasOneThrough(
+            Account::class,
+            BankAccount::class,
+            'id',
+            'accountable_id',
+            'bank_account_id',
+            'id'
+        );
+    }
+
     protected function maskedNumber(): Attribute
     {
         return Attribute::get(static function (mixed $value, array $attributes): ?string {

app/Models/Company.php

@@ -10,7 +10,6 @@ use App\Models\Common\Contact;
 use App\Models\Core\Department;
 use App\Models\History\AccountHistory;
 use App\Models\Setting\Appearance;
-use App\Models\Setting\Category;
 use App\Models\Setting\CompanyDefault;
 use App\Models\Setting\CompanyProfile;
 use App\Models\Setting\Currency;
@@ -91,11 +90,6 @@ class Company extends FilamentCompaniesCompany implements HasAvatar
         return $this->hasOne(Appearance::class, 'company_id');
     }
 
-    public function categories(): HasMany
-    {
-        return $this->hasMany(Category::class, 'company_id');
-    }
-
     public function accountSubtypes(): HasMany
     {
         return $this->hasMany(AccountSubtype::class, 'company_id');
@@ -153,4 +147,9 @@ class Company extends FilamentCompaniesCompany implements HasAvatar
     {
         return $this->hasMany(Tax::class, 'company_id');
     }
+
+    public function transactions(): HasMany
+    {
+        return $this->hasMany(Accounting\Transaction::class, 'company_id');
+    }
 }

app/Models/Setting/Category.php

@@ -1,79 +0,0 @@
-<?php
-
-namespace App\Models\Setting;
-
-use App\Enums\CategoryType;
-use App\Models\Accounting\Account;
-use App\Traits\Blamable;
-use App\Traits\CompanyOwned;
-use App\Traits\HasDefault;
-use App\Traits\SyncsWithCompanyDefaults;
-use Database\Factories\Setting\CategoryFactory;
-use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasOne;
-use Wallo\FilamentCompanies\FilamentCompanies;
-
-class Category extends Model
-{
-    use Blamable;
-    use CompanyOwned;
-    use HasDefault;
-    use HasFactory;
-    use SyncsWithCompanyDefaults;
-
-    protected $table = 'categories';
-
-    protected $fillable = [
-        'company_id',
-        'account_id',
-        'name',
-        'type',
-        'color',
-        'enabled',
-        'created_by',
-        'updated_by',
-    ];
-
-    protected $casts = [
-        'type' => CategoryType::class,
-        'enabled' => 'boolean',
-    ];
-
-    public function company(): BelongsTo
-    {
-        return $this->belongsTo(FilamentCompanies::companyModel(), 'company_id');
-    }
-
-    public function account(): BelongsTo
-    {
-        return $this->belongsTo(Account::class, 'account_id');
-    }
-
-    public function defaultIncomeCategory(): HasOne
-    {
-        return $this->hasOne(CompanyDefault::class, 'income_category_id');
-    }
-
-    public function defaultExpenseCategory(): HasOne
-    {
-        return $this->hasOne(CompanyDefault::class, 'expense_category_id');
-    }
-
-    public function createdBy(): BelongsTo
-    {
-        return $this->belongsTo(FilamentCompanies::userModel(), 'created_by');
-    }
-
-    public function updatedBy(): BelongsTo
-    {
-        return $this->belongsTo(FilamentCompanies::userModel(), 'updated_by');
-    }
-
-    protected static function newFactory(): Factory
-    {
-        return CategoryFactory::new();
-    }
-}

app/Models/Setting/CompanyDefault.php

@@ -2,7 +2,6 @@
 
 namespace App\Models\Setting;
 
-use App\Enums\CategoryType;
 use App\Enums\DiscountType;
 use App\Enums\TaxType;
 use App\Models\Banking\BankAccount;
@@ -31,8 +30,6 @@ class CompanyDefault extends Model
         'purchase_tax_id',
         'sales_discount_id',
         'purchase_discount_id',
-        'income_category_id',
-        'expense_category_id',
         'created_by',
         'updated_by',
     ];
@@ -76,18 +73,6 @@ class CompanyDefault extends Model
             ->where('type', DiscountType::Purchase);
     }
 
-    public function incomeCategory(): BelongsTo
-    {
-        return $this->belongsTo(Category::class, 'income_category_id', 'id')
-            ->where('type', CategoryType::Income);
-    }
-
-    public function expenseCategory(): BelongsTo
-    {
-        return $this->belongsTo(Category::class, 'expense_category_id', 'id')
-            ->where('type', CategoryType::Expense);
-    }
-
     public function createdBy(): BelongsTo
     {
         return $this->belongsTo(FilamentCompanies::userModel(), 'created_by');

app/Models/Setting/Localization.php

@@ -33,8 +33,8 @@ class Localization extends Model
         'timezone',
         'date_format',
         'time_format',
-        'fiscal_year_start',
-        'fiscal_year_end',
+        'fiscal_year_end_month',
+        'fiscal_year_end_day',
         'week_start',
         'number_format',
         'percent_first',
@@ -45,8 +45,8 @@ class Localization extends Model
     protected $casts = [
         'date_format' => DateFormat::class,
         'time_format' => TimeFormat::class,
-        'fiscal_year_start' => 'date',
-        'fiscal_year_end' => 'date',
+        'fiscal_year_end_month' => 'integer',
+        'fiscal_year_end_day' => 'integer',
         'week_start' => WeekStart::class,
         'number_format' => NumberFormat::class,
     ];
@@ -98,6 +98,23 @@ class Localization extends Model
         return strpos($formattedPercent, '%') < strpos($formattedPercent, $test);
     }
 
+    public function fiscalYearStartDate(): string
+    {
+        return Carbon::parse($this->fiscalYearEndDate())->subYear()->addDay()->toDateString();
+    }
+
+    public function fiscalYearEndDate(): string
+    {
+        $today = now();
+        $fiscalYearEndThisYear = Carbon::createFromDate($today->year, $this->fiscal_year_end_month, $this->fiscal_year_end_day);
+
+        if ($today->gt($fiscalYearEndThisYear)) {
+            return $fiscalYearEndThisYear->copy()->addYear()->toDateString();
+        }
+
+        return $fiscalYearEndThisYear->toDateString();
+    }
+
     public function getDateTimeFormatAttribute(): string
     {
         return $this->date_format . ' ' . $this->time_format;

app/Observers/JournalEntryObserver.php

@@ -2,7 +2,6 @@
 
 namespace App\Observers;
 
-use App\Enums\Accounting\AccountCategory;
 use App\Models\Accounting\Account;
 use App\Models\Accounting\JournalEntry;
 
@@ -13,60 +12,13 @@ class JournalEntryObserver
      */
     public function created(JournalEntry $journalEntry): void
     {
-        $account = $journalEntry->account;
-
-        $amount = $this->cleanAmount($journalEntry->amount);
-
-        if ($account) {
-            $this->adjustBalance($account, $journalEntry->type, $amount);
-        }
-    }
-
-    private function cleanAmount($amount): string
-    {
-        return str_replace(',', '', $amount);
-    }
-
-    private function adjustBalance(Account $account, $type, $amount): void
-    {
-        $debitBalance = $this->cleanAmount($account->debit_balance);
-        $creditBalance = $this->cleanAmount($account->credit_balance);
-
-        if ($type === 'debit') {
-            $account->debit_balance = bcadd($debitBalance, $amount, 2);
-        } elseif ($type === 'credit') {
-            $account->credit_balance = bcadd($creditBalance, $amount, 2);
-        }
-
-        $this->updateNetMovement($account);
-        $this->updateEndingBalance($account);
+        //
     }
 
-    private function updateNetMovement(Account $account): void
-    {
-        $debitBalance = $this->cleanAmount($account->debit_balance);
-        $creditBalance = $this->cleanAmount($account->credit_balance);
-
-        $netMovementStrategy = match ($account->category) {
-            AccountCategory::Asset, AccountCategory::Expense => bcsub($debitBalance, $creditBalance, 2),
-            AccountCategory::Liability, AccountCategory::Equity, AccountCategory::Revenue => bcsub($creditBalance, $debitBalance, 2),
-        };
-
-        $account->net_movement = $netMovementStrategy;
-
-        $account->save();
-    }
 
     private function updateEndingBalance(Account $account): void
     {
-        $startingBalance = $this->cleanAmount($account->starting_balance);
-        $netMovement = $this->cleanAmount($account->net_movement);
-
-        if (in_array($account->category, [AccountCategory::Asset, AccountCategory::Liability, AccountCategory::Equity], true)) {
-            $account->ending_balance = bcadd($startingBalance, $netMovement, 2);
-        }
-
-        $account->save();
+        //
     }
 
     /**
@@ -74,13 +26,7 @@ class JournalEntryObserver
      */
     public function deleting(JournalEntry $journalEntry): void
     {
-        $account = $journalEntry->account;
-
-        if ($account) {
-            $amount = $this->cleanAmount($journalEntry->amount);
-
-            $this->adjustBalance($account, $journalEntry->type, -$amount);
-        }
+        //
     }
 
     /**

app/Observers/TransactionObserver.php

@@ -2,6 +2,7 @@
 
 namespace App\Observers;
 
+use App\Models\Accounting\Account;
 use App\Models\Accounting\JournalEntry;
 use App\Models\Accounting\Transaction;
 use Illuminate\Support\Facades\DB;
@@ -13,7 +14,32 @@ class TransactionObserver
      */
     public function created(Transaction $transaction): void
     {
-        //
+        $chartAccount = $transaction->account;
+        $bankAccount = $transaction->bankAccount->account;
+
+        $debitAccount = $transaction->type === 'expense' ? $chartAccount : $bankAccount;
+        $creditAccount = $transaction->type === 'expense' ? $bankAccount : $chartAccount;
+
+        $this->createJournalEntries($transaction, $debitAccount, $creditAccount);
+    }
+
+    private function createJournalEntries(Transaction $transaction, Account $debitAccount, Account $creditAccount): void
+    {
+        $debitAccount->journalEntries()->create([
+            'company_id' => $transaction->company_id,
+            'transaction_id' => $transaction->id,
+            'type' => 'debit',
+            'amount' => $transaction->amount,
+            'description' => $transaction->description,
+        ]);
+
+        $creditAccount->journalEntries()->create([
+            'company_id' => $transaction->company_id,
+            'transaction_id' => $transaction->id,
+            'type' => 'credit',
+            'amount' => $transaction->amount,
+            'description' => $transaction->description,
+        ]);
     }
 
     /**
@@ -21,7 +47,36 @@ class TransactionObserver
      */
     public function updated(Transaction $transaction): void
     {
-        //
+        $changes = $transaction->getChanges();
+
+        $relevantChanges = array_intersect_key($changes, array_flip(['amount', 'description', 'account_id', 'bank_account_id', 'type']));
+
+        if (empty($relevantChanges)) {
+            return;
+        }
+
+        $chartAccount = $transaction->account;
+        $bankAccount = $transaction->bankAccount->account;
+
+        $journalEntries = $transaction->journalEntries;
+
+        $debitEntry = $journalEntries->where('type', 'debit')->first();
+        $creditEntry = $journalEntries->where('type', 'credit')->first();
+
+        $debitAccount = $transaction->type === 'expense' ? $chartAccount : $bankAccount;
+        $creditAccount = $transaction->type === 'expense' ? $bankAccount : $chartAccount;
+
+        $debitEntry?->update([
+            'account_id' => $debitAccount->id,
+            'amount' => $transaction->amount,
+            'description' => $transaction->description,
+        ]);
+
+        $creditEntry?->update([
+            'account_id' => $creditAccount->id,
+            'amount' => $transaction->amount,
+            'description' => $transaction->description,
+        ]);
     }
 
     /**

app/Providers/AuthServiceProvider.php

@@ -36,7 +36,6 @@ class AuthServiceProvider extends ServiceProvider
     {
         $models = [
             Setting\Currency::class,
-            Setting\Category::class,
             Setting\Discount::class,
             Setting\Tax::class,
             Banking\BankAccount::class,

app/Providers/Filament/AdminPanelProvider.php

@@ -2,8 +2,8 @@
 
 namespace App\Providers\Filament;
 
+use App\Http\Middleware\Authenticate;
 use Exception;
-use Filament\Http\Middleware\Authenticate;
 use Filament\Http\Middleware\DisableBladeIconComponents;
 use Filament\Http\Middleware\DispatchServingFilamentEvent;
 use Filament\Pages;
@@ -29,7 +29,6 @@ class AdminPanelProvider extends PanelProvider
         return $panel
             ->id('admin')
             ->path('admin')
-            ->login()
             ->colors([
                 'primary' => Color::Amber,
             ])

app/Repositories/Accounting/AccountSubtypeRepository.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Repositories\Accounting;
+
+use App\Enums\BankAccountType;
+use App\Models\Accounting\AccountSubtype;
+use App\Models\Company;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class AccountSubtypeRepository
+{
+    public function getDefaultAccountSubtypeByType(BankAccountType $type): string
+    {
+        return match ($type) {
+            BankAccountType::Depository => 'Cash and Cash Equivalents',
+            BankAccountType::Credit => 'Short-Term Borrowings',
+            BankAccountType::Loan => 'Long-Term Borrowings',
+            BankAccountType::Investment => 'Long-Term Investments',
+            BankAccountType::Other => 'Other Current Assets',
+        };
+    }
+
+    public function findAccountSubtypeByNameOrFail(Company $company, $name): AccountSubtype
+    {
+        $accountSubtype = $company->accountSubtypes()
+            ->where('name', $name)
+            ->first();
+
+        if ($accountSubtype === null) {
+            throw new ModelNotFoundException("Account subtype '{$accountSubtype}' not found for company '{$company->name}'");
+        }
+
+        return $accountSubtype;
+    }
+}

app/Repositories/Accounting/JournalEntryRepository.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Repositories\Accounting;
+
+use App\Models\Accounting\Account;
+
+class JournalEntryRepository
+{
+    public function sumAmounts(Account $account, string $type, ?string $startDate = null, ?string $endDate = null): int
+    {
+        $query = $account->journalEntries()->where('type', $type);
+
+        if ($startDate && $endDate) {
+            $query->whereHas('transaction', static function ($query) use ($startDate, $endDate) {
+                $query->whereBetween('posted_at', [$startDate, $endDate]);
+            });
+        } elseif ($startDate) {
+            $query->whereHas('transaction', static function ($query) use ($startDate) {
+                $query->where('posted_at', '<', $startDate);
+            });
+        }
+
+        return $query->sum('amount');
+    }
+
+    public function sumDebitAmounts(Account $account, string $startDate, ?string $endDate = null): int
+    {
+        return $this->sumAmounts($account, 'debit', $startDate, $endDate);
+    }
+
+    public function sumCreditAmounts(Account $account, string $startDate, ?string $endDate = null): int
+    {
+        return $this->sumAmounts($account, 'credit', $startDate, $endDate);
+    }
+}

app/Repositories/Banking/ConnectedBankAccountRepository.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Repositories\Banking;
+
+use App\Models\Accounting\Account;
+use App\Models\Accounting\AccountSubtype;
+use App\Models\Banking\BankAccount;
+use App\Models\Banking\ConnectedBankAccount;
+use App\Models\Company;
+
+class ConnectedBankAccountRepository
+{
+    public function createBankAccountForConnectedBankAccount(Company $company, ConnectedBankAccount $connectedBankAccount)
+    {
+        return $connectedBankAccount->bankAccount()->create([
+            'company_id' => $company->id,
+            'institution_id' => $connectedBankAccount->institution_id,
+            'type' => $connectedBankAccount->type,
+            'number' => $connectedBankAccount->mask,
+            'enabled' => BankAccount::where('company_id', $company->id)->where('enabled', true)->doesntExist(),
+        ]);
+    }
+
+    public function createAccountForConnectedBankAccount(Company $company, ConnectedBankAccount $connectedBankAccount, BankAccount $bankAccount, AccountSubtype $accountSubtype): Account
+    {
+        return $bankAccount->account()->create([
+            'company_id' => $company->id,
+            'name' => $connectedBankAccount->name,
+            'currency_code' => $connectedBankAccount->currency_code,
+            'description' => $connectedBankAccount->name,
+            'subtype_id' => $accountSubtype->id,
+            'active' => true,
+        ]);
+    }
+}

app/Repositories/Setting/CurrencyRepository.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Repositories\Setting;
+
+use App\Models\Company;
+use App\Models\Setting\Currency;
+
+class CurrencyRepository
+{
+    public function ensureCurrencyExists(Company $company, string $currencyCode): Currency
+    {
+        $hasDefaultCurrency = $this->hasDefaultCurrency($company);
+
+        $currency = currency($currencyCode);
+
+        return $company->currencies()
+            ->firstOrCreate([
+                'code' => $currencyCode,
+            ], [
+                'name' => $currency->getName(),
+                'rate' => $currency->getRate(),
+                'precision' => $currency->getPrecision(),
+                'symbol' => $currency->getSymbol(),
+                'symbol_first' => $currency->isSymbolFirst(),
+                'decimal_mark' => $currency->getDecimalMark(),
+                'thousands_separator' => $currency->getThousandsSeparator(),
+                'enabled' => ! $hasDefaultCurrency,
+            ]);
+    }
+
+    public function getDefaultCurrency(Company $company): ?Currency
+    {
+        return $company->currencies()
+            ->where('enabled', true)
+            ->first();
+    }
+
+    public function hasDefaultCurrency(Company $company): bool
+    {
+        return $this->getDefaultCurrency($company) !== null;
+    }
+}

app/Services/AccountBalancesExportService.php

@@ -0,0 +1,76 @@
+<?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

@@ -2,89 +2,210 @@
 
 namespace App\Services;
 
+use Akaunting\Money\Money;
+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\Banking\BankAccount;
-use App\Models\Banking\ConnectedBankAccount;
-use App\Models\Company;
-use App\Models\Setting\Currency;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
+use App\Models\Accounting\Transaction;
+use App\Repositories\Accounting\JournalEntryRepository;
+use App\ValueObjects\BalanceValue;
+use Illuminate\Database\Eloquent\Collection;
 
 class AccountService
 {
-    public function getOrProcessAccount(BankAccount $bankAccount, Company $company, ConnectedBankAccount $connectedBankAccount): Account
+    protected JournalEntryRepository $journalEntryRepository;
+
+    public function __construct(JournalEntryRepository $journalEntryRepository)
     {
-        if ($bankAccount->account()->doesntExist()) {
-            return $this->processNewAccount($bankAccount, $company, $connectedBankAccount);
-        }
+        $this->journalEntryRepository = $journalEntryRepository;
+    }
+
+    public function getDebitBalance(Account $account, string $startDate, string $endDate): BalanceValue
+    {
+        $amount = $this->journalEntryRepository->sumDebitAmounts($account, $startDate, $endDate);
+
+        return new BalanceValue($amount, $account->currency_code ?? 'USD');
+    }
+
+    public function getCreditBalance(Account $account, string $startDate, string $endDate): BalanceValue
+    {
+        $amount = $this->journalEntryRepository->sumCreditAmounts($account, $startDate, $endDate);
 
-        return $bankAccount->account;
+        return new BalanceValue($amount, $account->currency_code ?? 'USD');
     }
 
-    public function processNewAccount(BankAccount $bankAccount, Company $company, ConnectedBankAccount $connectedBankAccount): Account
+    public function getNetMovement(Account $account, string $startDate, string $endDate): BalanceValue
     {
-        $currencyCode = $connectedBankAccount->currency_code ?? 'USD';
+        $debitBalance = $this->getDebitBalance($account, $startDate, $endDate)->getValue();
+        $creditBalance = $this->getCreditBalance($account, $startDate, $endDate)->getValue();
+        $netMovement = $this->calculateNetMovementByCategory($account->category, $debitBalance, $creditBalance);
 
-        $currency = $this->ensureCurrencyExists($company, $currencyCode);
+        return new BalanceValue($netMovement, $account->currency_code ?? 'USD');
+    }
 
-        $accountSubtype = $this->getAccountSubtype($bankAccount->type->value);
+    public function getStartingBalance(Account $account, string $startDate): ?BalanceValue
+    {
+        if (in_array($account->category, [AccountCategory::Expense, AccountCategory::Revenue], true)) {
+            return null;
+        }
 
-        $accountSubtypeId = $this->resolveAccountSubtypeId($company, $accountSubtype);
+        $debitBalanceBefore = $this->journalEntryRepository->sumDebitAmounts($account, $startDate);
+        $creditBalanceBefore = $this->journalEntryRepository->sumCreditAmounts($account, $startDate);
+        $startingBalance = $this->calculateNetMovementByCategory($account->category, $debitBalanceBefore, $creditBalanceBefore);
 
-        return $bankAccount->account()->create([
-            'company_id' => $company->id,
-            'name' => $connectedBankAccount->name,
-            'currency_code' => $currency->code,
-            'description' => $connectedBankAccount->name,
-            'subtype_id' => $accountSubtypeId,
-            'active' => true,
-        ]);
+        return new BalanceValue($startingBalance, $account->currency_code ?? 'USD');
     }
 
-    protected function ensureCurrencyExists(Company $company, string $currencyCode): Currency
+    public function getEndingBalance(Account $account, string $startDate, string $endDate): ?BalanceValue
     {
-        $currencyRelationship = $company->currencies();
-
-        $defaultCurrency = $currencyRelationship->firstWhere('enabled', true);
-
-        $hasDefaultCurrency = $defaultCurrency !== null;
-
-        $currency_code = currency($currencyCode);
-
-        return $currencyRelationship->firstOrCreate([
-            'code' => $currencyCode,
-        ], [
-            'name' => $currency_code->getName(),
-            'rate' => $currency_code->getRate(),
-            'precision' => $currency_code->getPrecision(),
-            'symbol' => $currency_code->getSymbol(),
-            'symbol_first' => $currency_code->isSymbolFirst(),
-            'decimal_mark' => $currency_code->getDecimalMark(),
-            'thousands_separator' => $currency_code->getThousandsSeparator(),
-            'enabled' => ! $hasDefaultCurrency,
-        ]);
+        if (in_array($account->category, [AccountCategory::Expense, AccountCategory::Revenue], true)) {
+            return null;
+        }
+
+        $startingBalance = $this->getStartingBalance($account, $startDate)?->getValue();
+        $netMovement = $this->getNetMovement($account, $startDate, $endDate)->getValue();
+        $endingBalance = $startingBalance + $netMovement;
+
+        return new BalanceValue($endingBalance, $account->currency_code ?? 'USD');
     }
 
-    protected function getAccountSubtype(string $plaidType): string
+    public function calculateNetMovementByCategory(AccountCategory $category, int $debitBalance, int $creditBalance): int
     {
-        return match ($plaidType) {
-            'depository' => 'Cash and Cash Equivalents',
-            'credit' => 'Short-Term Borrowings',
-            'loan' => 'Long-Term Borrowings',
-            'investment' => 'Long-Term Investments',
-            'other' => 'Other Current Assets',
+        return match ($category) {
+            AccountCategory::Asset, AccountCategory::Expense => $debitBalance - $creditBalance,
+            AccountCategory::Liability, AccountCategory::Equity, AccountCategory::Revenue => $creditBalance - $debitBalance,
         };
     }
 
-    protected function resolveAccountSubtypeId(Company $company, string $accountSubtype): int
+    public function getBalances(Account $account, string $startDate, string $endDate): array
+    {
+        $debitBalance = $this->getDebitBalance($account, $startDate, $endDate)->getValue();
+        $creditBalance = $this->getCreditBalance($account, $startDate, $endDate)->getValue();
+        $netMovement = $this->getNetMovement($account, $startDate, $endDate)->getValue();
+
+        $balances = [
+            'debit_balance' => $debitBalance,
+            'credit_balance' => $creditBalance,
+            'net_movement' => $netMovement,
+        ];
+
+        if (! in_array($account->category, [AccountCategory::Expense, AccountCategory::Revenue], true)) {
+            $balances['starting_balance'] = $this->getStartingBalance($account, $startDate)?->getValue();
+            $balances['ending_balance'] = $this->getEndingBalance($account, $startDate, $endDate)?->getValue();
+        }
+
+        return $balances;
+    }
+
+    public function getBalancesFormatted(Account $account, string $startDate, string $endDate): AccountBalanceDTO
     {
-        $accountSubtypeId = $company->accountSubtypes()
-            ->where('name', $accountSubtype)
-            ->value('id');
+        $balances = $this->getBalances($account, $startDate, $endDate);
+        $currency = $account->currency_code ?? 'USD';
+
+        return $this->formatBalances($balances, $currency);
+    }
+
+    public function formatBalances(array $balances, string $currency): AccountBalanceDTO
+    {
+        foreach ($balances as $key => $balance) {
+            $balances[$key] = Money::{$currency}($balance)->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,
+        );
+    }
 
-        if ($accountSubtypeId === null) {
-            throw new ModelNotFoundException("Account subtype '{$accountSubtype}' not found for company '{$company->name}'");
+    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) {
+                $accountBalances = $this->getBalances($account, $startDate, $endDate);
+
+                if (array_sum($accountBalances) === 0) {
+                    continue;
+                }
+
+                foreach ($accountBalances as $accountBalanceType => $accountBalance) {
+                    $categorySummaryBalances[$accountBalanceType] += $accountBalance;
+                }
+
+                $formattedAccountBalances = $this->formatBalances($accountBalances, $account->currency_code ?? 'USD');
+
+                $categoryAccounts[] = new AccountDTO(
+                    $account->name,
+                    $account->code,
+                    $formattedAccountBalances,
+                );
+            }
+
+            $reportTotalBalances['debit_balance'] += $categorySummaryBalances['debit_balance'];
+            $reportTotalBalances['credit_balance'] += $categorySummaryBalances['credit_balance'];
+
+            $formattedCategorySummaryBalances = $this->formatBalances($categorySummaryBalances, $accountsInCategory->first()->currency_code ?? 'USD');
+
+            $accountCategories[$categoryName] = new AccountCategoryDTO(
+                $categoryAccounts,
+                $formattedCategorySummaryBalances,
+            );
         }
 
-        return $accountSubtypeId;
+        $formattedReportTotalBalances = $this->formatBalances($reportTotalBalances, 'USD');
+
+        return new AccountBalanceReportDTO($accountCategories, $formattedReportTotalBalances);
+    }
+
+    public function getAccountCategoryOrder(): array
+    {
+        return [
+            AccountCategory::Asset->getPluralLabel(),
+            AccountCategory::Liability->getPluralLabel(),
+            AccountCategory::Equity->getPluralLabel(),
+            AccountCategory::Revenue->getPluralLabel(),
+            AccountCategory::Expense->getPluralLabel(),
+        ];
+    }
+
+    public function getEarliestTransactionDate(): string
+    {
+        $earliestDate = Transaction::oldest('posted_at')
+            ->value('posted_at');
+
+        return $earliestDate ?? now()->format('Y-m-d');
     }
 }

app/Services/BankAccountService.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Services;
-
-use App\Models\Banking\BankAccount;
-use App\Models\Banking\ConnectedBankAccount;
-use App\Models\Company;
-
-class BankAccountService
-{
-    public function getOrProcessBankAccount(Company $company, ConnectedBankAccount $connectedBankAccount, int | string $selectedBankAccountId): BankAccount
-    {
-        if ($selectedBankAccountId === 'new') {
-            return $this->processNewBankAccount($company, $connectedBankAccount);
-        }
-
-        return $company->bankAccounts()->find($selectedBankAccountId);
-    }
-
-    protected function processNewBankAccount(Company $company, ConnectedBankAccount $connectedBankAccount): BankAccount
-    {
-        return $connectedBankAccount->bankAccount()->create([
-            'company_id' => $company->id,
-            'institution_id' => $connectedBankAccount->institution_id,
-            'type' => $connectedBankAccount->type,
-            'number' => $connectedBankAccount->mask,
-            'enabled' => BankAccount::where('company_id', $company->id)->where('enabled', true)->doesntExist(),
-        ]);
-    }
-}

app/Services/CompanyDefaultService.php

@@ -2,10 +2,8 @@
 
 namespace App\Services;
 
-use App\Enums\CategoryType;
 use App\Models\Company;
 use App\Models\Setting\Appearance;
-use App\Models\Setting\Category;
 use App\Models\Setting\Currency;
 use App\Models\Setting\Discount;
 use App\Models\Setting\DocumentDefault;
@@ -19,7 +17,6 @@ class CompanyDefaultService
     public function createCompanyDefaults(Company $company, User $user, string $currencyCode, string $countryCode, string $language): void
     {
         DB::transaction(function () use ($company, $user, $currencyCode, $countryCode, $language) {
-            $this->createCategories($company, $user);
             $this->createCurrency($company, $user, $currencyCode);
             $this->createSalesTax($company, $user);
             $this->createPurchaseTax($company, $user);
@@ -31,48 +28,6 @@ class CompanyDefaultService
         }, 5);
     }
 
-    private function createCategories(Company $company, User $user): void
-    {
-        $incomeCategories = ['Dividends', 'Interest Earned', 'Wages', 'Sales', 'Other Income'];
-        $expenseCategories = ['Rent or Mortgage', 'Utilities', 'Groceries', 'Transportation', 'Other Expense'];
-        $otherCategories = ['Transfer', 'Other'];
-
-        $defaultIncomeCategory = 'Sales';
-        $defaultExpenseCategory = 'Rent or Mortgage';
-
-        $this->createCategory($company, $user, $defaultIncomeCategory, CategoryType::Income, true);
-        $this->createCategory($company, $user, $defaultExpenseCategory, CategoryType::Expense, true);
-
-        foreach ($incomeCategories as $incomeCategory) {
-            if ($incomeCategory !== $defaultIncomeCategory) {
-                $this->createCategory($company, $user, $incomeCategory, CategoryType::Income);
-            }
-        }
-
-        foreach ($expenseCategories as $expenseCategory) {
-            if ($expenseCategory !== $defaultExpenseCategory) {
-                $this->createCategory($company, $user, $expenseCategory, CategoryType::Expense);
-            }
-        }
-
-        foreach ($otherCategories as $otherCategory) {
-            $this->createCategory($company, $user, $otherCategory, CategoryType::Other);
-        }
-
-    }
-
-    private function createCategory(Company $company, User $user, string $name, CategoryType $type, bool $enabled = false): void
-    {
-        Category::factory()->create([
-            'company_id' => $company->id,
-            'name' => $name,
-            'type' => $type,
-            'enabled' => $enabled,
-            'created_by' => $user->id,
-            'updated_by' => $user->id,
-        ]);
-    }
-
     private function createCurrency(Company $company, User $user, string $currencyCode): void
     {
         Currency::factory()->forCurrency($currencyCode)->create([

app/Services/ConnectedBankAccountService.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\Accounting\Account;
+use App\Models\Banking\BankAccount;
+use App\Models\Banking\ConnectedBankAccount;
+use App\Models\Company;
+use App\Repositories\Accounting\AccountSubtypeRepository;
+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 getOrProcessBankAccountForConnectedBankAccount(Company $company, ConnectedBankAccount $connectedBankAccount, int | string $selectedBankAccountId): BankAccount
+    {
+        if ($selectedBankAccountId === 'new') {
+            return $this->connectedBankAccountRepository->createBankAccountForConnectedBankAccount($company, $connectedBankAccount);
+        }
+
+        return $company->bankAccounts()->find($selectedBankAccountId);
+    }
+
+    public function getOrProcessAccountForConnectedBankAccount(BankAccount $bankAccount, Company $company, ConnectedBankAccount $connectedBankAccount): Account
+    {
+        if ($bankAccount->account()->doesntExist()) {
+            return $this->processNewAccountForBank($bankAccount, $company, $connectedBankAccount);
+        }
+
+        return $bankAccount->account;
+    }
+
+    public function processNewAccountForBank(BankAccount $bankAccount, Company $company, ConnectedBankAccount $connectedBankAccount): Account
+    {
+        $defaultAccountSubtypeName = $this->accountSubtypeRepository->getDefaultAccountSubtypeByType($bankAccount->type);
+
+        $accountSubtype = $this->accountSubtypeRepository->findAccountSubtypeByNameOrFail($company, $defaultAccountSubtypeName);
+
+        return $this->connectedBankAccountRepository->createAccountForConnectedBankAccount($company, $connectedBankAccount, $bankAccount, $accountSubtype);
+    }
+}

app/Services/CurrencyService.php

@@ -76,19 +76,31 @@ class CurrencyService implements CurrencyHandler
         $filteredCurrencies = array_keys($filteredRates);
         $missingCurrencies = array_diff($targetCurrencies, $filteredCurrencies);
 
-        return filled($missingCurrencies) ? null : $filteredRates;
+        if (filled($missingCurrencies)) {
+            return null;
+        }
+
+        return $filteredRates;
     }
 
     public function getCachedExchangeRates(string $baseCurrency, array $targetCurrencies): ?array
     {
-        return $this->isEnabled() ? $this->getExchangeRates($baseCurrency, $targetCurrencies) : null;
+        if ($this->isEnabled()) {
+            return $this->getExchangeRates($baseCurrency, $targetCurrencies);
+        }
+
+        return null;
     }
 
     public function getCachedExchangeRate(string $baseCurrency, string $targetCurrency): ?float
     {
         $rates = $this->getCachedExchangeRates($baseCurrency, [$targetCurrency]);
 
-        return isset($rates[$targetCurrency]) ? (float) $rates[$targetCurrency] : null;
+        if (isset($rates[$targetCurrency])) {
+            return (float) $rates[$targetCurrency];
+        }
+
+        return null;
     }
 
     public function updateCurrencyRatesCache(string $baseCurrency): ?array

app/Services/PlaidService.php

@@ -163,22 +163,6 @@ class PlaidService
         return 'US';
     }
 
-    public function createSandboxPublicToken(): object
-    {
-        return $this->createPublicToken('ins_109508', ['auth']);
-    }
-
-    public function createPublicToken(string $institution_id, array $initial_products, array $options = []): object
-    {
-        $data = [
-            'institution_id' => $institution_id,
-            'initial_products' => $initial_products,
-            'options' => (object) $options,
-        ];
-
-        return $this->sendRequest('sandbox/public_token/create', $data);
-    }
-
     public function createToken(string $language, string $country, array $user, array $products = []): object
     {
         $plaidLanguage = $this->getLanguage($language);
@@ -227,21 +211,6 @@ class PlaidService
         return $this->sendRequest('accounts/get', $data);
     }
 
-    public function getAuth($access_token): object
-    {
-        return $this->authGet($access_token);
-    }
-
-    public function authGet(string $access_token, array $options = []): object
-    {
-        $data = [
-            'access_token' => $access_token,
-            'options' => (object) $options,
-        ];
-
-        return $this->sendRequest('auth/get', $data);
-    }
-
     public function getInstitution(string $institution_id, string $country): object
     {
         $options = [
@@ -253,18 +222,6 @@ class PlaidService
         return $this->getInstitutionById($institution_id, [$plaidCountry], $options);
     }
 
-    public function getInstitutions(int $count, int $offset, array $country_codes, array $options = []): object
-    {
-        $data = [
-            'count' => $count,
-            'offset' => $offset,
-            'country_codes' => $country_codes,
-            'options' => (object) $options,
-        ];
-
-        return $this->sendRequest('institutions/get', $data);
-    }
-
     public function getInstitutionById(string $institution_id, array $country_codes, array $options = []): object
     {
         $data = [
@@ -276,21 +233,6 @@ class PlaidService
         return $this->sendRequest('institutions/get_by_id', $data);
     }
 
-    public function syncTransactions(string $access_token, ?string $cursor = null, int $count = 100, array $options = []): object
-    {
-        $data = [
-            'access_token' => $access_token,
-            'count' => $count,
-            'options' => (object) $options,
-        ];
-
-        if ($cursor !== null) {
-            $data['cursor'] = $cursor;
-        }
-
-        return $this->sendRequest('transactions/sync', $data);
-    }
-
     public function getTransactions(string $access_token, string $start_date, string $end_date, array $options = []): object
     {
         $data = [

app/Services/TransactionService.php

@@ -6,15 +6,14 @@ use App\Enums\Accounting\AccountCategory;
 use App\Enums\Accounting\AccountType;
 use App\Models\Accounting\Account;
 use App\Models\Accounting\Transaction;
-use App\Models\Banking\ConnectedBankAccount;
+use App\Models\Banking\BankAccount;
 use App\Models\Company;
-use App\Models\Setting\Category;
 use App\Scopes\CurrentCompanyScope;
 use Illuminate\Support\Carbon;
 
 class TransactionService
 {
-    public function createStartingBalanceIfNeeded(Company $company, Account $account, ConnectedBankAccount $connectedBankAccount, array $transactions, float $currentBalance, string $startDate): void
+    public function createStartingBalanceIfNeeded(Company $company, Account $account, BankAccount $bankAccount, array $transactions, float $currentBalance, string $startDate): void
     {
         if ($account->transactions()->withoutGlobalScope(CurrentCompanyScope::class)->doesntExist()) {
             $accountSign = $account->category === AccountCategory::Asset ? 1 : -1;
@@ -27,112 +26,86 @@ class TransactionService
 
             $startingBalance = bcsub($adjustedBalance, $sumOfTransactions, 2);
 
-            $this->createStartingBalanceTransaction($company, $account, $connectedBankAccount, (float) $startingBalance, $startDate);
+            $this->createStartingBalanceTransaction($company, $account, $bankAccount, (float) $startingBalance, $startDate);
         }
     }
 
-    public function storeTransactions(Company $company, Account $account, ConnectedBankAccount $connectedBankAccount, array $transactions): void
+    public function storeTransactions(Company $company, BankAccount $bankAccount, array $transactions): void
     {
         foreach ($transactions as $transaction) {
-            $this->storeTransaction($company, $account, $connectedBankAccount, $transaction);
+            $this->storeTransaction($company, $bankAccount, $transaction);
         }
     }
 
-    public function createStartingBalanceTransaction(Company $company, Account $account, ConnectedBankAccount $connectedBankAccount, float $startingBalance, string $startDate): void
+    public function createStartingBalanceTransaction(Company $company, Account $account, BankAccount $bankAccount, float $startingBalance, string $startDate): void
     {
         [$transactionType, $method] = $startingBalance >= 0 ? ['income', 'deposit'] : ['expense', 'withdrawal'];
-        $category = $this->getUncategorizedCategory($company, $transactionType);
         $chartAccount = $account->where('category', AccountCategory::Equity)->where('name', 'Owner\'s Equity')->first();
+        $postedAt = Carbon::parse($startDate)->subDay()->toDateTimeString();
 
-        $transactionRecord = $account->transactions()->create([
+        Transaction::create([
             'company_id' => $company->id,
-            'category_id' => $category->id,
-            'bank_account_id' => $connectedBankAccount->bank_account_id,
+            'account_id' => $chartAccount->id,
+            'bank_account_id' => $bankAccount->id,
             'type' => $transactionType,
             'amount' => abs($startingBalance),
             'method' => $method,
             'payment_channel' => 'other',
-            'posted_at' => $startDate,
+            'posted_at' => $postedAt,
             'description' => 'Starting Balance',
             'pending' => false,
-            'reviewed' => true,
+            'reviewed' => false,
         ]);
-
-        $this->createJournalEntries($company, $account, $transactionRecord, $chartAccount);
     }
 
-    public function storeTransaction(Company $company, Account $account, ConnectedBankAccount $connectedBankAccount, object $transaction): void
+    public function storeTransaction(Company $company, BankAccount $bankAccount, object $transaction): void
     {
         [$transactionType, $method] = $transaction->amount < 0 ? ['income', 'deposit'] : ['expense', 'withdrawal'];
         $paymentChannel = $transaction->payment_channel;
-        $category = $this->getCategoryFromTransaction($company, $transaction, $transactionType);
-        $chartAccount = $category->account ?? $this->getChartFromTransaction($company, $transactionType);
+        $chartAccount = $this->getAccountFromTransaction($company, $transaction, $transactionType);
         $postedAt = $transaction->datetime ?? Carbon::parse($transaction->date)->toDateTimeString();
         $description = $transaction->name;
 
-        $transactionRecord = $account->transactions()->create([
+        Transaction::create([
             'company_id' => $company->id,
-            'category_id' => $category->id,
-            'bank_account_id' => $connectedBankAccount->bank_account_id,
+            'account_id' => $chartAccount->id,
+            'bank_account_id' => $bankAccount->id,
             'type' => $transactionType,
             'amount' => abs($transaction->amount),
             'method' => $method,
             'payment_channel' => $paymentChannel,
             'posted_at' => $postedAt,
             'description' => $description,
-            'pending' => $transaction->pending,
+            'pending' => false,
             'reviewed' => false,
         ]);
-
-        $this->createJournalEntries($company, $account, $transactionRecord, $chartAccount);
     }
 
-    public function createJournalEntries(Company $company, Account $account, Transaction $transaction, Account $chartAccount): void
+    public function getAccountFromTransaction(Company $company, object $transaction, string $transactionType): Account
     {
-        $debitAccount = $transaction->type === 'expense' ? $chartAccount : $account;
-        $creditAccount = $transaction->type === 'expense' ? $account : $chartAccount;
-
-        $amount = $transaction->amount;
-
-        $debitAccount->journalEntries()->create([
-            'company_id' => $company->id,
-            'transaction_id' => $transaction->id,
-            'type' => 'debit',
-            'amount' => $amount,
-            'description' => $transaction->description,
-        ]);
-
-        $creditAccount->journalEntries()->create([
-            'company_id' => $company->id,
-            'transaction_id' => $transaction->id,
-            'type' => 'credit',
-            'amount' => $amount,
-            'description' => $transaction->description,
-        ]);
-    }
+        $accountCategory = match ($transactionType) {
+            'income' => AccountCategory::Revenue,
+            'expense' => AccountCategory::Expense,
+        };
 
-    public function getCategoryFromTransaction(Company $company, object $transaction, string $transactionType): Category
-    {
-        $companyCategories = $company->categories()
-            ->where('type', $transactionType)
-            ->whereNotIn('name', ['Other Income', 'Other Expense'])
+        $accounts = $company->accounts()
+            ->where('category', $accountCategory)
+            ->whereNotIn('type', [AccountType::UncategorizedRevenue, AccountType::UncategorizedExpense])
             ->get();
 
-        $bestMatchName = $this->findBestCategoryMatch($transaction, $companyCategories->pluck('name')->toArray());
+        $bestMatchName = $this->findBestAccountMatch($transaction, $accounts->pluck('name')->toArray());
 
         if ($bestMatchName === null) {
-            return $this->getUncategorizedCategory($company, $transactionType);
+            return $this->getUncategorizedAccount($company, $transactionType);
         }
 
-        $category = $companyCategories->firstWhere('name', $bestMatchName);
-
-        return $category ?: $this->getUncategorizedCategory($company, $transactionType);
+        return $accounts->firstWhere('name', $bestMatchName) ?: $this->getUncategorizedAccount($company, $transactionType);
     }
 
-    private function findBestCategoryMatch(object $transaction, array $userCategories): ?string
+    private function findBestAccountMatch(object $transaction, array $accountNames): ?string
     {
         $acceptableConfidenceLevels = ['VERY_HIGH', 'HIGH'];
-        $similarityThreshold = 0.7;
+        $similarityThreshold = 70.0;
         $plaidDetail = $transaction->personal_finance_category->detailed ?? null;
         $plaidPrimary = $transaction->personal_finance_category->primary ?? null;
         $bestMatchName = null;
@@ -140,11 +113,15 @@ class TransactionService
 
         foreach ([$plaidDetail, $plaidPrimary] as $plaidCategory) {
             if ($plaidCategory !== null && in_array($transaction->personal_finance_category->confidence_level, $acceptableConfidenceLevels, true)) {
-                $currentMatchPercent = 0.0;
-                $matchedName = $this->closestCategory($plaidCategory, $userCategories, $currentMatchPercent);
-                if ($currentMatchPercent >= $similarityThreshold && $currentMatchPercent > $bestMatchPercent) {
-                    $bestMatchPercent = $currentMatchPercent;
-                    $bestMatchName = $matchedName;
+                foreach ($accountNames as $accountName) {
+                    $normalizedPlaidCategory = strtolower(str_replace('_', ' ', $plaidCategory));
+                    $normalizedAccountName = strtolower(str_replace('_', ' ', $accountName));
+                    $currentMatchPercent = 0.0;
+                    similar_text($normalizedPlaidCategory, $normalizedAccountName, $currentMatchPercent);
+                    if ($currentMatchPercent >= $similarityThreshold && $currentMatchPercent > $bestMatchPercent) {
+                        $bestMatchPercent = $currentMatchPercent;
+                        $bestMatchName = $accountName; // Use and return the original account name for the best match, not the normalized one
+                    }
                 }
             }
         }
@@ -152,50 +129,7 @@ class TransactionService
         return $bestMatchName;
     }
 
-    public function closestCategory(string $input, array $categories, ?float &$percent): ?string
-    {
-        $inputNormalized = strtolower(str_replace('_', ' ', $input));
-        $originalToNormalized = [];
-        foreach ($categories as $originalCategory) {
-            $normalizedCategory = strtolower(str_replace('_', ' ', $originalCategory));
-            $originalToNormalized[$normalizedCategory] = $originalCategory;
-        }
-
-        $shortest = -1;
-        $closestNormalized = null;
-        foreach ($originalToNormalized as $normalizedCategory => $originalCategory) {
-            $lev = levenshtein($inputNormalized, $normalizedCategory);
-            if ($lev === 0 || $lev < $shortest || $shortest < 0) {
-                $closestNormalized = $normalizedCategory;
-                $shortest = $lev;
-            }
-        }
-
-        if ($closestNormalized !== null) {
-            $percent = 1.0 - ($shortest / max(strlen($inputNormalized), strlen($closestNormalized)));
-
-            return $originalToNormalized[$closestNormalized]; // return the original category name
-        }
-
-        $percent = 0.0;
-
-        return null;
-    }
-
-    public function getUncategorizedCategory(Company $company, string $transactionType): Category
-    {
-        $name = match ($transactionType) {
-            'income' => 'Other Income',
-            'expense' => 'Other Expense',
-        };
-
-        return $company->categories()
-            ->where('type', $transactionType)
-            ->where('name', $name)
-            ->firstOrFail();
-    }
-
-    public function getChartFromTransaction(Company $company, string $transactionType): Account
+    public function getUncategorizedAccount(Company $company, string $transactionType): Account
     {
         [$type, $name] = match ($transactionType) {
             'income' => [AccountType::UncategorizedRevenue, 'Uncategorized Income'],

app/Utilities/Plaid/AccountTypeMapper.php

@@ -1,123 +0,0 @@
-<?php
-
-namespace App\Utilities\Plaid;
-
-use App\Enums\BankAccountSubtype;
-use App\Enums\BankAccountType;
-
-class AccountTypeMapper
-{
-    public static function mapToEnums(string $plaidType, string $plaidSubtype): array
-    {
-        $mappedType = self::mapType($plaidType);
-        $mappedSubtype = self::mapSubtype($plaidType, $plaidSubtype);
-
-        return [
-            'type' => $mappedType,
-            'subtype' => $mappedSubtype,
-        ];
-    }
-
-    private static function mapType(string $plaidType): BankAccountType
-    {
-        return match ($plaidType) {
-            'depository' => BankAccountType::Depository,
-            'credit' => BankAccountType::Credit,
-            'loan' => BankAccountType::Loan,
-            'investment' => BankAccountType::Investment,
-            default => BankAccountType::Other,
-        };
-    }
-
-    private static function mapSubtype(string $plaidType, string $plaidSubtype): ?BankAccountSubtype
-    {
-        return match ($plaidType) {
-            'depository' => match ($plaidSubtype) {
-                'checking' => BankAccountSubtype::Checking,
-                'savings' => BankAccountSubtype::Savings,
-                'hsa' => BankAccountSubtype::HealthSavingsAccountCash,
-                'cd' => BankAccountSubtype::CertificateOfDeposit,
-                'money market' => BankAccountSubtype::MoneyMarket,
-                'paypal' => BankAccountSubtype::Paypal,
-                'prepaid' => BankAccountSubtype::Prepaid,
-                'cash management' => BankAccountSubtype::CashManagement,
-                'ebt' => BankAccountSubtype::ElectronicBenefitsTransfer,
-                default => BankAccountSubtype::Other,
-            },
-            'credit' => match ($plaidSubtype) {
-                'credit card' => BankAccountSubtype::CreditCard,
-                'paypal' => BankAccountSubtype::PaypalCredit,
-                default => BankAccountSubtype::Other,
-            },
-            'loan' => match ($plaidSubtype) {
-                'auto' => BankAccountSubtype::Auto,
-                'business' => BankAccountSubtype::Business,
-                'commercial' => BankAccountSubtype::Commercial,
-                'construction' => BankAccountSubtype::Construction,
-                'consumer' => BankAccountSubtype::Consumer,
-                'home equity' => BankAccountSubtype::HomeEquity,
-                'loan' => BankAccountSubtype::Loan,
-                'mortgage' => BankAccountSubtype::Mortgage,
-                'overdraft' => BankAccountSubtype::Overdraft,
-                'line of credit' => BankAccountSubtype::LineOfCredit,
-                'student' => BankAccountSubtype::Student,
-                default => BankAccountSubtype::Other,
-            },
-            'investment' => match ($plaidSubtype) {
-                '529' => BankAccountSubtype::CollegeSavings529,
-                '401a' => BankAccountSubtype::Retirement401a,
-                '401k' => BankAccountSubtype::Retirement401K,
-                '403B' => BankAccountSubtype::Retirement403b,
-                '457b' => BankAccountSubtype::DeferredCompensation457b,
-                'brokerage' => BankAccountSubtype::Brokerage,
-                'cash isa' => BankAccountSubtype::CashIndividualSavingsAccount,
-                'crypto exchange' => BankAccountSubtype::CryptoCurrencyExchange,
-                'education savings account' => BankAccountSubtype::EducationSavingsAccount,
-                'fixed annuity' => BankAccountSubtype::FixedAnnuity,
-                'gic' => BankAccountSubtype::GuaranteedInvestmentCertificate,
-                'health reimbursement arrangement' => BankAccountSubtype::HealthReimbursementArrangement,
-                'hsa' => BankAccountSubtype::HealthSavingsAccountNonCash,
-                'ira' => BankAccountSubtype::IndividualRetirementAccount,
-                'isa' => BankAccountSubtype::IndividualSavingsAccount,
-                'keogh' => BankAccountSubtype::KeoghPlan,
-                'lif' => BankAccountSubtype::LifeIncomeFund,
-                'life insurance' => BankAccountSubtype::LifeInsuranceAccount,
-                'lira' => BankAccountSubtype::LockedInRetirementAccount,
-                'lrif' => BankAccountSubtype::LockedInRetirementIncomeFund,
-                'lrsp' => BankAccountSubtype::LockedInRetirementSavingsPlan,
-                'mutual fund' => BankAccountSubtype::MutualFundAccount,
-                'non-custodial wallet' => BankAccountSubtype::CryptoCurrencyWallet,
-                'non-taxable brokerage account' => BankAccountSubtype::NonTaxableBrokerageAccount,
-                'other annuity' => BankAccountSubtype::AnnuityAccountOther,
-                'other insurance' => BankAccountSubtype::InsuranceAccountOther,
-                'pension' => BankAccountSubtype::PensionAccount,
-                'prif' => BankAccountSubtype::PrescribedRetirementIncomeFund,
-                'profit sharing plan' => BankAccountSubtype::ProfitSharingPlanAccount,
-                'qshr' => BankAccountSubtype::QualifyingShareAccount,
-                'rdsp' => BankAccountSubtype::RegisteredDisabilitySavingsPlan,
-                'resp' => BankAccountSubtype::RegisteredEducationSavingsPlan,
-                'retirement' => BankAccountSubtype::RetirementAccountOther,
-                'rlif' => BankAccountSubtype::RestrictedLifeIncomeFund,
-                'roth' => BankAccountSubtype::RothIRA,
-                'roth 401k' => BankAccountSubtype::Roth401k,
-                'rrif' => BankAccountSubtype::RegisteredRetirementIncomeFund,
-                'rrsp' => BankAccountSubtype::RegisteredRetirementSavingsPlan,
-                'sarsep' => BankAccountSubtype::SalaryReductionSEPPlan,
-                'sep ira' => BankAccountSubtype::SimplifiedEmployeePensionIRA,
-                'simple ira' => BankAccountSubtype::SavingsIncentiveMatchPlanForEmployeesIRA,
-                'sipp' => BankAccountSubtype::SelfInvestedPersonalPension,
-                'stock plan' => BankAccountSubtype::StockPlanAccount,
-                'tfsa' => BankAccountSubtype::TaxFreeSavingsAccount,
-                'trust' => BankAccountSubtype::TrustAccount,
-                'ugma' => BankAccountSubtype::UniformGiftToMinorsAct,
-                'utma' => BankAccountSubtype::UniformTransfersToMinorsAct,
-                'variable annuity' => BankAccountSubtype::VariableAnnuityAccount,
-                default => BankAccountSubtype::Other,
-            },
-
-            default => BankAccountSubtype::Other,
-
-        };
-
-    }
-}

app/ValueObjects/BalanceValue.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\ValueObjects;
+
+class BalanceValue
+{
+    private int $value;
+    private string $currency;
+
+    public function __construct(int $value, string $currency = 'USD')
+    {
+        $this->value = $value;
+        $this->currency = $currency;
+    }
+
+    public function getValue(): int
+    {
+        return $this->value;
+    }
+
+    public function formatted(): string
+    {
+        return money($this->value, $this->currency)->format();
+    }
+}

composer.json

@@ -15,9 +15,11 @@
         "andrewdwallo/filament-companies": "^3.0",
         "andrewdwallo/filament-selectify": "^2.0",
         "andrewdwallo/transmatic": "^1.0",
+        "barryvdh/laravel-dompdf": "^2.0",
         "bezhansalleh/filament-panel-switch": "^1.0",
         "filament/filament": "^3.0",
         "filament/spatie-laravel-tags-plugin": "^3.0-stable",
+        "guava/filament-clusters": "^1.1",
         "guzzlehttp/guzzle": "^7.2",
         "laravel/framework": "^10.10",
         "laravel/sanctum": "^3.2",

config/chart-of-accounts.php

@@ -409,16 +409,4 @@ return [
             ],
         ],
     ],
-    'category_account_map' => [
-        'Dividends' => 'Dividends',
-        'Interest Earned' => 'Interest Earned',
-        'Wages' => 'Salaries and Wages',
-        'Sales' => 'Product Sales',
-        'Other Income' => 'Uncategorized Income',
-        'Rent or Mortgage' => 'Rent or Lease Payments',
-        'Utilities' => 'Utilities',
-        'Groceries' => 'Food and Drink',
-        'Transportation' => 'Transportation',
-        'Other Expenses' => 'Uncategorized Expense',
-    ],
 ];

database/factories/Setting/AppearanceFactory.php

@@ -2,10 +2,11 @@
 
 namespace Database\Factories\Setting;
 
+use App\Models\Setting\Appearance;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Setting\Appearance>
+ * @extends Factory<Appearance>
  */
 class AppearanceFactory extends Factory
 {

database/factories/Setting/CategoryFactory.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace Database\Factories\Setting;
-
-use App\Enums\CategoryType;
-use App\Models\Setting\Category;
-use Illuminate\Database\Eloquent\Factories\Factory;
-
-/**
- * @extends Factory<Category>
- */
-class CategoryFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     */
-    protected $model = Category::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'name' => $this->faker->word,
-            'type' => $this->faker->randomElement(['income', 'expense']),
-            'color' => $this->faker->hexColor,
-            'enabled' => false,
-        ];
-    }
-
-    /**
-     * Indicate that the category is of income type.
-     */
-    public function incomeCategory(string $name): self
-    {
-        return $this->state(function (array $attributes) use ($name) {
-            return [
-                'name' => $name,
-                'type' => CategoryType::Income->value,
-            ];
-        });
-    }
-
-    /**
-     * Indicate that the category is of expense type.
-     */
-    public function expenseCategory(string $name): self
-    {
-        return $this->state(function (array $attributes) use ($name) {
-            return [
-                'name' => $name,
-                'type' => CategoryType::Expense->value,
-            ];
-        });
-    }
-}

database/factories/Setting/CompanyDefaultFactory.php

@@ -2,11 +2,9 @@
 
 namespace Database\Factories\Setting;
 
-use App\Enums\CategoryType;
 use App\Faker\CurrencyCode;
 use App\Models\Company;
 use App\Models\Setting\Appearance;
-use App\Models\Setting\Category;
 use App\Models\Setting\CompanyDefault;
 use App\Models\Setting\Currency;
 use App\Models\Setting\Discount;
@@ -46,7 +44,6 @@ class CompanyDefaultFactory extends Factory
 
         $currencyCode = $currencyFaker->currencyCode($country);
 
-        $categories = $this->createCategories($company, $user);
         $currency = $this->createCurrency($company, $user, $currencyCode);
         $salesTax = $this->createSalesTax($company, $user);
         $purchaseTax = $this->createPurchaseTax($company, $user);
@@ -58,8 +55,6 @@ class CompanyDefaultFactory extends Factory
 
         $companyDefaults = [
             'company_id' => $company->id,
-            'income_category_id' => $categories['income_category_id'],
-            'expense_category_id' => $categories['expense_category_id'],
             'currency_code' => $currency->code,
             'sales_tax_id' => $salesTax->id,
             'purchase_tax_id' => $purchaseTax->id,
@@ -72,53 +67,6 @@ class CompanyDefaultFactory extends Factory
         return $this->state($companyDefaults);
     }
 
-    private function createCategories(Company $company, User $user): array
-    {
-        $incomeCategories = ['Salary', 'Bonus', 'Interest', 'Dividends', 'Rentals'];
-        $expenseCategories = ['Rent', 'Utilities', 'Food', 'Transportation', 'Entertainment'];
-
-        $shuffledCategories = [
-            ...array_map(static fn ($name) => ['name' => $name, 'type' => CategoryType::Income->value], $incomeCategories),
-            ...array_map(static fn ($name) => ['name' => $name, 'type' => CategoryType::Expense->value], $expenseCategories),
-        ];
-
-        shuffle($shuffledCategories);
-
-        $incomeEnabled = $expenseEnabled = false;
-
-        $enabledIncomeCategoryId = null;
-        $enabledExpenseCategoryId = null;
-
-        foreach ($shuffledCategories as $category) {
-            $enabled = false;
-            if (! $incomeEnabled && $category['type'] === CategoryType::Income->value) {
-                $enabled = $incomeEnabled = true;
-            } elseif (! $expenseEnabled && $category['type'] === CategoryType::Expense->value) {
-                $enabled = $expenseEnabled = true;
-            }
-
-            $categoryModel = Category::factory()->create([
-                'company_id' => $company->id,
-                'name' => $category['name'],
-                'type' => $category['type'],
-                'enabled' => $enabled,
-                'created_by' => $user->id,
-                'updated_by' => $user->id,
-            ]);
-
-            if ($enabled && $category['type'] === CategoryType::Income->value) {
-                $enabledIncomeCategoryId = $categoryModel->id;
-            } elseif ($enabled && $category['type'] === CategoryType::Expense->value) {
-                $enabledExpenseCategoryId = $categoryModel->id;
-            }
-        }
-
-        return [
-            'income_category_id' => $enabledIncomeCategoryId,
-            'expense_category_id' => $enabledExpenseCategoryId,
-        ];
-    }
-
     private function createCurrency(Company $company, User $user, string $currencyCode)
     {
         return Currency::factory()->forCurrency($currencyCode)->create([

database/factories/Setting/LocalizationFactory.php

@@ -47,8 +47,8 @@ class LocalizationFactory extends Factory
             'number_format' => $number_format,
             'percent_first' => $percent_first,
             'week_start' => $week_start,
-            'fiscal_year_start' => now()->startOfYear()->toDateString(),
-            'fiscal_year_end' => now()->endOfYear()->toDateString(),
+            'fiscal_year_end_month' => 12,
+            'fiscal_year_end_day' => 31,
         ]);
     }
 }

database/migrations/2023_09_03_100000_create_accounting_tables.php

@@ -46,11 +46,6 @@ return new class extends Migration
             $table->string('code')->nullable()->index();
             $table->string('name')->nullable()->index();
             $table->string('currency_code')->nullable();
-            $table->bigInteger('starting_balance')->default(0);
-            $table->bigInteger('debit_balance')->default(0);
-            $table->bigInteger('credit_balance')->default(0);
-            $table->bigInteger('net_movement')->default(0);
-            $table->bigInteger('ending_balance')->default(0);
             $table->text('description')->nullable();
             $table->boolean('active')->default(true);
             $table->boolean('default')->default(false);

database/migrations/2023_09_07_193412_create_categories_table.php

@@ -1,38 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('categories', function (Blueprint $table) {
-            $table->id();
-            $table->foreignId('company_id')->constrained()->cascadeOnDelete();
-            $table->foreignId('account_id')->nullable()->constrained()->nullOnDelete();
-            $table->string('name')->index();
-            $table->string('type');
-            $table->string('color');
-            $table->boolean('enabled')->default(true);
-            $table->boolean('is_default')->default(false);
-            $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
-            $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
-            $table->timestamps();
-
-            $table->unique(['company_id', 'name', 'type']);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('categories');
-    }
-};

database/migrations/2023_09_08_040159_create_company_defaults_table.php

@@ -20,8 +20,6 @@ return new class extends Migration
             $table->foreignId('purchase_tax_id')->nullable()->constrained('taxes')->cascadeOnDelete();
             $table->foreignId('sales_discount_id')->nullable()->constrained('discounts')->cascadeOnDelete();
             $table->foreignId('purchase_discount_id')->nullable()->constrained('discounts')->cascadeOnDelete();
-            $table->foreignId('income_category_id')->nullable()->constrained('categories')->cascadeOnDelete();
-            $table->foreignId('expense_category_id')->nullable()->constrained('categories')->cascadeOnDelete();
             $table->foreignId('created_by')->nullable()->constrained('users')->restrictOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->restrictOnDelete();
             $table->timestamps();

database/migrations/2023_10_11_210415_create_localizations_table.php

@@ -22,8 +22,8 @@ return new class extends Migration
             $table->string('timezone')->nullable();
             $table->string('date_format')->default(DateFormat::DEFAULT);
             $table->string('time_format')->default(TimeFormat::DEFAULT);
-            $table->date('fiscal_year_start')->default(now()->startOfYear()->toDateString());
-            $table->date('fiscal_year_end')->default(now()->endOfYear()->toDateString());
+            $table->unsignedTinyInteger('fiscal_year_end_month')->default(12);
+            $table->unsignedTinyInteger('fiscal_year_end_day')->default(31);
             $table->unsignedTinyInteger('week_start')->default(WeekStart::DEFAULT);
             $table->string('number_format')->default(NumberFormat::DEFAULT);
             $table->boolean('percent_first')->default(false);

database/migrations/2024_01_01_234943_create_transactions_table.php

@@ -14,7 +14,7 @@ return new class extends Migration
         Schema::create('transactions', function (Blueprint $table) {
             $table->id();
             $table->foreignId('company_id')->constrained()->cascadeOnDelete();
-            $table->foreignId('category_id')->nullable()->constrained()->nullOnDelete();
+            $table->foreignId('account_id')->nullable()->constrained()->nullOnDelete();
             $table->foreignId('bank_account_id')->nullable()->constrained()->nullOnDelete();
             $table->foreignId('contact_id')->nullable()->constrained()->nullOnDelete();
             $table->string('type'); // income, expense, other

package-lock.json

@@ -397,14 +397,14 @@
             }
         },
         "node_modules/@jridgewell/gen-mapping": {
-            "version": "0.3.4",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.4.tgz",
-            "integrity": "sha512-Oud2QPM5dHviZNn4y/WhhYKSXksv+1xLEIsNrAbGcFzUN3ubqWRFT5gwPchNc5NuzILOU4tPBDTZ4VwhL8Y7cw==",
+            "version": "0.3.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+            "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
             "dev": true,
             "dependencies": {
-                "@jridgewell/set-array": "^1.0.1",
+                "@jridgewell/set-array": "^1.2.1",
                 "@jridgewell/sourcemap-codec": "^1.4.10",
-                "@jridgewell/trace-mapping": "^0.3.9"
+                "@jridgewell/trace-mapping": "^0.3.24"
             },
             "engines": {
                 "node": ">=6.0.0"
@@ -420,9 +420,9 @@
             }
         },
         "node_modules/@jridgewell/set-array": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-            "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+            "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
             "dev": true,
             "engines": {
                 "node": ">=6.0.0"
@@ -435,9 +435,9 @@
             "dev": true
         },
         "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.23",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.23.tgz",
-            "integrity": "sha512-9/4foRoUKp8s96tSkh8DlAAc5A0Ty8vLXld+l9gjKKY6ckwI8G15f0hskGmuLZu78ZlGa1vtsfOa+lnB4vG6Jg==",
+            "version": "0.3.25",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+            "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
             "dev": true,
             "dependencies": {
                 "@jridgewell/resolve-uri": "^3.1.0",
@@ -572,9 +572,9 @@
             "dev": true
         },
         "node_modules/autoprefixer": {
-            "version": "10.4.17",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.17.tgz",
-            "integrity": "sha512-/cpVNRLSfhOtcGflT13P2794gVSgmPgTR+erw5ifnMLZb0UnSlkK4tquLmkd3BhA+nLo5tX8Cu0upUsGKvKbmg==",
+            "version": "10.4.18",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.18.tgz",
+            "integrity": "sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==",
             "dev": true,
             "funding": [
                 {
@@ -591,8 +591,8 @@
                 }
             ],
             "dependencies": {
-                "browserslist": "^4.22.2",
-                "caniuse-lite": "^1.0.30001578",
+                "browserslist": "^4.23.0",
+                "caniuse-lite": "^1.0.30001591",
                 "fraction.js": "^4.3.7",
                 "normalize-range": "^0.1.2",
                 "picocolors": "^1.0.0",
@@ -697,9 +697,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001589",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001589.tgz",
-            "integrity": "sha512-vNQWS6kI+q6sBlHbh71IIeC+sRwK2N3EDySc/updIGhIee2x5z00J4c1242/5/d6EpEMdOnk/m+6tuk4/tcsqg==",
+            "version": "1.0.30001597",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001597.tgz",
+            "integrity": "sha512-7LjJvmQU6Sj7bL0j5b5WY/3n7utXUJvAe1lxhsHDbLmwX9mdL86Yjtr+5SRCyf8qME4M7pU2hswj0FpyBVCv9w==",
             "dev": true,
             "funding": [
                 {
@@ -845,9 +845,9 @@
             "dev": true
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.681",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.681.tgz",
-            "integrity": "sha512-1PpuqJUFWoXZ1E54m8bsLPVYwIVCRzvaL+n5cjigGga4z854abDnFRc+cTa2th4S79kyGqya/1xoR7h+Y5G5lg==",
+            "version": "1.4.701",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.701.tgz",
+            "integrity": "sha512-K3WPQ36bUOtXg/1+69bFlFOvdSm0/0bGqmsfPDLRXLanoKXdA+pIWuf/VbA9b+2CwBFuONgl4NEz4OEm+OJOKA==",
             "dev": true
         },
         "node_modules/emoji-regex": {
@@ -1072,9 +1072,9 @@
             }
         },
         "node_modules/hasown": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",
-            "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
             "dev": true,
             "dependencies": {
                 "function-bind": "^1.1.2"
@@ -2195,10 +2195,13 @@
             }
         },
         "node_modules/yaml": {
-            "version": "2.3.4",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
-            "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==",
+            "version": "2.4.1",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.1.tgz",
+            "integrity": "sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==",
             "dev": true,
+            "bin": {
+                "yaml": "bin.mjs"
+            },
             "engines": {
                 "node": ">= 14"
             }

resources/css/filament/company/theme.css

@@ -3,6 +3,22 @@
 
 @config './tailwind.config.js';
 
+.es-report-card {
+    @apply md:!grid-cols-2;
+
+    .fi-fo-component-ctn {
+        @apply divide-y divide-gray-200 dark:divide-white/10 !gap-0;
+    }
+
+    .fi-section-content-ctn {
+        @apply md:!col-span-1;
+    }
+
+    .fi-section-content {
+        @apply !p-0;
+    }
+}
+
 .choices:focus-visible {
     outline: none;
 }

resources/data/lang/en.json

@@ -246,6 +246,5 @@
     "Starting Balance": "Starting Balance",
     "Account Identification": "Account Identification",
     "Account Settings": "Account Settings",
-    "Financial Details": "Financial Details",
-    "Oh Yes": "Oh Yes"
-}
+    "Financial Details": "Financial Details"
+}

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

@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>Account Balances</title>
+    <style>
+        @page {
+            margin: 0.25in 0.25in 1in 0.25in;
+        }
+
+        .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>
+    <script type="text/php">
+        if (isset($pdf)) {
+            $font = $fontMetrics->getFont("Inter, sans-serif", "normal");
+            $size = 8;
+
+            $pageText = "Page {PAGE_NUM} of {PAGE_COUNT}";
+            $x = 533;
+            $y = 820;
+            $pdf->page_text($x, $y, $pageText, $font, $size);
+        }
+    </script>
+</body>

resources/views/components/report-entry.blade.php

@@ -0,0 +1,38 @@
+@props([
+    'heading' => null,
+    'description' => null,
+    'icon' => null,
+    'iconColor' => 'gray',
+])
+
+<div class="group relative p-6 hover:bg-gray-300/5 dark:hover:bg-gray-700/5">
+    <span
+        @class([
+            'inline-flex rounded-lg p-3 ring-4 ring-white dark:ring-gray-900',
+            match ($iconColor) {
+                'gray' => 'fi-color-gray bg-gray-50 text-gray-700 dark:bg-gray-900 dark:text-gray-500',
+                default => 'fi-color-custom bg-custom-50 text-custom-700 dark:bg-custom-950 dark:text-custom-500',
+            },
+        ])
+        @style([
+            \Filament\Support\get_color_css_variables(
+                $iconColor,
+                shades: [50, 500, 700, 950],
+            ) => $iconColor !== 'gray',
+        ])
+    >
+        <x-filament::icon :icon="$icon" class="h-6 w-6" />
+    </span>
+    <div class="mt-8 pr-1">
+        <h3 class="text-base font-semibold leading-6 text-gray-950 dark:text-white">
+            {{ $heading }}
+        </h3>
+        <p class="mt-2 text-sm text-gray-500 dark:text-gray-400">
+            {{ $description }}
+        </p>
+    </div>
+    <x-filament::icon
+        icon="heroicon-o-arrow-up-right"
+        class="absolute right-6 top-6 text-gray-300 group-hover:text-gray-400 h-6 w-6"
+    />
+</div>

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

@@ -47,26 +47,33 @@
 
                                 <!-- Chart Rows -->
                                 @forelse($subtype->accounts as $account)
-                                <tr class="es-table__row">
-                                    <td colspan="1" class="es-table__cell px-4 py-4">{{ $account->code }}</td>
-                                    <td colspan="1" class="es-table__cell px-4 py-4">{{ $account->name }}</td>
-                                    <td colspan="1" class="es-table__cell px-4 py-4">{{ $account->description }}</td>
-                                    <td colspan="1" class="es-table__cell px-4 py-4">@money($account->ending_balance, $account->currency_code, true)</td>
-                                    <td colspan="1" class="es-table__cell px-4 py-4">
-                                        <div>
-                                            @if($account->default === false)
-                                                {{ ($this->editChartAction)(['chart' => $account->id]) }}
-                                            @endif
-                                        </div>
-                                    </td>
-                                </tr>
+                                    @php
+                                        $accountBalance = $this->getAccountBalance($account);
+                                    @endphp
+                                    <tr class="es-table__row">
+                                        <td colspan="1" class="es-table__cell px-4 py-4">{{ $account->code }}</td>
+                                        <td colspan="1" class="es-table__cell px-4 py-4">{{ $account->name }}</td>
+                                        <td colspan="{{ $accountBalance === null ? '2' : '1' }}" class="es-table__cell px-4 py-4">{{ $account->description }}</td>
+                                        @if($accountBalance !== null)
+                                            <td colspan="1" class="es-table__cell px-4 py-4">
+                                                {{ $accountBalance }}
+                                            </td>
+                                        @endif
+                                        <td colspan="1" class="es-table__cell px-4 py-4">
+                                            <div>
+                                                @if($account->default === false)
+                                                    {{ ($this->editChartAction)(['chart' => $account->id]) }}
+                                                @endif
+                                            </div>
+                                        </td>
+                                    </tr>
                                 @empty
-                                <!-- No Accounts Available Row -->
-                                <tr class="es-table__row">
-                                    <td colspan="5" class="es-table__cell px-4 py-4 italic">
-                                        {{ __("You haven't added any {$subtype->name} accounts yet.") }}
-                                    </td>
-                                </tr>
+                                    <!-- No Accounts Available Row -->
+                                    <tr class="es-table__row">
+                                        <td colspan="5" class="es-table__cell px-4 py-4 italic">
+                                            {{ __("You haven't added any {$subtype->name} accounts yet.") }}
+                                        </td>
+                                    </tr>
                                 @endforelse
 
                                 <!-- Add New Account Row -->

resources/views/filament/company/pages/reports.blade.php

@@ -0,0 +1,3 @@
+<x-filament-panels::page>
+    {{ $this->reportsInfolist }}
+</x-filament-panels::page>

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

@@ -0,0 +1,75 @@
+<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/infolists/components/report-entry.blade.php

@@ -0,0 +1,8 @@
+<x-dynamic-component :component="$getEntryWrapperView()" :entry="$entry">
+    <x-report-entry
+        :heading="$getHeading()"
+        :description="$getDescription()"
+        :icon="$getIcon()"
+        :iconColor="$getIconColor()"
+    />
+</x-dynamic-component>

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

@@ -1,6 +1,6 @@
 <div>
     <div class="grid grid-cols-1 gap-4">
-        @forelse($this->connectedInstitutions as $institution) {{-- Group connected accounts by institution --}}
+        @forelse($this->connectedInstitutions as $institution)
             <section class="connected-account-section overflow-hidden rounded-xl bg-white shadow-sm ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10">
                 <header class="connected-account-header bg-primary-300/10 px-6 py-4 flex flex-col sm:flex-row sm:items-center gap-3">
                     @if($institution->logo_url === null)
@@ -38,7 +38,7 @@
 
                             @if($connectedBankAccount->bankAccount?->account)
                                 <div class="account-balance flex text-base leading-6 text-gray-700 dark:text-gray-200 space-x-1">
-                                    <strong>@money($connectedBankAccount->bankAccount->account->ending_balance, $connectedBankAccount->bankAccount->account->currency_code, true)</strong>
+                                    <strong>{{ $this->getAccountBalance($connectedBankAccount->bankAccount->account) }}</strong>
                                     <p>{{ $connectedBankAccount->bankAccount->account->currency_code }}</p>
                                 </div>
                             @endif