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

Development 3.x

README.md

@@ -8,14 +8,14 @@
 <img width="1920" alt="Screenshot 2024-05-07 at 10 55 56 PM" src="https://github.com/andrewdwallo/erpsaas/assets/104294090/6395030a-6688-4b08-bf6c-b12b5e591b31">
 
 
-
 This repo is currently a work in progress — PRs and issues welcome!
 
 # Getting started
 
 ## Installation
 
-Please check the official laravel installation guide for server requirements before you start. [Official Documentation](https://laravel.com/docs/10.x)
+Please check the official laravel installation guide for server requirements before you
+start. [Official Documentation](https://laravel.com/docs/10.x)
 
 Clone the repository
 
@@ -77,48 +77,58 @@ Run the database seeder
 
     php artisan db:seed
 
-***Note*** : It's recommended to have a clean database before seeding. You can refresh your migrations at any point to clean the database by running the following command
+***Note***: It's recommended to have a clean database before seeding. You can reset your database to a clean state at
+any point by running the following command:
 
-    php artisan migrate:refresh
+    php artisan migrate:fresh
 
 ## Generating PDFs for Reports
 
-To generate PDFs for reports, the application uses Laravel Snappy. The Laravel Snappy package is already included in the application, but you need to install Wkhtmltopdf separately.
+To generate PDFs for reports, the application uses Laravel Snappy. The Laravel Snappy package is already included in the
+application, but you need to install Wkhtmltopdf separately.
 
 ### Wkhtmltopdf Installation
 
 1. **Download and install Wkhtmltopdf**
-   - [Wkhtmltopdf Downloads](https://wkhtmltopdf.org/downloads.html)
-   
-   - Alternatively, if you are using Homebrew on macOS, you can install it using the following command:
-     ```bash
-     brew install wkhtmltopdf
-     ```
+    - [Wkhtmltopdf Downloads](https://wkhtmltopdf.org/downloads.html)
+
+    - Alternatively, if you are using Homebrew on macOS, you can install it using the following command:
+      ```bash
+      brew install wkhtmltopdf
+      ```
 
 2. **Configure the binary paths**
-   - If needed, you can change the paths to the Wkhtmltopdf binaries in the Snappy configuration file (`config/snappy.php`).
+    - If needed, you can change the paths to the Wkhtmltopdf binaries in the Snappy configuration file (
+      `config/snappy.php`).
 
-For detailed installation instructions, refer to the [Laravel Snappy documentation](https://github.com/barryvdh/laravel-snappy).
+For detailed installation instructions, refer to
+the [Laravel Snappy documentation](https://github.com/barryvdh/laravel-snappy).
 
 ## Live Currency
 
 ### Overview
 
-This application offers support for real-time currency exchange rates. This feature is disabled by default. To enable it, you must first register for an API key at [ExchangeRate-API](https://www.exchangerate-api.com/). The application uses this service due to its generous provision of up to 1,500 free API calls per month, which should be enough for development and testing purposes.
+This application offers support for real-time currency exchange rates. This feature is disabled by default. To enable
+it, you must first register for an API key at [ExchangeRate-API](https://www.exchangerate-api.com/). The application
+uses this service due to its generous provision of up to 1,500 free API calls per month, which should be enough for
+development and testing purposes.
 
 **Disclaimer**: There is no affiliation between this application and ExchangeRate-API.
 
-Once you have your API key, you can enable the feature by setting the `CURRENCY_API_KEY` environment variable in your `.env` file.
+Once you have your API key, you can enable the feature by setting the `CURRENCY_API_KEY` environment variable in your
+`.env` file.
 
 ### Initial Setup
 
-After setting your API key in the `.env` file, it is essential to prepare your database to store the currency data. Start by running a fresh database migration:
+After setting your API key in the `.env` file, it is essential to prepare your database to store the currency data.
+Start by running a fresh database migration:
 
 ```bash
 php artisan migrate:fresh
 ```
 
-This ensures that your database is in the correct state to store the currency information. Afterward, use the following command to generate and populate the Currency List with supported currencies for the Live Currency page:
+This ensures that your database is in the correct state to store the currency information. Afterward, use the following
+command to generate and populate the Currency List with supported currencies for the Live Currency page:
 
 ```bash
 php artisan currency:init
@@ -128,7 +138,8 @@ This command fetches and stores the list of currencies supported by your configu
 
 ### Configuration
 
-Of course, you may use any service you wish to retrieve currency exchange rates. If you decide to use a different service, you can update the `config/services.php` file with your choice:
+Of course, you may use any service you wish to retrieve currency exchange rates. If you decide to use a different
+service, you can update the `config/services.php` file with your choice:
 
 ```php
 'currency_api' => [
@@ -141,28 +152,41 @@ Then, adjust the implementation of the `App\Services\CurrencyService` class to u
 
 ### Live Currency Page
 
-Once enabled, the "Live Currency" feature provides access to a dedicated page in the application, listing all supported currencies from the configured exchange rate service. Users can view available currencies and update exchange rates for their company's currencies as needed.
+Once enabled, the "Live Currency" feature provides access to a dedicated page in the application, listing all supported
+currencies from the configured exchange rate service. Users can view available currencies and update exchange rates for
+their company's currencies as needed.
 
 ### Important Information
 
-- To use the currency exchange rate feature, you must first obtain an API key from a service provider. This application is configured to use a service that offers a free tier suitable for development and testing purposes.
-- Your API key is sensitive information and should be kept secret. Do not commit it to your repository or share it with anyone.
-- Note that API rate limits may apply depending on the service you choose. Make sure to review the terms for your chosen service.
+- To use the currency exchange rate feature, you must first obtain an API key from a service provider. This application
+  is configured to use a service that offers a free tier suitable for development and testing purposes.
+- Your API key is sensitive information and should be kept secret. Do not commit it to your repository or share it with
+  anyone.
+- Note that API rate limits may apply depending on the service you choose. Make sure to review the terms for your chosen
+  service.
 
 ## Automatic Translation
 
-The application now supports automatic translation, leveraging machine translation services provided by AWS, as facilitated by the [andrewdwallo/transmatic](https://github.com/andrewdwallo/transmatic) package. This integration significantly enhances the application's accessibility for a global audience. The application currently offers support for several languages, including English, Arabic, German, Spanish, French, Indonesian, Italian, Dutch, Portuguese, Turkish, and Chinese, with English as the default language.
+The application now supports automatic translation, leveraging machine translation services provided by AWS, as
+facilitated by the [andrewdwallo/transmatic](https://github.com/andrewdwallo/transmatic) package. This integration
+significantly enhances the application's accessibility for a global audience. The application currently offers support
+for several languages, including English, Arabic, German, Spanish, French, Indonesian, Italian, Dutch, Portuguese,
+Turkish, and Chinese, with English as the default language.
 
 ### Configuration & Usage
 
 To utilize this feature for additional languages or custom translations:
-1. Follow the documentation provided in the [andrewdwallo/transmatic](https://github.com/andrewdwallo/transmatic) package.
+
+1. Follow the documentation provided in the [andrewdwallo/transmatic](https://github.com/andrewdwallo/transmatic)
+   package.
 2. Configure the package with your preferred translation service credentials.
 3. Run the translation commands as per the package instructions to generate new translations.
 
-Once you have configured the package, you may update the following method in the `app/Models/Setting/Localization.php` file to generate translations based on the selected language in the application UI:
+Once you have configured the package, you may update the following method in the `app/Models/Setting/Localization.php`
+file to generate translations based on the selected language in the application UI:
 
 Change to the following:
+
 ```php
 public static function getAllLanguages(): array
 {
@@ -192,13 +216,17 @@ php artisan queue:work --queue=transactions
 ## Dependencies
 
 - [filamentphp/filament](https://github.com/filamentphp/filament) - A collection of beautiful full-stack components
-- [andrewdwallo/filament-companies](https://github.com/andrewdwallo/filament-companies) - A complete authentication system kit based on companies built for Filament
-- [andrewdwallo/transmatic](https://github.com/andrewdwallo/transmatic) - A package for automatic translation using machine translation services
-- [akaunting/laravel-money](https://github.com/akaunting/laravel-money) - Currency formatting and conversion package for Laravel
+- [andrewdwallo/filament-companies](https://github.com/andrewdwallo/filament-companies) - A complete authentication
+  system kit based on companies built for Filament
+- [andrewdwallo/transmatic](https://github.com/andrewdwallo/transmatic) - A package for automatic translation using
+  machine translation services
+- [akaunting/laravel-money](https://github.com/akaunting/laravel-money) - Currency formatting and conversion package for
+  Laravel
 - [squirephp/squire](https://github.com/squirephp/squire) - A library of static Eloquent models for common fixture data
 - [awcodes/filament-table-repeater](https://github.com/awcodes/filament-table-repeater) - A modified version of the Filament Forms Repeater to display it as a table. 
 
-***Note*** : It is recommended to read the documentation for all dependencies to get yourself familiar with how the application works.
+***Note*** : It is recommended to read the documentation for all dependencies to get yourself familiar with how the
+application works.
 
 ## License
 

app/Casts/TransactionAmountCast.php

@@ -11,13 +11,15 @@ use UnexpectedValueException;
 
 class TransactionAmountCast implements CastsAttributes
 {
+    private array $currencyCache = [];
+
     public function get(Model $model, string $key, mixed $value, array $attributes): string
     {
         // Attempt to retrieve the currency code from the related bankAccount->account model
-        $currency_code = $this->getCurrencyCodeFromBankAccountId($attributes['bank_account_id'] ?? null);
+        $currencyCode = $this->getCurrencyCodeFromBankAccountId($attributes['bank_account_id'] ?? null);
 
         if ($value !== null) {
-            return CurrencyConverter::prepareForMutator($value, $currency_code);
+            return CurrencyConverter::prepareForMutator($value, $currencyCode);
         }
 
         return '';
@@ -28,7 +30,7 @@ class TransactionAmountCast implements CastsAttributes
      */
     public function set(Model $model, string $key, mixed $value, array $attributes): int
     {
-        $currency_code = $this->getCurrencyCodeFromBankAccountId($attributes['bank_account_id'] ?? null);
+        $currencyCode = $this->getCurrencyCodeFromBankAccountId($attributes['bank_account_id'] ?? null);
 
         if (is_numeric($value)) {
             $value = (string) $value;
@@ -36,7 +38,7 @@ class TransactionAmountCast implements CastsAttributes
             throw new UnexpectedValueException('Expected string or numeric value for money cast');
         }
 
-        return CurrencyConverter::prepareForAccessor($value, $currency_code);
+        return CurrencyConverter::prepareForAccessor($value, $currencyCode);
     }
 
     /**
@@ -49,8 +51,15 @@ class TransactionAmountCast implements CastsAttributes
             return CurrencyAccessor::getDefaultCurrency();
         }
 
+        if (isset($this->currencyCache[$bankAccountId])) {
+            return $this->currencyCache[$bankAccountId];
+        }
+
         $bankAccount = BankAccount::find($bankAccountId);
 
-        return $bankAccount?->account?->currency_code ?? CurrencyAccessor::getDefaultCurrency();
+        $currencyCode = $bankAccount?->account?->currency_code ?? CurrencyAccessor::getDefaultCurrency();
+        $this->currencyCache[$bankAccountId] = $currencyCode;
+
+        return $currencyCode;
     }
 }

app/Concerns/Blamable.php

@@ -11,14 +11,16 @@ trait Blamable
     public static function bootBlamable(): void
     {
         static::creating(static function ($model) {
-            $auth = Auth::id();
-            $model->created_by = $auth;
-            $model->updated_by = $auth;
+            if (Auth::check() && $authId = Auth::id()) {
+                $model->created_by = $model->created_by ?? $authId;
+                $model->updated_by = $model->updated_by ?? $authId;
+            }
         });
 
         static::updating(static function ($model) {
-            $auth = Auth::id();
-            $model->updated_by = $auth;
+            if (Auth::check() && $authId = Auth::id()) {
+                $model->updated_by = $authId;
+            }
         });
     }
 

app/Concerns/CompanyOwned.php

@@ -15,12 +15,23 @@ trait CompanyOwned
     {
         static::creating(static function ($model) {
             if (empty($model->company_id)) {
-                if (Auth::check() && Auth::user()->currentCompany) {
-                    $model->company_id = Auth::user()->currentCompany->id;
+                $companyId = session('current_company_id');
+
+                if (! $companyId && Auth::check() && Auth::user()->currentCompany) {
+                    $companyId = Auth::user()->currentCompany->id;
+                    session(['current_company_id' => $companyId]);
+                }
+
+                if (! $companyId) {
+                    $companyId = Auth::user()->currentCompany->id;
+                }
+
+                if ($companyId) {
+                    $model->company_id = $companyId;
                 } else {
-                    Log::info('CompanyOwned trait: No company_id set on model ' . get_class($model) . ' ' . $model->id);
+                    Log::error('CurrentCompanyScope: No company_id found for user ' . Auth::id());
 
-                    throw new ModelNotFoundException('CompanyOwned trait: No company_id set on model ' . get_class($model) . ' ' . $model->id);
+                    throw new ModelNotFoundException('CurrentCompanyScope: No company_id set in the session, user, or database.');
                 }
             }
         });

app/Concerns/HandlesResourceRecordCreation.php

@@ -3,7 +3,6 @@
 namespace App\Concerns;
 
 use App\Models\User;
-use BackedEnum;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
@@ -11,11 +10,8 @@ trait HandlesResourceRecordCreation
 {
     protected function handleRecordCreationWithUniqueField(array $data, Model $model, User $user, ?string $uniqueField = null, ?array $evaluatedTypes = null): Model
     {
-        if (is_array($evaluatedTypes)) {
-            $evaluatedTypes = $this->ensureCreationEnumValues($evaluatedTypes);
-        }
-
-        if ($uniqueField && ! in_array($data[$uniqueField] ?? '', $evaluatedTypes ?? [], true)) {
+        // If evaluatedTypes is provided, ensure the unique field value is within the allowed types
+        if ($uniqueField && $evaluatedTypes && ! in_array($data[$uniqueField] ?? '', $evaluatedTypes, true)) {
             $data['enabled'] = false;
             $instance = $model->newInstance($data);
             $instance->save();
@@ -43,13 +39,6 @@ trait HandlesResourceRecordCreation
         return $instance;
     }
 
-    private function ensureCreationEnumValues(array $evaluatedTypes): array
-    {
-        return array_map(static function ($type) {
-            return $type instanceof BackedEnum ? $type->value : $type;
-        }, $evaluatedTypes);
-    }
-
     private function toggleRecords(Builder $query, bool &$shouldBeEnabled): void
     {
         if ($shouldBeEnabled) {

app/Contracts/AccountHandler.php

@@ -21,7 +21,5 @@ interface AccountHandler
 
     public function getTotalBalanceForAllBankAccounts(string $startDate, string $endDate): Money;
 
-    public function getAccountCategoryOrder(): array;
-
     public function getEarliestTransactionDate(): string;
 }

app/DTO/AccountDTO.php

@@ -9,5 +9,7 @@ class AccountDTO
         public string $accountCode,
         public ?int $accountId,
         public AccountBalanceDTO $balance,
+        public ?string $startDate,
+        public ?string $endDate,
     ) {}
 }

app/Enums/Accounting/AccountCategory.php

@@ -38,4 +38,69 @@ enum AccountCategory: string implements HasLabel
 
         return null;
     }
+
+    /**
+     * Determines if the account typically has a normal debit balance.
+     *
+     * In accounting, assets and expenses typically have a normal debit balance.
+     * A debit increases the balance of these accounts, while a credit decreases it.
+     */
+    public function isNormalDebitBalance(): bool
+    {
+        return in_array($this, [self::Asset, self::Expense], true);
+    }
+
+    /**
+     * Determines if the account typically has a normal credit balance.
+     *
+     * In accounting, liabilities, equity, and revenue typically have a normal credit balance.
+     * A credit increases the balance of these accounts, while a debit decreases it.
+     */
+    public function isNormalCreditBalance(): bool
+    {
+        return ! $this->isNormalDebitBalance();
+    }
+
+    /**
+     * Determines if the account is a nominal account.
+     *
+     * In accounting, nominal accounts are temporary accounts that are closed at the end of each accounting period,
+     * with their net balances transferred to Retained Earnings (a real account).
+     */
+    public function isNominal(): bool
+    {
+        return in_array($this, [self::Revenue, self::Expense], true);
+    }
+
+    /**
+     * Determines if the account is a real account.
+     *
+     * In accounting, real accounts are permanent accounts that retain their balances across accounting periods.
+     * They are not closed at the end of each accounting period.
+     */
+    public function isReal(): bool
+    {
+        return ! $this->isNominal();
+    }
+
+    public function getRelevantBalanceFields(): array
+    {
+        $commonFields = ['debit_balance', 'credit_balance', 'net_movement'];
+
+        return match ($this->isReal()) {
+            true => [...$commonFields, 'starting_balance', 'ending_balance'],
+            false => $commonFields,
+        };
+    }
+
+    public static function getOrderedCategories(): array
+    {
+        return [
+            self::Asset,
+            self::Liability,
+            self::Equity,
+            self::Revenue,
+            self::Expense,
+        ];
+    }
 }

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

@@ -6,12 +6,12 @@ use App\Events\CompanyDefaultUpdated;
 use App\Filament\Company\Clusters\Settings;
 use App\Models\Banking\BankAccount;
 use App\Models\Setting\CompanyDefault as CompanyDefaultModel;
-use App\Models\Setting\Currency;
 use App\Models\Setting\Discount;
 use App\Models\Setting\Tax;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Forms\Components\Component;
+use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
@@ -133,14 +133,10 @@ class CompanyDefault extends Page
                     ->selectablePlaceholder(false)
                     ->searchable()
                     ->preload(),
-                Select::make('currency_code')
-                    ->softRequired()
-                    ->localizeLabel('Currency')
-                    ->relationship('currency', 'name')
-                    ->getOptionLabelFromRecordUsing(static fn (Currency $record) => "{$record->code} {$record->symbol} - {$record->name}")
-                    ->saveRelationshipsUsing(null)
-                    ->searchable()
-                    ->preload(),
+                Placeholder::make('currency_code')
+                    ->label(translate('Currency'))
+                    ->hintIcon('heroicon-o-question-mark-circle', 'You cannot change this after your company has been created. You can still use other currencies for transactions.')
+                    ->content(static fn (CompanyDefaultModel $record) => "{$record->currency->code} {$record->currency->symbol} - {$record->currency->name}"),
             ])->columns();
     }
 

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

@@ -19,7 +19,6 @@ use Filament\Support\Enums\FontWeight;
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Collection;
-use Wallo\FilamentSelectify\Components\ToggleButton;
 
 class CurrencyResource extends Resource
 {
@@ -51,7 +50,6 @@ class CurrencyResource extends Resource
                             ->live()
                             ->required()
                             ->localizeLabel()
-                            ->hidden(static fn (Forms\Get $get, $state): bool => $get('enabled') && $state !== null)
                             ->afterStateUpdated(static function (Forms\Set $set, $state) {
                                 $fields = ['name', 'precision', 'symbol', 'symbol_first', 'decimal_mark', 'thousands_separator'];
 
@@ -71,12 +69,6 @@ class CurrencyResource extends Resource
 
                                 array_walk($fields, static fn ($field) => $set($field, $currencyDetails[$field] ?? null));
                             }),
-                        Forms\Components\TextInput::make('code')
-                            ->localizeLabel()
-                            ->hidden(static fn (Forms\Get $get): bool => ! ($get('enabled') && $get('code') !== null))
-                            ->disabled(static fn (Forms\Get $get): bool => $get('enabled'))
-                            ->dehydrated()
-                            ->required(),
                         Forms\Components\TextInput::make('name')
                             ->localizeLabel()
                             ->maxLength(50)
@@ -86,8 +78,6 @@ class CurrencyResource extends Resource
                             ->rule('gt:0')
                             ->live()
                             ->localizeLabel()
-                            ->disabled(static fn (?CurrencyModel $record): bool => $record?->isEnabled() ?? false)
-                            ->dehydrated()
                             ->required(),
                         Forms\Components\Select::make('precision')
                             ->localizeLabel()
@@ -123,36 +113,6 @@ class CurrencyResource extends Resource
                                 };
                             })
                             ->nullable(),
-                        ToggleButton::make('enabled')
-                            ->localizeLabel('Default')
-                            ->onLabel(CurrencyModel::enabledLabel())
-                            ->offLabel(CurrencyModel::disabledLabel())
-                            ->disabled(static fn (?CurrencyModel $record): bool => $record?->isEnabled() ?? false)
-                            ->dehydrated()
-                            ->live()
-                            ->afterStateUpdated(static function (Forms\Set $set, Forms\Get $get, $state) {
-                                $enabledState = (bool) $state;
-                                $code = $get('code');
-
-                                if (! $code) {
-                                    return;
-                                }
-
-                                if ($enabledState) {
-                                    $set('rate', 1);
-
-                                    return;
-                                }
-
-                                $forexEnabled = Forex::isEnabled();
-                                if ($forexEnabled) {
-                                    $defaultCurrencyCode = CurrencyAccessor::getDefaultCurrency();
-                                    $exchangeRate = Forex::getCachedExchangeRate($defaultCurrencyCode, $code);
-                                    if ($exchangeRate !== null) {
-                                        $set('rate', $exchangeRate);
-                                    }
-                                }
-                            }),
                     ])->columns(),
             ]);
     }
@@ -230,10 +190,7 @@ class CurrencyResource extends Resource
             ])
             ->checkIfRecordIsSelectableUsing(static function (CurrencyModel $record) {
                 return $record->isDisabled();
-            })
-            ->emptyStateActions([
-                Tables\Actions\CreateAction::make(),
-            ]);
+            });
     }
 
     public static function getPages(): array

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

@@ -2,43 +2,15 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\CurrencyResource\Pages;
 
-use App\Concerns\HandlesResourceRecordCreation;
 use App\Filament\Company\Clusters\Settings\Resources\CurrencyResource;
-use App\Models\Setting\Currency;
 use Filament\Resources\Pages\CreateRecord;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Auth;
 
 class CreateCurrency extends CreateRecord
 {
-    use HandlesResourceRecordCreation;
-
     protected static string $resource = CurrencyResource::class;
 
     protected function getRedirectUrl(): string
     {
         return $this->getResource()::getUrl('index');
     }
-
-    protected function mutateFormDataBeforeCreate(array $data): array
-    {
-        $data['enabled'] = (bool) $data['enabled'];
-
-        return $data;
-    }
-
-    /**
-     * @throws Halt
-     */
-    protected function handleRecordCreation(array $data): Model
-    {
-        $user = Auth::user();
-
-        if (! $user) {
-            throw new Halt('No authenticated user found');
-        }
-
-        return $this->handleRecordCreationWithUniqueField($data, new Currency, $user);
-    }
 }

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

@@ -2,19 +2,12 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\CurrencyResource\Pages;
 
-use App\Concerns\HandlesResourceRecordUpdate;
 use App\Filament\Company\Clusters\Settings\Resources\CurrencyResource;
-use App\Models\Setting\Currency;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Auth;
 
 class EditCurrency extends EditRecord
 {
-    use HandlesResourceRecordUpdate;
-
     protected static string $resource = CurrencyResource::class;
 
     protected function getHeaderActions(): array
@@ -28,25 +21,4 @@ class EditCurrency extends EditRecord
     {
         return $this->getResource()::getUrl('index');
     }
-
-    protected function mutateFormDataBeforeSave(array $data): array
-    {
-        $data['enabled'] = (bool) $data['enabled'];
-
-        return $data;
-    }
-
-    /**
-     * @throws Halt
-     */
-    protected function handleRecordUpdate(Model | Currency $record, array $data): Model | Currency
-    {
-        $user = Auth::user();
-
-        if (! $user) {
-            throw new Halt('No authenticated user found');
-        }
-
-        return $this->handleRecordUpdateWithUniqueField($record, $data, $user);
-    }
 }

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

@@ -10,6 +10,7 @@ use App\Facades\Accounting;
 use App\Filament\Company\Pages\Service\ConnectedAccount;
 use App\Filament\Forms\Components\DateRangeSelect;
 use App\Filament\Forms\Components\JournalEntryRepeater;
+use App\Filament\Tables\Actions\ReplicateBulkAction;
 use App\Models\Accounting\Account;
 use App\Models\Accounting\JournalEntry;
 use App\Models\Accounting\Transaction;
@@ -216,6 +217,12 @@ class Transactions extends Page implements HasTable
         return $table
             ->query(static::getEloquentQuery())
             ->modifyQueryUsing(function (Builder $query) {
+                $query->with([
+                    'account',
+                    'bankAccount.account',
+                    'journalEntries.account',
+                ]);
+
                 if ($this->bankAccountIdFiltered !== 'all') {
                     $query->where('bank_account_id', $this->bankAccountIdFiltered);
                 }
@@ -224,7 +231,7 @@ class Transactions extends Page implements HasTable
                 Tables\Columns\TextColumn::make('posted_at')
                     ->label('Date')
                     ->sortable()
-                    ->localizeDate(),
+                    ->defaultDateFormat(),
                 Tables\Columns\TextColumn::make('description')
                     ->label('Description')
                     ->limit(30)
@@ -373,8 +380,17 @@ class Transactions extends Page implements HasTable
                     Tables\Actions\ReplicateAction::make()
                         ->excludeAttributes(['created_by', 'updated_by', 'created_at', 'updated_at'])
                         ->modal(false)
-                        ->beforeReplicaSaved(static function (Transaction $transaction) {
-                            $transaction->description = '(Copy of) ' . $transaction->description;
+                        ->beforeReplicaSaved(static function (Transaction $replica) {
+                            $replica->description = '(Copy of) ' . $replica->description;
+                        })
+                        ->after(static function (Transaction $original, Transaction $replica) {
+                            $original->journalEntries->each(function (JournalEntry $entry) use ($replica) {
+                                $entry->replicate([
+                                    'transaction_id',
+                                ])->fill([
+                                    'transaction_id' => $replica->id,
+                                ])->save();
+                            });
                         }),
                 ])
                     ->dropdownPlacement('bottom-start')
@@ -383,6 +399,18 @@ class Transactions extends Page implements HasTable
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([
                     Tables\Actions\DeleteBulkAction::make(),
+                    ReplicateBulkAction::make()
+                        ->label('Replicate')
+                        ->modalWidth(MaxWidth::Large)
+                        ->modalDescription('Replicating transactions will also replicate their journal entries. Are you sure you want to proceed?')
+                        ->successNotificationTitle('Transactions Replicated Successfully')
+                        ->failureNotificationTitle('Failed to Replicate Transactions')
+                        ->deselectRecordsAfterCompletion()
+                        ->excludeAttributes(['created_by', 'updated_by', 'created_at', 'updated_at'])
+                        ->beforeReplicaSaved(static function (Transaction $replica) {
+                            $replica->description = '(Copy of) ' . $replica->description;
+                        })
+                        ->withReplicatedRelationships(['journalEntries']),
                 ]),
             ]);
     }
@@ -630,14 +658,12 @@ class Transactions extends Page implements HasTable
                             ->endDateField("{$fieldPrefix}_end_date"),
                         DatePicker::make("{$fieldPrefix}_start_date")
                             ->label("{$label} From")
-                            ->displayFormat('Y-m-d')
                             ->columnStart(1)
                             ->afterStateUpdated(static function (Set $set) use ($fieldPrefix) {
                                 $set("{$fieldPrefix}_date_range", 'Custom');
                             }),
                         DatePicker::make("{$fieldPrefix}_end_date")
                             ->label("{$label} To")
-                            ->displayFormat('Y-m-d')
                             ->afterStateUpdated(static function (Set $set) use ($fieldPrefix) {
                                 $set("{$fieldPrefix}_date_range", 'Custom');
                             }),

app/Filament/Company/Pages/Concerns/HasDeferredFiltersForm.php

@@ -0,0 +1,179 @@
+<?php
+
+namespace App\Filament\Company\Pages\Concerns;
+
+use Filament\Actions\Action;
+use Filament\Forms\Components\DatePicker;
+use Filament\Forms\Form;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Carbon;
+
+trait HasDeferredFiltersForm
+{
+    /**
+     * @var array<string, mixed> | null
+     */
+    public ?array $filters = null;
+
+    /**
+     * @var array<string, mixed> | null
+     */
+    public ?array $deferredFilters = null;
+
+    public function mountHasDeferredFiltersForm(): void
+    {
+        $this->initializeDefaultFilters();
+
+        $this->initializeFilters();
+    }
+
+    protected function initializeDefaultFilters(): void
+    {
+        //
+    }
+
+    public function initializeFilters(): void
+    {
+        if (! count($this->filters ?? [])) {
+            $this->filters = null;
+        }
+
+        $this->getFiltersForm()->fill($this->filters);
+    }
+
+    protected function getHasDeferredFiltersFormForms(): array
+    {
+        return [
+            'filtersForm' => $this->getFiltersForm(),
+        ];
+    }
+
+    public function filtersForm(Form $form): Form
+    {
+        return $form;
+    }
+
+    public function getFiltersForm(): Form
+    {
+        return $this->filtersForm($this->makeForm()
+            ->statePath('deferredFilters'));
+    }
+
+    public function updatedFilters(): void
+    {
+        $this->deferredFilters = $this->filters;
+    }
+
+    protected function isValidDate($date): bool
+    {
+        return strtotime($date) !== false;
+    }
+
+    public function applyFilters(): void
+    {
+        $this->filters = $this->deferredFilters;
+
+        $this->loadReportData();
+    }
+
+    public function applyFiltersAction(): Action
+    {
+        return Action::make('applyFilters')
+            ->label('Update Report')
+            ->action('applyFilters')
+            ->keyBindings(['mod+s'])
+            ->button();
+    }
+
+    public function getFilterState(string $name): mixed
+    {
+        return Arr::get($this->filters, $name);
+    }
+
+    public function setFilterState(string $name, mixed $value): void
+    {
+        Arr::set($this->filters, $name, $value);
+    }
+
+    public function getDeferredFilterState(string $name): mixed
+    {
+        return Arr::get($this->deferredFilters, $name);
+    }
+
+    public function setDeferredFilterState(string $name, mixed $value): void
+    {
+        Arr::set($this->deferredFilters, $name, $value);
+    }
+
+    protected function convertDatesToDateTimeString(array $filters): array
+    {
+        if (isset($filters['startDate'])) {
+            $filters['startDate'] = Carbon::parse($filters['startDate'])->startOfDay()->toDateTimeString();
+        }
+
+        if (isset($filters['endDate'])) {
+            $filters['endDate'] = Carbon::parse($filters['endDate'])->endOfDay()->toDateTimeString();
+        }
+
+        return $filters;
+    }
+
+    protected function queryStringHasDeferredFiltersForm(): array
+    {
+        // Get the filter keys dynamically from the filters form
+        $filterKeys = collect($this->getFiltersForm()->getFlatFields())->keys()->toArray();
+
+        return array_merge(
+            $this->generateQueryStrings($filterKeys),
+            $this->generateExcludedQueryStrings(),
+        );
+    }
+
+    protected function generateQueryStrings(array $filterKeys): array
+    {
+        $generatedQueryStrings = [];
+
+        $excludedKeys = $this->excludeQueryStrings();
+
+        foreach ($filterKeys as $key) {
+            if (! in_array($key, $excludedKeys)) {
+                $generatedQueryStrings["filters.{$key}"] = [
+                    'as' => $key,
+                    'keep' => true,
+                ];
+            }
+        }
+
+        return $generatedQueryStrings;
+    }
+
+    protected function generateExcludedQueryStrings(): array
+    {
+        $excludedQueryStrings = [];
+
+        foreach ($this->excludeQueryStrings() as $key) {
+            $excludedQueryStrings["filters.{$key}.value"] = null;
+        }
+
+        return $excludedQueryStrings;
+    }
+
+    protected function excludeQueryStrings(): array
+    {
+        return [
+            'dateRange',
+        ];
+    }
+
+    public function dehydrateHasDeferredFiltersForm(): void
+    {
+        $flatFields = $this->getFiltersForm()->getFlatFields();
+
+        foreach ($this->filters as $key => $value) {
+            if (isset($flatFields[$key]) && $flatFields[$key] instanceof DatePicker) {
+                // TODO: Submit a PR to Filament to address DatePicker being dehydrated as a datetime string in filters
+                $this->filters[$key] = Carbon::parse($value)->toDateString();
+            }
+        }
+    }
+}

app/Filament/Company/Pages/Concerns/HasFiltersForm.php

@@ -0,0 +1,133 @@
+<?php
+
+namespace App\Filament\Company\Pages\Concerns;
+
+use Filament\Actions\Action;
+use Filament\Forms\Form;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Carbon;
+use Livewire\Attributes\Url;
+
+trait HasFiltersForm
+{
+    /**
+     * @var array<string, mixed> | null
+     */
+    #[Url(keep: true)]
+    public ?array $filters = null;
+
+    /**
+     * @var array<string, mixed> | null
+     */
+    public ?array $deferredFilters = null;
+
+    public function mountHasFiltersForm(): void
+    {
+        if (method_exists($this, 'loadDefaultDateRange')) {
+            $this->loadDefaultDateRange();
+        }
+
+        $this->initializeFilters();
+    }
+
+    public function initializeFilters(): void
+    {
+        if (! count($this->filters ?? [])) {
+            $this->filters = null;
+        }
+
+        $this->getFiltersForm()->fill($this->filters ?? []);
+
+        $this->applyFilters();
+    }
+
+    protected function getForms(): array
+    {
+        return [
+            'toggledTableColumnForm',
+            'filtersForm' => $this->getFiltersForm(),
+        ];
+    }
+
+    public function filtersForm(Form $form): Form
+    {
+        return $form;
+    }
+
+    public function getFiltersForm(): Form
+    {
+        return $this->filtersForm($this->makeForm()
+            ->statePath('deferredFilters'));
+    }
+
+    public function updatedFilters(): void
+    {
+        $this->deferredFilters = $this->filters;
+
+        $this->handleFilterUpdates();
+    }
+
+    protected function isValidDate($date): bool
+    {
+        return strtotime($date) !== false;
+    }
+
+    protected function handleFilterUpdates(): void
+    {
+        //
+    }
+
+    public function applyFilters(): void
+    {
+        $normalizedFilters = $this->deferredFilters;
+
+        $this->normalizeFilters($normalizedFilters);
+
+        $this->filters = $normalizedFilters;
+
+        $this->handleFilterUpdates();
+
+        if (method_exists($this, 'loadReportData')) {
+            $this->loadReportData();
+        }
+    }
+
+    protected function normalizeFilters(array &$filters): void
+    {
+        foreach ($filters as $name => &$value) {
+            if ($name === 'dateRange') {
+                unset($filters[$name]);
+            } elseif ($this->isValidDate($value)) {
+                $filters[$name] = Carbon::parse($value)->toDateString();
+            }
+        }
+    }
+
+    public function getFiltersApplyAction(): Action
+    {
+        return Action::make('applyFilters')
+            ->label(__('filament-tables::table.filters.actions.apply.label'))
+            ->action('applyFilters')
+            ->button();
+    }
+
+    public function getFilterState(string $name): mixed
+    {
+        return Arr::get($this->filters, $name);
+    }
+
+    public function setFilterState(string $name, mixed $value): void
+    {
+        Arr::set($this->filters, $name, $value);
+    }
+
+    public function getDeferredFilterState(string $name): mixed
+    {
+        return Arr::get($this->deferredFilters, $name);
+    }
+
+    public function setDeferredFilterState(string $name, mixed $value): void
+    {
+        Arr::set($this->deferredFilters, $name, $value);
+    }
+}

app/Filament/Company/Pages/Concerns/HasToggleTableColumnForm.php

@@ -0,0 +1,106 @@
+<?php
+
+namespace App\Filament\Company\Pages\Concerns;
+
+use App\Support\Column;
+use Filament\Actions\Action;
+use Filament\Forms\Components\Checkbox;
+use Filament\Forms\Form;
+use Filament\Support\Enums\ActionSize;
+use Filament\Support\Facades\FilamentIcon;
+use Livewire\Attributes\Session;
+
+trait HasToggleTableColumnForm
+{
+    #[Session]
+    public array $toggledTableColumns = [];
+
+    public function mountHasToggleTableColumnForm(): void
+    {
+        $this->loadDefaultTableColumnToggleState();
+    }
+
+    protected function getHasToggleTableColumnFormForms(): array
+    {
+        return [
+            'toggleTableColumnForm' => $this->getToggleTableColumnForm(),
+        ];
+    }
+
+    public function getToggleTableColumnForm(): Form
+    {
+        return $this->toggleTableColumnForm($this->makeForm()
+            ->statePath('toggledTableColumns'));
+    }
+
+    public function toggleTableColumnForm(Form $form): Form
+    {
+        return $form;
+    }
+
+    protected function hasToggleableColumns(): bool
+    {
+        return ! empty($this->getTableColumnToggleFormSchema());
+    }
+
+    /**
+     * @return array<Checkbox>
+     */
+    protected function getTableColumnToggleFormSchema(): array
+    {
+        $schema = [];
+
+        foreach ($this->getTable() as $column) {
+            if ($column->isToggleable()) {
+                $schema[] = Checkbox::make($column->getName())
+                    ->label($column->getLabel());
+            }
+        }
+
+        return $schema;
+    }
+
+    public function toggleColumnsAction(): Action
+    {
+        return Action::make('toggleColumns')
+            ->label(__('filament-tables::table.actions.toggle_columns.label'))
+            ->iconButton()
+            ->size(ActionSize::Large)
+            ->icon(FilamentIcon::resolve('tables::actions.toggle-columns') ?? 'heroicon-m-view-columns')
+            ->color('gray');
+    }
+
+    protected function loadDefaultTableColumnToggleState(): void
+    {
+        $tableColumns = $this->getTable();
+
+        foreach ($tableColumns as $column) {
+            $columnName = $column->getName();
+
+            if (empty($this->toggledTableColumns)) {
+                if ($column->isToggleable()) {
+                    $this->toggledTableColumns[$columnName] = ! $column->isToggledHiddenByDefault();
+                } else {
+                    $this->toggledTableColumns[$columnName] = true;
+                }
+            }
+
+            // Handle cases where the toggle state needs to be reset
+            if (! $column->isToggleable()) {
+                $this->toggledTableColumns[$columnName] = true;
+            } elseif ($column->isToggleable() && $column->isToggledHiddenByDefault() && isset($this->toggledTableColumns[$columnName]) && $this->toggledTableColumns[$columnName]) {
+                $this->toggledTableColumns[$columnName] = false;
+            }
+        }
+    }
+
+    protected function getToggledColumns(): array
+    {
+        return array_values(
+            array_filter(
+                $this->getTable(),
+                fn (Column $column) => $this->toggledTableColumns[$column->getName()] ?? false,
+            )
+        );
+    }
+}

app/Filament/Company/Pages/Reports.php

@@ -4,6 +4,7 @@ namespace App\Filament\Company\Pages;
 
 use App\Filament\Company\Pages\Reports\AccountBalances;
 use App\Filament\Company\Pages\Reports\AccountTransactions;
+use App\Filament\Company\Pages\Reports\IncomeStatement;
 use App\Filament\Company\Pages\Reports\TrialBalance;
 use App\Infolists\Components\ReportEntry;
 use Filament\Infolists\Components\Section;
@@ -22,9 +23,36 @@ class Reports extends Page
         return $infolist
             ->state([])
             ->schema([
+                Section::make('Financial Statements')
+                    ->aside()
+                    ->description('Key financial statements that provide a snapshot of your company’s financial health.')
+                    ->extraAttributes(['class' => 'es-report-card'])
+                    ->schema([
+                        ReportEntry::make('income_statement')
+                            ->hiddenLabel()
+                            ->heading('Income Statement')
+                            ->description('Tracks revenue and expenses to show profit or loss over a specific period of time.')
+                            ->icon('heroicon-o-chart-bar')
+                            ->iconColor(Color::Indigo)
+                            ->url(IncomeStatement::getUrl()),
+                        ReportEntry::make('balance_sheet')
+                            ->hiddenLabel()
+                            ->heading('Balance Sheet')
+                            ->description('Snapshot of assets, liabilities, and equity at a specific point in time.')
+                            ->icon('heroicon-o-clipboard-document-list')
+                            ->iconColor(Color::Emerald)
+                            ->url('#'),
+                        ReportEntry::make('cash_flow_statement')
+                            ->hiddenLabel()
+                            ->heading('Cash Flow Statement')
+                            ->description('Shows cash inflows and outflows over a specific period of time.')
+                            ->icon('heroicon-o-document-currency-dollar')
+                            ->iconColor(Color::Cyan)
+                            ->url('#'),
+                    ]),
                 Section::make('Detailed Reports')
                     ->aside()
-                    ->description('Dig into the details of your business’s transactions, balances, and accounts.')
+                    ->description('Dig into the details of your company’s transactions, balances, and accounts.')
                     ->extraAttributes(['class' => 'es-report-card'])
                     ->schema([
                         ReportEntry::make('account_balances')

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

@@ -67,12 +67,11 @@ class AccountBalances extends BaseReportPage
         ];
     }
 
-    public function form(Form $form): Form
+    public function filtersForm(Form $form): Form
     {
         return $form
             ->inlineLabel()
             ->columns()
-            ->live()
             ->schema([
                 $this->getDateRangeFormComponent(),
                 Cluster::make([
@@ -84,7 +83,7 @@ class AccountBalances extends BaseReportPage
 
     protected function buildReport(array $columns): ReportDTO
     {
-        return $this->reportService->buildAccountBalanceReport($this->startDate, $this->endDate, $columns);
+        return $this->reportService->buildAccountBalanceReport($this->getFormattedStartDate(), $this->getFormattedEndDate(), $columns);
     }
 
     protected function getTransformer(ReportDTO $reportDTO): ExportableReport
@@ -94,11 +93,11 @@ class AccountBalances extends BaseReportPage
 
     public function exportCSV(): StreamedResponse
     {
-        return $this->exportService->exportToCsv($this->company, $this->report, $this->startDate, $this->endDate);
+        return $this->exportService->exportToCsv($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
     }
 
     public function exportPDF(): StreamedResponse
     {
-        return $this->exportService->exportToPdf($this->company, $this->report, $this->startDate, $this->endDate);
+        return $this->exportService->exportToPdf($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
     }
 }

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

@@ -14,11 +14,11 @@ use Filament\Forms\Components\Actions;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
 use Filament\Support\Enums\Alignment;
+use Filament\Support\Enums\MaxWidth;
 use Filament\Tables\Actions\Action;
 use Guava\FilamentClusters\Forms\Cluster;
 use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Support\Collection;
-use Livewire\Attributes\Url;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class AccountTransactions extends BaseReportPage
@@ -33,15 +33,24 @@ class AccountTransactions extends BaseReportPage
 
     protected ExportService $exportService;
 
-    #[Url]
-    public ?string $account_id = 'all';
-
     public function boot(ReportService $reportService, ExportService $exportService): void
     {
         $this->reportService = $reportService;
         $this->exportService = $exportService;
     }
 
+    public function getMaxContentWidth(): MaxWidth | string | null
+    {
+        return 'max-w-[90rem]';
+    }
+
+    protected function initializeDefaultFilters(): void
+    {
+        if (empty($this->getFilterState('selectedAccount'))) {
+            $this->setFilterState('selectedAccount', 'all');
+        }
+    }
+
     /**
      * @return array<Column>
      */
@@ -50,6 +59,7 @@ class AccountTransactions extends BaseReportPage
         return [
             Column::make('date')
                 ->label('Date')
+                ->markAsDate()
                 ->alignment(Alignment::Left),
             Column::make('description')
                 ->label('Description')
@@ -66,13 +76,12 @@ class AccountTransactions extends BaseReportPage
         ];
     }
 
-    public function form(Form $form): Form
+    public function filtersForm(Form $form): Form
     {
         return $form
             ->columns(4)
-            ->live()
             ->schema([
-                Select::make('account_id')
+                Select::make('selectedAccount')
                     ->label('Account')
                     ->options($this->getAccountOptions())
                     ->selectablePlaceholder(false)
@@ -83,10 +92,11 @@ class AccountTransactions extends BaseReportPage
                     $this->getEndDateFormComponent(),
                 ])->label("\u{200B}"), // its too bad hiddenLabel removes spacing of the label
                 Actions::make([
-                    Actions\Action::make('loadReportData')
+                    Actions\Action::make('applyFilters')
                         ->label('Update Report')
-                        ->submit('loadReportData')
-                        ->keyBindings(['mod+s']),
+                        ->action('applyFilters')
+                        ->keyBindings(['mod+s'])
+                        ->button(),
                 ])->alignEnd()->verticallyAlignEnd(),
             ]);
     }
@@ -96,7 +106,7 @@ class AccountTransactions extends BaseReportPage
         $accounts = Account::query()
             ->get()
             ->groupBy(fn (Account $account) => $account->category->getPluralLabel())
-            ->map(fn (Collection $accounts, string $category) => $accounts->pluck('name', 'id'))
+            ->map(fn (Collection $accounts) => $accounts->pluck('name', 'id'))
             ->toArray();
 
         $allAccountsOption = [
@@ -108,7 +118,7 @@ class AccountTransactions extends BaseReportPage
 
     protected function buildReport(array $columns): ReportDTO
     {
-        return $this->reportService->buildAccountTransactionsReport($this->startDate, $this->endDate, $columns, $this->account_id);
+        return $this->reportService->buildAccountTransactionsReport($this->getFormattedStartDate(), $this->getFormattedEndDate(), $columns, $this->getFilterState('selectedAccount'));
     }
 
     protected function getTransformer(ReportDTO $reportDTO): ExportableReport
@@ -118,12 +128,12 @@ class AccountTransactions extends BaseReportPage
 
     public function exportCSV(): StreamedResponse
     {
-        return $this->exportService->exportToCsv($this->company, $this->report, $this->startDate, $this->endDate);
+        return $this->exportService->exportToCsv($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
     }
 
     public function exportPDF(): StreamedResponse
     {
-        return $this->exportService->exportToPdf($this->company, $this->report, $this->startDate, $this->endDate);
+        return $this->exportService->exportToPdf($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
     }
 
     public function getEmptyStateHeading(): string | Htmlable

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

@@ -4,45 +4,38 @@ namespace App\Filament\Company\Pages\Reports;
 
 use App\Contracts\ExportableReport;
 use App\DTO\ReportDTO;
+use App\Filament\Company\Pages\Concerns\HasDeferredFiltersForm;
+use App\Filament\Company\Pages\Concerns\HasToggleTableColumnForm;
 use App\Filament\Forms\Components\DateRangeSelect;
 use App\Models\Company;
+use App\Services\DateRangeService;
 use App\Support\Column;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
-use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Component;
 use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Form;
 use Filament\Forms\Set;
 use Filament\Pages\Page;
-use Filament\Support\Enums\ActionSize;
 use Filament\Support\Enums\IconPosition;
 use Filament\Support\Enums\IconSize;
-use Filament\Support\Facades\FilamentIcon;
 use Illuminate\Support\Carbon;
 use Livewire\Attributes\Computed;
-use Livewire\Attributes\Session;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 abstract class BaseReportPage extends Page
 {
-    public string $startDate = '';
+    use HasDeferredFiltersForm;
+    use HasToggleTableColumnForm;
 
-    public string $endDate = '';
+    public string $fiscalYearStartDate;
 
-    public string $dateRange = '';
-
-    public string $fiscalYearStartDate = '';
-
-    public string $fiscalYearEndDate = '';
+    public string $fiscalYearEndDate;
 
     public Company $company;
 
     public bool $reportLoaded = false;
 
-    #[Session]
-    public array $toggledTableColumns = [];
-
     abstract protected function buildReport(array $columns): ReportDTO;
 
     abstract public function exportCSV(): StreamedResponse;
@@ -61,16 +54,6 @@ abstract class BaseReportPage extends Page
         $this->initializeProperties();
 
         $this->loadDefaultDateRange();
-
-        $this->loadDefaultTableColumnToggleState();
-    }
-
-    protected function getForms(): array
-    {
-        return [
-            'toggleTableColumnForm',
-            'form',
-        ];
     }
 
     protected function initializeProperties(): void
@@ -82,8 +65,14 @@ abstract class BaseReportPage extends Page
 
     protected function loadDefaultDateRange(): void
     {
-        if (empty($this->dateRange)) {
-            $this->dateRange = $this->getDefaultDateRange();
+        $startDate = $this->getFilterState('startDate');
+        $endDate = $this->getFilterState('endDate');
+
+        if ($this->isValidDate($startDate) && $this->isValidDate($endDate)) {
+            $matchingDateRange = app(DateRangeService::class)->getMatchingDateRangeOption(Carbon::parse($startDate), Carbon::parse($endDate));
+            $this->setFilterState('dateRange', $matchingDateRange);
+        } else {
+            $this->setFilterState('dateRange', $this->getDefaultDateRange());
             $this->setDateRange(Carbon::parse($this->fiscalYearStartDate), Carbon::parse($this->fiscalYearEndDate));
         }
     }
@@ -91,37 +80,8 @@ abstract class BaseReportPage extends Page
     public function loadReportData(): void
     {
         unset($this->report);
-        $this->reportLoaded = true;
-    }
 
-    protected function loadDefaultTableColumnToggleState(): void
-    {
-        $tableColumns = $this->getTable();
-
-        if (empty($this->toggledTableColumns)) {
-            foreach ($tableColumns as $column) {
-                if ($column->isToggleable()) {
-                    if ($column->isToggledHiddenByDefault()) {
-                        $this->toggledTableColumns[$column->getName()] = false;
-                    } else {
-                        $this->toggledTableColumns[$column->getName()] = true;
-                    }
-                } else {
-                    $this->toggledTableColumns[$column->getName()] = true;
-                }
-            }
-        }
-
-        foreach ($tableColumns as $column) {
-            $columnName = $column->getName();
-            if (! $column->isToggleable()) {
-                $this->toggledTableColumns[$columnName] = true;
-            }
-
-            if ($column->isToggleable() && $column->isToggledHiddenByDefault() && isset($this->toggledTableColumns[$columnName]) && $this->toggledTableColumns[$columnName]) {
-                $this->toggledTableColumns[$columnName] = false;
-            }
-        }
+        $this->reportLoaded = true;
     }
 
     public function getDefaultDateRange(): string
@@ -129,16 +89,6 @@ abstract class BaseReportPage extends Page
         return 'FY-' . now()->year;
     }
 
-    protected function getToggledColumns(): array
-    {
-        return array_values(
-            array_filter(
-                $this->getTable(),
-                fn (Column $column) => $this->toggledTableColumns[$column->getName()] ?? false,
-            )
-        );
-    }
-
     #[Computed(persist: true)]
     public function report(): ?ExportableReport
     {
@@ -154,47 +104,24 @@ abstract class BaseReportPage extends Page
 
     public function setDateRange(Carbon $start, Carbon $end): void
     {
-        $this->startDate = $start->toDateString();
-        $this->endDate = $end->isFuture() ? now()->toDateString() : $end->toDateString();
-    }
-
-    public function toggleColumnsAction(): Action
-    {
-        return Action::make('toggleColumns')
-            ->label(__('filament-tables::table.actions.toggle_columns.label'))
-            ->iconButton()
-            ->size(ActionSize::Large)
-            ->icon(FilamentIcon::resolve('tables::actions.toggle-columns') ?? 'heroicon-m-view-columns')
-            ->color('gray');
+        $this->setFilterState('startDate', $start->startOfDay()->toDateTimeString());
+        $this->setFilterState('endDate', $end->isFuture() ? now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
     }
 
-    public function toggleTableColumnForm(Form $form): Form
+    public function getFormattedStartDate(): string
     {
-        return $form
-            ->schema($this->getTableColumnToggleFormSchema())
-            ->statePath('toggledTableColumns');
+        return Carbon::parse($this->getFilterState('startDate'))->startOfDay()->toDateTimeString();
     }
 
-    protected function hasToggleableColumns(): bool
+    public function getFormattedEndDate(): string
     {
-        return ! empty($this->getTableColumnToggleFormSchema());
+        return Carbon::parse($this->getFilterState('endDate'))->endOfDay()->toDateTimeString();
     }
 
-    /**
-     * @return array<Checkbox>
-     */
-    protected function getTableColumnToggleFormSchema(): array
+    public function toggleTableColumnForm(Form $form): Form
     {
-        $schema = [];
-
-        foreach ($this->getTable() as $column) {
-            if ($column->isToggleable()) {
-                $schema[] = Checkbox::make($column->getName())
-                    ->label($column->getLabel());
-            }
-        }
-
-        return $schema;
+        return $form
+            ->schema($this->getTableColumnToggleFormSchema());
     }
 
     protected function getHeaderActions(): array
@@ -228,18 +155,12 @@ abstract class BaseReportPage extends Page
             ->endDateField('endDate');
     }
 
-    protected function resetDateRange(): void
-    {
-        $this->dateRange = $this->getDefaultDateRange();
-        $this->setDateRange(Carbon::parse($this->fiscalYearStartDate), Carbon::parse($this->fiscalYearEndDate));
-    }
-
     protected function getStartDateFormComponent(): Component
     {
         return DatePicker::make('startDate')
             ->label('Start Date')
-            ->displayFormat('Y-m-d')
-            ->afterStateUpdated(static function (Set $set) {
+            ->live()
+            ->afterStateUpdated(static function ($state, Set $set) {
                 $set('dateRange', 'Custom');
             });
     }
@@ -248,7 +169,7 @@ abstract class BaseReportPage extends Page
     {
         return DatePicker::make('endDate')
             ->label('End Date')
-            ->displayFormat('Y-m-d')
+            ->live()
             ->afterStateUpdated(static function (Set $set) {
                 $set('dateRange', 'Custom');
             });

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

@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Filament\Company\Pages\Reports;
+
+use App\Contracts\ExportableReport;
+use App\DTO\ReportDTO;
+use App\Services\ExportService;
+use App\Services\ReportService;
+use App\Support\Column;
+use App\Transformers\IncomeStatementReportTransformer;
+use Filament\Forms\Form;
+use Filament\Support\Enums\Alignment;
+use Guava\FilamentClusters\Forms\Cluster;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class IncomeStatement extends BaseReportPage
+{
+    protected static string $view = 'filament.company.pages.reports.income-statement';
+
+    protected static ?string $slug = 'reports/income-statement';
+
+    protected static bool $shouldRegisterNavigation = false;
+
+    protected ReportService $reportService;
+
+    protected ExportService $exportService;
+
+    public function boot(ReportService $reportService, ExportService $exportService): void
+    {
+        $this->reportService = $reportService;
+        $this->exportService = $exportService;
+    }
+
+    public function getTable(): array
+    {
+        return [
+            Column::make('account_code')
+                ->label('Account Code')
+                ->toggleable()
+                ->alignment(Alignment::Center),
+            Column::make('account_name')
+                ->label('Account')
+                ->alignment(Alignment::Left),
+            Column::make('net_movement')
+                ->label('Amount')
+                ->alignment(Alignment::Right),
+        ];
+    }
+
+    public function filtersForm(Form $form): Form
+    {
+        return $form
+            ->inlineLabel()
+            ->columns()
+            ->schema([
+                $this->getDateRangeFormComponent(),
+                Cluster::make([
+                    $this->getStartDateFormComponent(),
+                    $this->getEndDateFormComponent(),
+                ])->hiddenLabel(),
+            ]);
+    }
+
+    protected function buildReport(array $columns): ReportDTO
+    {
+        return $this->reportService->buildIncomeStatementReport($this->getFormattedStartDate(), $this->getFormattedEndDate(), $columns);
+    }
+
+    protected function getTransformer(ReportDTO $reportDTO): ExportableReport
+    {
+        return new IncomeStatementReportTransformer($reportDTO);
+    }
+
+    public function exportCSV(): StreamedResponse
+    {
+        return $this->exportService->exportToCsv($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
+    }
+
+    public function exportPDF(): StreamedResponse
+    {
+        return $this->exportService->exportToPdf($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
+    }
+}

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

@@ -50,15 +50,11 @@ class TrialBalance extends BaseReportPage
         ];
     }
 
-    public function form(Form $form): Form
+    public function filtersForm(Form $form): Form
     {
         return $form
             ->inlineLabel()
-            ->columns([
-                'lg' => 1,
-                '2xl' => 2,
-            ])
-            ->live()
+            ->columns()
             ->schema([
                 $this->getDateRangeFormComponent(),
                 Cluster::make([
@@ -70,7 +66,7 @@ class TrialBalance extends BaseReportPage
 
     protected function buildReport(array $columns): ReportDTO
     {
-        return $this->reportService->buildTrialBalanceReport($this->startDate, $this->endDate, $columns);
+        return $this->reportService->buildTrialBalanceReport($this->getFormattedStartDate(), $this->getFormattedEndDate(), $columns);
     }
 
     protected function getTransformer(ReportDTO $reportDTO): ExportableReport
@@ -80,11 +76,11 @@ class TrialBalance extends BaseReportPage
 
     public function exportCSV(): StreamedResponse
     {
-        return $this->exportService->exportToCsv($this->company, $this->report, $this->startDate, $this->endDate);
+        return $this->exportService->exportToCsv($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
     }
 
     public function exportPDF(): StreamedResponse
     {
-        return $this->exportService->exportToPdf($this->company, $this->report, $this->startDate, $this->endDate);
+        return $this->exportService->exportToPdf($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
     }
 }

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

@@ -15,6 +15,7 @@ use Filament\Support\Enums\Alignment;
 use Filament\Support\Enums\FontWeight;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Validation\Rules\Unique;
@@ -44,6 +45,7 @@ class AccountResource extends Resource
                             ->localizeLabel()
                             ->searchable()
                             ->columnSpan(1)
+                            ->disabledOn('edit')
                             ->default(BankAccountType::DEFAULT)
                             ->live()
                             ->afterStateUpdated(static function (Forms\Set $set, $state, ?BankAccount $bankAccount, string $operation) {
@@ -64,6 +66,7 @@ class AccountResource extends Resource
                             ->schema([
                                 Forms\Components\Select::make('subtype_id')
                                     ->options(static fn (Forms\Get $get) => static::groupSubtypesBySubtypeType(BankAccountType::parse($get('data.type', true))))
+                                    ->disabledOn('edit')
                                     ->localizeLabel()
                                     ->searchable()
                                     ->live()
@@ -79,6 +82,7 @@ class AccountResource extends Resource
                                     ->localizeLabel()
                                     ->required(),
                                 CreateCurrencySelect::make('currency_code')
+                                    ->disabledOn('edit')
                                     ->relationship('currency', 'name'),
                             ]),
                         Forms\Components\Group::make()
@@ -104,6 +108,12 @@ class AccountResource extends Resource
     public static function table(Table $table): Table
     {
         return $table
+            ->modifyQueryUsing(function (Builder $query) {
+                $query->with([
+                    'account',
+                    'account.subtype',
+                ]);
+            })
             ->columns([
                 Tables\Columns\TextColumn::make('account.name')
                     ->localizeLabel('Account')
@@ -138,10 +148,7 @@ class AccountResource extends Resource
             ])
             ->checkIfRecordIsSelectableUsing(static function (BankAccount $record) {
                 return $record->isDisabled();
-            })
-            ->emptyStateActions([
-                Tables\Actions\CreateAction::make(),
-            ]);
+            });
     }
 
     public static function getPages(): array

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

@@ -2,11 +2,18 @@
 
 namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
 
+use App\Concerns\HandlesResourceRecordCreation;
 use App\Filament\Company\Resources\Banking\AccountResource;
+use App\Models\Banking\BankAccount;
 use Filament\Resources\Pages\CreateRecord;
+use Filament\Support\Exceptions\Halt;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
 
 class CreateAccount extends CreateRecord
 {
+    use HandlesResourceRecordCreation;
+
     protected static string $resource = AccountResource::class;
 
     protected function getRedirectUrl(): string
@@ -20,4 +27,18 @@ class CreateAccount extends CreateRecord
 
         return $data;
     }
+
+    /**
+     * @throws Halt
+     */
+    protected function handleRecordCreation(array $data): Model
+    {
+        $user = Auth::user();
+
+        if (! $user) {
+            throw new Halt('No authenticated user found');
+        }
+
+        return $this->handleRecordCreationWithUniqueField($data, new BankAccount, $user);
+    }
 }

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

@@ -5,6 +5,9 @@ namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
 use App\Concerns\HandlesResourceRecordUpdate;
 use App\Filament\Company\Resources\Banking\AccountResource;
 use Filament\Resources\Pages\EditRecord;
+use Filament\Support\Exceptions\Halt;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
 
 class EditAccount extends EditRecord
 {
@@ -30,4 +33,18 @@ class EditAccount extends EditRecord
 
         return $data;
     }
+
+    /**
+     * @throws Halt
+     */
+    protected function handleRecordUpdate(Model $record, array $data): Model
+    {
+        $user = Auth::user();
+
+        if (! $user) {
+            throw new Halt('No authenticated user found');
+        }
+
+        return $this->handleRecordUpdateWithUniqueField($record, $data, $user);
+    }
 }

app/Filament/Forms/Components/DateRangeSelect.php

@@ -2,36 +2,35 @@
 
 namespace App\Filament\Forms\Components;
 
-use App\Facades\Accounting;
-use App\Models\Company;
-use Carbon\CarbonPeriod;
+use App\Services\DateRangeService;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Set;
 use Illuminate\Support\Carbon;
 
 class DateRangeSelect extends Select
 {
-    public string $fiscalYearStartDate = '';
+    public string $fiscalYearStartDate;
 
-    public string $fiscalYearEndDate = '';
+    public string $fiscalYearEndDate;
 
-    public string $startDateField = '';
+    public ?string $startDateField = null;
 
-    public string $endDateField = '';
-
-    public Company $company;
+    public ?string $endDateField = null;
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->company = auth()->user()->currentCompany;
-        $this->fiscalYearStartDate = $this->company->locale->fiscalYearStartDate();
-        $this->fiscalYearEndDate = $this->company->locale->fiscalYearEndDate();
+        $company = auth()->user()->currentCompany;
+        $this->fiscalYearStartDate = $company->locale->fiscalYearStartDate();
+        $this->fiscalYearEndDate = $company->locale->fiscalYearEndDate();
 
-        $this->options($this->getDateRangeOptions())
+        $this->options(app(DateRangeService::class)->getDateRangeOptions())
+            ->live()
             ->afterStateUpdated(function ($state, Set $set) {
-                $this->updateDateRange($state, $set);
+                if ($this->startDateField && $this->endDateField) {
+                    $this->updateDateRange($state, $set);
+                }
             });
     }
 
@@ -49,54 +48,6 @@ class DateRangeSelect extends Select
         return $this;
     }
 
-    public function getDateRangeOptions(): array
-    {
-        $earliestDate = Carbon::parse(Accounting::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, Set $set): void
     {
         if ($state === null) {
@@ -165,7 +116,7 @@ class DateRangeSelect extends Select
 
     public function setDateRange(Carbon $start, Carbon $end, Set $set): void
     {
-        $set($this->startDateField, $start->format('Y-m-d'));
-        $set($this->endDateField, $end->isFuture() ? now()->format('Y-m-d') : $end->format('Y-m-d'));
+        $set($this->startDateField, $start->startOfDay()->toDateTimeString());
+        $set($this->endDateField, $end->isFuture() ? now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
     }
 }

app/Filament/Tables/Actions/ReplicateBulkAction.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace App\Filament\Tables\Actions;
+
+use Closure;
+use Filament\Actions\Concerns\CanReplicateRecords;
+use Filament\Actions\Contracts\ReplicatesRecords;
+use Filament\Tables\Actions\BulkAction;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+
+class ReplicateBulkAction extends BulkAction implements ReplicatesRecords
+{
+    use CanReplicateRecords;
+
+    protected ?Closure $afterReplicaSaved = null;
+
+    protected array $relationshipsToReplicate = [];
+
+    public static function getDefaultName(): ?string
+    {
+        return 'replicate';
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->label(__('Replicate Selected'));
+
+        $this->modalHeading(fn (): string => __('Replicate selected :label', ['label' => $this->getPluralModelLabel()]));
+
+        $this->modalSubmitActionLabel(__('Replicate'));
+
+        $this->successNotificationTitle(__('Replicated'));
+
+        $this->icon('heroicon-m-square-3-stack-3d');
+
+        $this->requiresConfirmation();
+
+        $this->modalIcon('heroicon-o-square-3-stack-3d');
+
+        $this->action(function () {
+            $result = $this->process(function (Collection $records) {
+                $records->each(function (Model $record) {
+                    $this->replica = $record->replicate($this->getExcludedAttributes());
+
+                    $this->replica->fill($record->attributesToArray());
+
+                    $this->callBeforeReplicaSaved();
+
+                    $this->replica->save();
+
+                    $this->replicateRelationships($record, $this->replica);
+
+                    $this->callAfterReplicaSaved($record, $this->replica);
+                });
+            });
+
+            try {
+                return $result;
+            } finally {
+                $this->success();
+            }
+        });
+    }
+
+    public function replicateRelationships(Model $original, Model $replica): void
+    {
+        foreach ($this->relationshipsToReplicate as $relationship) {
+            $relation = $original->$relationship();
+
+            if ($relation instanceof BelongsToMany) {
+                $replica->$relationship()->sync($relation->pluck($relation->getRelated()->getKeyName()));
+            } elseif ($relation instanceof HasMany) {
+                $relation->each(function (Model $related) use ($replica, $relationship) {
+                    $relatedReplica = $related->replicate($this->getExcludedAttributes());
+                    $relatedReplica->{$replica->$relationship()->getForeignKeyName()} = $replica->getKey();
+                    $relatedReplica->save();
+                });
+            } elseif ($relation instanceof HasOne && $relation->exists()) {
+                $related = $relation->first();
+                $relatedReplica = $related->replicate($this->getExcludedAttributes());
+                $relatedReplica->{$replica->$relationship()->getForeignKeyName()} = $replica->getKey();
+                $relatedReplica->save();
+            }
+        }
+    }
+
+    public function withReplicatedRelationships(array $relationships): static
+    {
+        $this->relationshipsToReplicate = $relationships;
+
+        return $this;
+    }
+
+    public function afterReplicaSaved(Closure $callback): static
+    {
+        $this->afterReplicaSaved = $callback;
+
+        return $this;
+    }
+
+    public function callAfterReplicaSaved(Model $original, Model $replica): void
+    {
+        $this->evaluate($this->afterReplicaSaved, [
+            'original' => $original,
+            'replica' => $replica,
+        ]);
+    }
+}

app/Listeners/ConfigureCompanyDefault.php

@@ -26,57 +26,66 @@ class ConfigureCompanyDefault
     public function handle(CompanyConfigured $event): void
     {
         $company = $event->company;
+
+        session([
+            'current_company_id' => $company->id,
+            'default_language' => $company->locale->language ?? config('transmatic.source_locale'),
+            'default_timezone' => $company->locale->timezone ?? config('app.timezone'),
+            'default_pagination_page_option' => $company->appearance->records_per_page->value ?? RecordsPerPage::DEFAULT,
+            'default_sort' => $company->appearance->table_sort_direction->value ?? TableSortDirection::DEFAULT,
+            'default_primary_color' => $company->appearance->primary_color->value ?? PrimaryColor::DEFAULT,
+            'default_font' => $company->appearance->font->value ?? Font::DEFAULT,
+            'default_date_format' => $company->locale->date_format->value ?? DateFormat::DEFAULT,
+            'default_week_start' => $company->locale->week_start->value ?? WeekStart::DEFAULT,
+        ]);
+
+        app()->setLocale(session('default_language'));
+        locale_set_default(session('default_language'));
+        config(['app.timezone' => session('default_timezone')]);
+        date_default_timezone_set(session('default_timezone'));
+
         $paginationPageOptions = RecordsPerPage::caseValues();
-        $defaultPaginationPageOption = $company->appearance->records_per_page->value ?? RecordsPerPage::DEFAULT;
-        $defaultSort = $company->appearance->table_sort_direction->value ?? TableSortDirection::DEFAULT;
-        $defaultPrimaryColor = $company->appearance->primary_color ?? PrimaryColor::from(PrimaryColor::DEFAULT);
-        $defaultFont = $company->appearance->font->value ?? Font::DEFAULT;
-        $default_language = $company->locale->language ?? config('transmatic.source_locale');
-        $defaultTimezone = $company->locale->timezone ?? config('app.timezone');
-        $dateFormat = $company->locale->date_format->value ?? DateFormat::DEFAULT;
-        $weekStart = $company->locale->week_start->value ?? WeekStart::DEFAULT;
-
-        app()->setLocale($default_language);
-        locale_set_default($default_language);
-        config(['app.timezone' => $defaultTimezone]);
-        date_default_timezone_set($defaultTimezone);
-
-        Table::configureUsing(static function (Table $table) use ($paginationPageOptions, $defaultSort, $defaultPaginationPageOption): void {
+
+        Table::configureUsing(static function (Table $table) use ($paginationPageOptions): void {
 
             $table
                 ->paginationPageOptions($paginationPageOptions)
-                ->defaultSort(column: 'id', direction: $defaultSort)
-                ->defaultPaginationPageOption($defaultPaginationPageOption);
+                ->defaultSort(column: 'id', direction: session('default_sort'))
+                ->defaultPaginationPageOption(session('default_pagination_page_option'));
         }, isImportant: true);
 
         FilamentColor::register([
-            'primary' => $defaultPrimaryColor->getColor(),
+            'primary' => PrimaryColor::from(session('default_primary_color'))->getColor(),
         ]);
 
         Filament::getPanel('company')
-            ->font($defaultFont)
+            ->font(session('default_font'))
             ->brandName($company->name);
 
-        DatePicker::configureUsing(static function (DatePicker $component) use ($dateFormat, $weekStart) {
+        DatePicker::configureUsing(static function (DatePicker $component) {
             $component
-                ->displayFormat($dateFormat)
-                ->firstDayOfWeek($weekStart);
+                ->displayFormat(session('default_date_format'))
+                ->firstDayOfWeek(session('default_week_start'));
         });
 
         Tab::configureUsing(static function (Tab $tab) {
             $label = $tab->getLabel();
 
-            $translatedLabel = translate($label);
+            if ($label) {
+                $translatedLabel = translate($label);
 
-            $tab->label(ucwords($translatedLabel));
+                $tab->label(ucwords($translatedLabel));
+            }
         }, isImportant: true);
 
         Section::configureUsing(static function (Section $section): void {
             $heading = $section->getHeading();
 
-            $translatedHeading = translate($heading);
+            if ($heading) {
+                $translatedHeading = translate($heading);
 
-            $section->heading(ucfirst($translatedHeading));
+                $section->heading(ucfirst($translatedHeading));
+            }
         }, isImportant: true);
 
         ResourcesTab::configureUsing(static function (ResourcesTab $tab): void {

app/Listeners/SyncAssociatedModels.php

@@ -40,7 +40,6 @@ class SyncAssociatedModels
 
         $keyToMethodMap = [
             'bank_account_id' => 'bankAccount',
-            'currency_code' => 'currency',
             'sales_tax_id' => 'salesTax',
             'purchase_tax_id' => 'purchaseTax',
             'sales_discount_id' => 'salesDiscount',

app/Models/Setting/Localization.php

@@ -83,19 +83,23 @@ class Localization extends Model
 
     public function fiscalYearStartDate(): string
     {
-        return Carbon::parse($this->fiscalYearEndDate())->subYear()->addDay()->toDateString();
+        return once(function () {
+            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);
+        return once(function () {
+            $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();
-        }
+            if ($today->gt($fiscalYearEndThisYear)) {
+                return $fiscalYearEndThisYear->copy()->addYear()->toDateString();
+            }
 
-        return $fiscalYearEndThisYear->toDateString();
+            return $fiscalYearEndThisYear->toDateString();
+        });
     }
 
     public function getDateTimeFormatAttribute(): string

app/Observers/TransactionObserver.php

@@ -17,7 +17,8 @@ class TransactionObserver
      */
     public function created(Transaction $transaction): void
     {
-        if ($transaction->type->isJournal()) {
+        // Additional check to avoid duplication during replication
+        if ($transaction->journalEntries()->exists() || $transaction->type->isJournal() || str_starts_with($transaction->description, '(Copy of)')) {
             return;
         }
 

app/Providers/AppServiceProvider.php

@@ -4,6 +4,7 @@ namespace App\Providers;
 
 use App\Contracts\AccountHandler;
 use App\Services\AccountService;
+use App\Services\DateRangeService;
 use BezhanSalleh\PanelSwitch\PanelSwitch;
 use Filament\Notifications\Livewire\Notifications;
 use Filament\Support\Assets\Js;
@@ -25,7 +26,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register(): void
     {
-        //
+        $this->app->singleton(DateRangeService::class);
     }
 
     /**

app/Providers/MacroServiceProvider.php

@@ -11,6 +11,7 @@ use App\Utilities\Accounting\AccountCode;
 use App\Utilities\Currency\CurrencyAccessor;
 use BackedEnum;
 use Closure;
+use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\Field;
 use Filament\Forms\Components\TextInput;
 use Filament\Tables\Columns\TextColumn;
@@ -54,7 +55,7 @@ class MacroServiceProvider extends ServiceProvider
             return $this;
         });
 
-        TextColumn::macro('localizeDate', function (): static {
+        TextColumn::macro('defaultDateFormat', function (): static {
             $localization = Localization::firstOrFail();
 
             $dateFormat = $localization->date_format->value ?? DateFormat::DEFAULT;
@@ -65,6 +66,18 @@ class MacroServiceProvider extends ServiceProvider
             return $this;
         });
 
+        DatePicker::macro('defaultDateFormat', function (): static {
+            $localization = Localization::firstOrFail();
+
+            $dateFormat = $localization->date_format->value ?? DateFormat::DEFAULT;
+            $timezone = $localization->timezone ?? Carbon::now()->timezoneName;
+
+            $this->displayFormat($dateFormat)
+                ->timezone($timezone);
+
+            return $this;
+        });
+
         TextColumn::macro('currency', function (string | Closure | null $currency = null, ?bool $convert = null): static {
             $this->formatStateUsing(static function (TextColumn $column, $state) use ($currency, $convert): ?string {
                 if (blank($state)) {
@@ -209,5 +222,14 @@ class MacroServiceProvider extends ServiceProvider
 
             return '';
         });
+
+        Carbon::macro('toDefaultDateFormat', function () {
+            $localization = Localization::firstOrFail();
+
+            $dateFormat = $localization->date_format->value ?? DateFormat::DEFAULT;
+            $timezone = $localization->timezone ?? Carbon::now()->timezoneName;
+
+            return $this->setTimezone($timezone)->format($dateFormat);
+        });
     }
 }

app/Repositories/Accounting/JournalEntryRepository.php

@@ -4,7 +4,6 @@ namespace App\Repositories\Accounting;
 
 use App\Models\Accounting\Account;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Carbon;
 
 class JournalEntryRepository
 {
@@ -13,9 +12,8 @@ class JournalEntryRepository
         $query = $account->journalEntries()->where('type', $type);
 
         if ($startDate && $endDate) {
-            $endOfDay = Carbon::parse($endDate)->endOfDay();
-            $query->whereHas('transaction', static function (Builder $query) use ($startDate, $endOfDay) {
-                $query->whereBetween('posted_at', [$startDate, $endOfDay]);
+            $query->whereHas('transaction', static function (Builder $query) use ($startDate, $endDate) {
+                $query->whereBetween('posted_at', [$startDate, $endDate]);
             });
         } elseif ($startDate) {
             $query->whereHas('transaction', static function (Builder $query) use ($startDate) {

app/Scopes/CurrentCompanyScope.php

@@ -4,8 +4,10 @@ namespace App\Scopes;
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\Scope;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
 
 class CurrentCompanyScope implements Scope
 {
@@ -14,8 +16,27 @@ class CurrentCompanyScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
-        if (Auth::check() && Auth::user()->currentCompany) {
-            $builder->where("{$model->getTable()}.company_id", Auth::user()->currentCompany->id);
+        if (app()->runningInConsole()) {
+            return;
+        }
+
+        $companyId = session('current_company_id');
+
+        if (! $companyId && Auth::check() && Auth::user()->currentCompany) {
+            $companyId = Auth::user()->currentCompany->id;
+            session(['current_company_id' => $companyId]);
+        }
+
+        if (! $companyId) {
+            $companyId = Auth::user()->currentCompany->id;
+        }
+
+        if ($companyId) {
+            $builder->where("{$model->getTable()}.company_id", $companyId);
+        } else {
+            Log::error('CurrentCompanyScope: No company_id found for user ' . Auth::id());
+
+            throw new ModelNotFoundException('CurrentCompanyScope: No company_id set in the session or on the user.');
         }
     }
 }

app/Services/AccountService.php

@@ -10,6 +10,9 @@ use App\Models\Accounting\Transaction;
 use App\Repositories\Accounting\JournalEntryRepository;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\ValueObjects\Money;
+use Closure;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Facades\DB;
 
 class AccountService implements AccountHandler
@@ -50,6 +53,118 @@ class AccountService implements AccountHandler
         return new Money($balances['starting_balance'], $account->currency_code);
     }
 
+    public function getTransactionDetailsSubquery(string $startDate, string $endDate): Closure
+    {
+        return static function ($query) use ($startDate, $endDate) {
+            $query->select(
+                'journal_entries.id',
+                'journal_entries.account_id',
+                'journal_entries.transaction_id',
+                'journal_entries.type',
+                'journal_entries.amount',
+                DB::raw('journal_entries.amount * IF(journal_entries.type = "debit", 1, -1) AS signed_amount')
+            )
+                ->whereBetween('transactions.posted_at', [$startDate, $endDate])
+                ->join('transactions', 'transactions.id', '=', 'journal_entries.transaction_id')
+                ->orderBy('transactions.posted_at')
+                ->with('transaction:id,type,description,posted_at');
+        };
+    }
+
+    public function getAccountBalances(string $startDate, string $endDate, array $accountIds = []): Builder
+    {
+        $accountIds = array_map('intval', $accountIds);
+
+        $query = Account::query()
+            ->select([
+                'accounts.id',
+                'accounts.name',
+                'accounts.category',
+                'accounts.subtype_id',
+                'accounts.currency_code',
+                'accounts.code',
+            ])
+            ->addSelect([
+                DB::raw("
+                    COALESCE(
+                        IF(accounts.category IN ('asset', 'expense'),
+                            SUM(IF(journal_entries.type = 'debit' AND transactions.posted_at < ?, journal_entries.amount, 0)) -
+                            SUM(IF(journal_entries.type = 'credit' AND transactions.posted_at < ?, journal_entries.amount, 0)),
+                            SUM(IF(journal_entries.type = 'credit' AND transactions.posted_at < ?, journal_entries.amount, 0)) -
+                            SUM(IF(journal_entries.type = 'debit' AND transactions.posted_at < ?, journal_entries.amount, 0))
+                        ), 0
+                    ) AS starting_balance
+                "),
+                DB::raw("
+                    COALESCE(SUM(
+                        IF(journal_entries.type = 'debit' AND transactions.posted_at BETWEEN ? AND ?, journal_entries.amount, 0)
+                    ), 0) AS total_debit
+                "),
+                DB::raw("
+                    COALESCE(SUM(
+                        IF(journal_entries.type = 'credit' AND transactions.posted_at BETWEEN ? AND ?, journal_entries.amount, 0)
+                    ), 0) AS total_credit
+                "),
+            ])
+            ->join('journal_entries', 'journal_entries.account_id', '=', 'accounts.id')
+            ->join('transactions', function (JoinClause $join) use ($endDate) {
+                $join->on('transactions.id', '=', 'journal_entries.transaction_id')
+                    ->where('transactions.posted_at', '<=', $endDate);
+            })
+            ->groupBy('accounts.id')
+            ->with(['subtype:id,name']);
+
+        if (! empty($accountIds)) {
+            $query->whereIn('accounts.id', $accountIds);
+        }
+
+        $query->addBinding([$startDate, $startDate, $startDate, $startDate, $startDate, $endDate, $startDate, $endDate], 'select');
+
+        return $query;
+    }
+
+    public function getTotalBalanceForAllBankAccounts(string $startDate, string $endDate): Money
+    {
+        $accountIds = Account::whereHas('bankAccount')
+            ->pluck('id')
+            ->toArray();
+
+        if (empty($accountIds)) {
+            return new Money(0, CurrencyAccessor::getDefaultCurrency());
+        }
+
+        $result = DB::table('journal_entries')
+            ->join('transactions', function (JoinClause $join) use ($endDate) {
+                $join->on('transactions.id', '=', 'journal_entries.transaction_id')
+                    ->where('transactions.posted_at', '<=', $endDate);
+            })
+            ->whereIn('journal_entries.account_id', $accountIds)
+            ->selectRaw('
+            SUM(CASE
+                WHEN transactions.posted_at < ? AND journal_entries.type = "debit" THEN journal_entries.amount
+                WHEN transactions.posted_at < ? AND journal_entries.type = "credit" THEN -journal_entries.amount
+                ELSE 0
+            END) AS totalStartingBalance,
+            SUM(CASE
+                WHEN transactions.posted_at BETWEEN ? AND ? AND journal_entries.type = "debit" THEN journal_entries.amount
+                WHEN transactions.posted_at BETWEEN ? AND ? AND journal_entries.type = "credit" THEN -journal_entries.amount
+                ELSE 0
+            END) AS totalNetMovement
+        ', [
+                $startDate,
+                $startDate,
+                $startDate,
+                $endDate,
+                $startDate,
+                $endDate,
+            ])
+            ->first();
+
+        $totalBalance = $result->totalStartingBalance + $result->totalNetMovement;
+
+        return new Money($totalBalance, CurrencyAccessor::getDefaultCurrency());
+    }
+
     public function getEndingBalance(Account $account, string $startDate, string $endDate): ?Money
     {
         $calculatedBalances = $this->calculateBalances($account, $startDate, $endDate);
@@ -73,7 +188,7 @@ class AccountService implements AccountHandler
         })
             ->where('type', 'credit')
             ->whereHas('transaction', static function ($query) use ($startDate) {
-                $query->where('posted_at', '<=', $startDate);
+                $query->where('posted_at', '<', $startDate);
             })
             ->sum('amount');
 
@@ -82,7 +197,7 @@ class AccountService implements AccountHandler
         })
             ->where('type', 'debit')
             ->whereHas('transaction', static function ($query) use ($startDate) {
-                $query->where('posted_at', '<=', $startDate);
+                $query->where('posted_at', '<', $startDate);
             })
             ->sum('amount');
 
@@ -149,57 +264,6 @@ class AccountService implements AccountHandler
         return array_filter($balances, static fn ($value) => $value !== null);
     }
 
-    public function getTotalBalanceForAllBankAccounts(string $startDate, string $endDate): Money
-    {
-        $accountIds = Account::whereHas('bankAccount')
-            ->pluck('id')
-            ->toArray();
-
-        if (empty($accountIds)) {
-            return new Money(0, CurrencyAccessor::getDefaultCurrency());
-        }
-
-        $result = DB::table('journal_entries')
-            ->join('transactions', 'journal_entries.transaction_id', '=', 'transactions.id')
-            ->whereIn('journal_entries.account_id', $accountIds)
-            ->where('transactions.posted_at', '<=', $endDate)
-            ->selectRaw('
-            SUM(CASE
-                WHEN transactions.posted_at <= ? AND journal_entries.type = "debit" THEN journal_entries.amount
-                WHEN transactions.posted_at <= ? AND journal_entries.type = "credit" THEN -journal_entries.amount
-                ELSE 0
-            END) AS totalStartingBalance,
-            SUM(CASE
-                WHEN transactions.posted_at BETWEEN ? AND ? AND journal_entries.type = "debit" THEN journal_entries.amount
-                WHEN transactions.posted_at BETWEEN ? AND ? AND journal_entries.type = "credit" THEN -journal_entries.amount
-                ELSE 0
-            END) AS totalNetMovement
-        ', [
-                $startDate,
-                $startDate,
-                $startDate,
-                $endDate,
-                $startDate,
-                $endDate,
-            ])
-            ->first();
-
-        $totalBalance = $result->totalStartingBalance + $result->totalNetMovement;
-
-        return new Money($totalBalance, CurrencyAccessor::getDefaultCurrency());
-    }
-
-    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')

app/Services/DateRangeService.php

@@ -0,0 +1,145 @@
+<?php
+
+namespace App\Services;
+
+use App\Facades\Accounting;
+use Carbon\CarbonPeriod;
+use Illuminate\Support\Carbon;
+
+class DateRangeService
+{
+    protected string $fiscalYearStartDate = '';
+
+    protected string $fiscalYearEndDate = '';
+
+    public function __construct()
+    {
+        $company = auth()->user()->currentCompany;
+        $this->fiscalYearStartDate = $company->locale->fiscalYearStartDate();
+        $this->fiscalYearEndDate = $company->locale->fiscalYearEndDate();
+    }
+
+    public function getDateRangeOptions(): array
+    {
+        return once(function () {
+            return $this->generateDateRangeOptions();
+        });
+    }
+
+    private function generateDateRangeOptions(): array
+    {
+        $earliestDate = Carbon::parse(Accounting::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 getMatchingDateRangeOption(Carbon $startDate, Carbon $endDate): string
+    {
+        $options = $this->getDateRangeOptions();
+
+        foreach ($options as $type => $ranges) {
+            foreach ($ranges as $key => $label) {
+                [$expectedStart, $expectedEnd] = $this->getExpectedDateRange($type, $key);
+
+                if ($expectedStart === null || $expectedEnd === null) {
+                    continue;
+                }
+
+                $expectedEnd = $expectedEnd->isFuture() ? now()->startOfDay() : $expectedEnd;
+
+                if ($startDate->eq($expectedStart) && $endDate->eq($expectedEnd)) {
+                    return $key; // Return the matching range key (e.g., "FY-2024")
+                }
+            }
+        }
+
+        return 'Custom'; // Return "Custom" if no matching range is found
+    }
+
+    private function getExpectedDateRange(string $type, string $key): array
+    {
+        switch ($type) {
+            case 'Fiscal Year':
+                $year = (int) substr($key, 3);
+                $start = Carbon::parse($this->fiscalYearStartDate)->subYears(now()->year - $year)->startOfDay();
+                $end = Carbon::parse($this->fiscalYearEndDate)->subYears(now()->year - $year)->startOfDay();
+
+                break;
+
+            case 'Fiscal Quarter':
+                [$quarter, $year] = explode('-', substr($key, 3));
+                $start = Carbon::parse($this->fiscalYearStartDate)->subYears(now()->year - $year)->addMonths(($quarter - 1) * 3)->startOfDay();
+                $end = $start->copy()->addMonths(3)->subDay()->startOfDay();
+
+                break;
+
+            case 'Calendar Year':
+                $year = (int) substr($key, 2);
+                $start = Carbon::createFromDate($year)->startOfYear()->startOfDay();
+                $end = Carbon::createFromDate($year)->endOfYear()->startOfDay();
+
+                break;
+
+            case 'Calendar Quarter':
+                [$quarter, $year] = explode('-', substr($key, 2));
+                $month = ($quarter - 1) * 3 + 1;
+                $start = Carbon::createFromDate($year, $month, 1)->startOfDay();
+                $end = $start->copy()->endOfQuarter()->startOfDay();
+
+                break;
+
+            case 'Month':
+                $yearMonth = substr($key, 2);
+                $start = Carbon::parse($yearMonth)->startOfMonth()->startOfDay();
+                $end = Carbon::parse($yearMonth)->endOfMonth()->startOfDay();
+
+                break;
+
+            default:
+                return [null, null];
+        }
+
+        return [$start, $end];
+    }
+}

app/Services/ExportService.php

@@ -4,18 +4,20 @@ namespace App\Services;
 
 use App\Contracts\ExportableReport;
 use App\Models\Company;
+use App\Support\Column;
 use Barryvdh\Snappy\Facades\SnappyPdf;
+use Carbon\Exceptions\InvalidFormatException;
 use Illuminate\Support\Carbon;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class ExportService
 {
-    public function exportToCsv(Company $company, ExportableReport $report, string $startDate, string $endDate, bool $separateCategoryHeaders = false): StreamedResponse
+    public function exportToCsv(Company $company, ExportableReport $report, string $startDate, string $endDate): StreamedResponse
     {
-        $formattedStartDate = Carbon::parse($startDate)->format('Y-m-d');
-        $formattedEndDate = Carbon::parse($endDate)->format('Y-m-d');
+        $formattedStartDate = Carbon::parse($startDate)->toDateString();
+        $formattedEndDate = Carbon::parse($endDate)->toDateString();
 
-        $timestamp = Carbon::now()->format('Y-m-d-H_i');
+        $timestamp = Carbon::now()->format('Y-m-d_H-i-s');
 
         $filename = $company->name . ' ' . $report->getTitle() . ' ' . $formattedStartDate . ' to ' . $formattedEndDate . ' ' . $timestamp . '.csv';
 
@@ -24,12 +26,15 @@ class ExportService
             'Content-Disposition' => 'attachment; filename="' . $filename . '"',
         ];
 
-        $callback = function () use ($report, $company, $formattedStartDate, $formattedEndDate) {
+        $callback = function () use ($startDate, $endDate, $report, $company) {
             $file = fopen('php://output', 'wb');
 
+            $defaultStartDateFormat = Carbon::parse($startDate)->toDefaultDateFormat();
+            $defaultEndDateFormat = Carbon::parse($endDate)->toDefaultDateFormat();
+
             fputcsv($file, [$report->getTitle()]);
             fputcsv($file, [$company->name]);
-            fputcsv($file, ['Date Range: ' . $formattedStartDate . ' to ' . $formattedEndDate]);
+            fputcsv($file, ['Date Range: ' . $defaultStartDateFormat . ' to ' . $defaultEndDateFormat]);
             fputcsv($file, []);
 
             fputcsv($file, $report->getHeaders());
@@ -44,7 +49,30 @@ class ExportService
                 }
 
                 foreach ($category->data as $accountRow) {
-                    fputcsv($file, $accountRow);
+                    $row = [];
+                    $columns = $report->getColumns();
+
+                    /**
+                     * @var Column $column
+                     */
+                    foreach ($columns as $index => $column) {
+                        $cell = $accountRow[$index] ?? '';
+
+                        if ($column->isDate()) {
+                            try {
+                                $row[] = Carbon::parse($cell)->toDateString();
+                            } catch (InvalidFormatException) {
+                                $row[] = $cell;
+                            }
+                        } elseif (is_array($cell)) {
+                            // Handle array cells by extracting 'name' or 'description'
+                            $row[] = $cell['name'] ?? $cell['description'] ?? '';
+                        } else {
+                            $row[] = $cell;
+                        }
+                    }
+
+                    fputcsv($file, $row);
                 }
 
                 if (filled($category->summary)) {
@@ -66,18 +94,18 @@ class ExportService
 
     public function exportToPdf(Company $company, ExportableReport $report, string $startDate, string $endDate): StreamedResponse
     {
-        $formattedStartDate = Carbon::parse($startDate)->format('Y-m-d');
-        $formattedEndDate = Carbon::parse($endDate)->format('Y-m-d');
+        $formattedStartDate = Carbon::parse($startDate)->toDateString();
+        $formattedEndDate = Carbon::parse($endDate)->toDateString();
 
-        $timestamp = Carbon::now()->format('Y-m-d-H_i');
+        $timestamp = Carbon::now()->format('Y-m-d_H-i-s');
 
         $filename = $company->name . ' ' . $report->getTitle() . ' ' . $formattedStartDate . ' to ' . $formattedEndDate . ' ' . $timestamp . '.pdf';
 
         $pdf = SnappyPdf::loadView($report->getPdfView(), [
             'company' => $company,
             'report' => $report,
-            'startDate' => Carbon::parse($startDate)->format('M d, Y'),
-            'endDate' => Carbon::parse($endDate)->format('M d, Y'),
+            'startDate' => Carbon::parse($startDate)->toDefaultDateFormat(),
+            'endDate' => Carbon::parse($endDate)->toDefaultDateFormat(),
         ]);
 
         return response()->streamDownload(function () use ($pdf) {

app/Services/ReportService.php

@@ -11,9 +11,8 @@ use App\Enums\Accounting\AccountCategory;
 use App\Models\Accounting\Account;
 use App\Support\Column;
 use App\Utilities\Currency\CurrencyAccessor;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Relations\Relation;
-use Illuminate\Support\Collection;
+use App\ValueObjects\Money;
+use Illuminate\Support\Carbon;
 
 class ReportService
 {
@@ -38,79 +37,128 @@ class ReportService
         );
     }
 
-    private function filterBalances(array $balances, array $fields): array
+    public function buildAccountBalanceReport(string $startDate, string $endDate, array $columns = []): ReportDTO
     {
-        return array_filter($balances, static fn ($key) => in_array($key, $fields, true), ARRAY_FILTER_USE_KEY);
+        $orderedCategories = AccountCategory::getOrderedCategories();
+
+        $accounts = $this->accountService->getAccountBalances($startDate, $endDate)->get();
+
+        $columnNameKeys = array_map(fn (Column $column) => $column->getName(), $columns);
+
+        $accountCategories = [];
+        $reportTotalBalances = [];
+
+        foreach ($orderedCategories as $category) {
+            $accountsInCategory = $accounts->where('category', $category)
+                ->sortBy('code', SORT_NATURAL);
+
+            $relevantFields = array_intersect($category->getRelevantBalanceFields(), $columnNameKeys);
+
+            $categorySummaryBalances = array_fill_keys($relevantFields, 0);
+
+            $categoryAccounts = [];
+
+            /** @var Account $account */
+            foreach ($accountsInCategory as $account) {
+                $accountBalances = $this->calculateAccountBalances($account, $category);
+
+                foreach ($relevantFields as $field) {
+                    $categorySummaryBalances[$field] += $accountBalances[$field];
+                }
+
+                $formattedAccountBalances = $this->formatBalances($accountBalances);
+
+                $categoryAccounts[] = new AccountDTO(
+                    $account->name,
+                    $account->code,
+                    $account->id,
+                    $formattedAccountBalances,
+                    Carbon::parse($startDate)->toDateString(),
+                    Carbon::parse($endDate)->toDateString(),
+                );
+            }
+
+            foreach ($relevantFields as $field) {
+                $reportTotalBalances[$field] = ($reportTotalBalances[$field] ?? 0) + $categorySummaryBalances[$field];
+            }
+
+            $formattedCategorySummaryBalances = $this->formatBalances($categorySummaryBalances);
+
+            $accountCategories[$category->getPluralLabel()] = new AccountCategoryDTO(
+                $categoryAccounts,
+                $formattedCategorySummaryBalances,
+            );
+        }
+
+        $formattedReportTotalBalances = $this->formatBalances($reportTotalBalances);
+
+        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
     }
 
-    private function getCategoryGroupedAccounts(array $allCategories): Collection
+    private function calculateAccountBalances(Account $account, AccountCategory $category): array
     {
-        return Account::whereHas('journalEntries')
-            ->select(['id', 'name', 'currency_code', 'category', 'code'])
-            ->get()
-            ->groupBy(fn (Account $account) => $account->category->getPluralLabel())
-            ->sortBy(static fn (Collection $groupedAccounts, string $key) => array_search($key, $allCategories, true));
+        $balances = [
+            'debit_balance' => $account->total_debit ?? 0,
+            'credit_balance' => $account->total_credit ?? 0,
+        ];
+
+        if ($category->isNormalDebitBalance()) {
+            $balances['net_movement'] = $balances['debit_balance'] - $balances['credit_balance'];
+        } else {
+            $balances['net_movement'] = $balances['credit_balance'] - $balances['debit_balance'];
+        }
+
+        if ($category->isReal()) {
+            $balances['starting_balance'] = $account->starting_balance ?? 0;
+            $balances['ending_balance'] = $balances['starting_balance'] + $balances['net_movement'];
+        }
+
+        return $balances;
     }
 
-    public function buildAccountBalanceReport(string $startDate, string $endDate, array $columns = []): ReportDTO
+    public function calculateRetainedEarnings(string $startDate): Money
     {
-        $allCategories = $this->accountService->getAccountCategoryOrder();
+        $modifiedStartDate = Carbon::parse($this->accountService->getEarliestTransactionDate())->startOfYear()->toDateTimeString();
+        $endDate = Carbon::parse($startDate)->subYear()->endOfYear()->toDateTimeString();
 
-        $categoryGroupedAccounts = $this->getCategoryGroupedAccounts($allCategories);
+        $revenueAccounts = $this->accountService->getAccountBalances($modifiedStartDate, $endDate)->where('category', AccountCategory::Revenue)->get();
 
-        $balanceFields = ['starting_balance', 'debit_balance', 'credit_balance', 'net_movement', 'ending_balance'];
+        $expenseAccounts = $this->accountService->getAccountBalances($modifiedStartDate, $endDate)->where('category', AccountCategory::Expense)->get();
 
-        $columnNameKeys = array_map(fn (Column $column) => $column->getName(), $columns);
+        $revenueTotal = 0;
+        $expenseTotal = 0;
+
+        foreach ($revenueAccounts as $account) {
+            $revenueBalances = $this->calculateAccountBalances($account, AccountCategory::Revenue);
+            $revenueTotal += $revenueBalances['net_movement'];
+        }
+
+        foreach ($expenseAccounts as $account) {
+            $expenseBalances = $this->calculateAccountBalances($account, AccountCategory::Expense);
+            $expenseTotal += $expenseBalances['net_movement'];
+        }
 
-        $updatedBalanceFields = array_filter($balanceFields, fn (string $balanceField) => in_array($balanceField, $columnNameKeys, true));
+        $retainedEarnings = $revenueTotal - $expenseTotal;
 
-        return $this->buildReport(
-            $allCategories,
-            $categoryGroupedAccounts,
-            fn (Account $account) => $this->accountService->getBalances($account, $startDate, $endDate, $updatedBalanceFields),
-            $updatedBalanceFields,
-            $columns,
-            fn (string $categoryName, array &$categorySummaryBalances) => $this->adjustAccountBalanceCategoryFields($categoryName, $categorySummaryBalances),
-        );
+        return new Money($retainedEarnings, CurrencyAccessor::getDefaultCurrency());
     }
 
     public function buildAccountTransactionsReport(string $startDate, string $endDate, ?array $columns = null, ?string $accountId = 'all'): ReportDTO
     {
         $columns ??= [];
-        $query = Account::whereHas('journalEntries.transaction', function (Builder $query) use ($startDate, $endDate) {
-            $query->whereBetween('posted_at', [$startDate, $endDate]);
-        })
-            ->with(['journalEntries' => function (Relation $query) use ($startDate, $endDate) {
-                $query->whereHas('transaction', function (Builder $query) use ($startDate, $endDate) {
-                    $query->whereBetween('posted_at', [$startDate, $endDate]);
-                })
-                    ->with('transaction:id,type,description,posted_at')
-                    ->select(['account_id', 'transaction_id'])
-                    ->selectRaw('SUM(CASE WHEN type = "debit" THEN amount ELSE 0 END) AS total_debit')
-                    ->selectRaw('SUM(CASE WHEN type = "credit" THEN amount ELSE 0 END) AS total_credit')
-                    ->selectRaw('(SELECT MIN(posted_at) FROM transactions WHERE transactions.id = journal_entries.transaction_id) AS earliest_posted_at')
-                    ->groupBy('account_id', 'transaction_id')
-                    ->orderBy('earliest_posted_at');
-            }])
-            ->select(['id', 'name', 'category', 'subtype_id', 'currency_code']);
-
-        if ($accountId !== 'all') {
-            $query->where('id', $accountId);
-        }
+        $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
 
-        $accounts = $query->get();
+        $accountIds = $accountId !== 'all' ? [$accountId] : [];
 
-        $reportCategories = [];
+        $query = $this->accountService->getAccountBalances($startDate, $endDate, $accountIds);
 
-        $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
+        $accounts = $query->with(['journalEntries' => $this->accountService->getTransactionDetailsSubquery($startDate, $endDate)])->get();
+
+        $reportCategories = [];
 
         foreach ($accounts as $account) {
             $accountTransactions = [];
-            $startingBalance = $this->accountService->getStartingBalance($account, $startDate, true);
-
-            $currentBalance = $startingBalance?->getAmount() ?? 0;
-            $totalDebit = 0;
-            $totalCredit = 0;
+            $currentBalance = $account->starting_balance;
 
             $accountTransactions[] = new AccountTransactionDTO(
                 id: null,
@@ -118,42 +166,47 @@ class ReportService
                 description: '',
                 debit: '',
                 credit: '',
-                balance: $startingBalance?->formatInDefaultCurrency() ?? 0,
+                balance: money($currentBalance, $defaultCurrency)->format(),
                 type: null,
-                tableAction: null,
+                tableAction: null
             );
 
+            /** @var Account $account */
             foreach ($account->journalEntries as $journalEntry) {
                 $transaction = $journalEntry->transaction;
-                $totalDebit += $journalEntry->total_debit;
-                $totalCredit += $journalEntry->total_credit;
+                $signedAmount = $journalEntry->signed_amount;
+
+                if ($account->category->isNormalDebitBalance()) {
+                    $currentBalance += $signedAmount;
+                } else {
+                    $currentBalance -= $signedAmount;
+                }
 
-                $currentBalance += $journalEntry->total_debit;
-                $currentBalance -= $journalEntry->total_credit;
+                $formattedAmount = money(abs($signedAmount), $defaultCurrency)->format();
 
                 $accountTransactions[] = new AccountTransactionDTO(
                     id: $transaction->id,
-                    date: $transaction->posted_at->format('Y-m-d'),
-                    description: $transaction->description ?? '',
-                    debit: $journalEntry->total_debit ? money($journalEntry->total_debit, $defaultCurrency)->format() : '',
-                    credit: $journalEntry->total_credit ? money($journalEntry->total_credit, $defaultCurrency)->format() : '',
+                    date: $transaction->posted_at->toDefaultDateFormat(),
+                    description: $transaction->description ?? 'Add a description',
+                    debit: $journalEntry->type->isDebit() ? $formattedAmount : '',
+                    credit: $journalEntry->type->isCredit() ? $formattedAmount : '',
                     balance: money($currentBalance, $defaultCurrency)->format(),
                     type: $transaction->type,
-                    tableAction: $transaction->type->isJournal() ? 'updateJournalTransaction' : 'updateTransaction',
+                    tableAction: $transaction->type->isJournal() ? 'updateJournalTransaction' : 'updateTransaction'
                 );
             }
 
-            $balanceChange = $currentBalance - ($startingBalance?->getAmount() ?? 0);
+            $balanceChange = $currentBalance - $account->starting_balance;
 
             $accountTransactions[] = new AccountTransactionDTO(
                 id: null,
                 date: 'Totals and Ending Balance',
                 description: '',
-                debit: money($totalDebit, $defaultCurrency)->format(),
-                credit: money($totalCredit, $defaultCurrency)->format(),
+                debit: money($account->total_debit, $defaultCurrency)->format(),
+                credit: money($account->total_credit, $defaultCurrency)->format(),
                 balance: money($currentBalance, $defaultCurrency)->format(),
                 type: null,
-                tableAction: null,
+                tableAction: null
             );
 
             $accountTransactions[] = new AccountTransactionDTO(
@@ -164,7 +217,7 @@ class ReportService
                 credit: '',
                 balance: money($balanceChange, $defaultCurrency)->format(),
                 type: null,
-                tableAction: null,
+                tableAction: null
             );
 
             $reportCategories[] = [
@@ -177,79 +230,78 @@ class ReportService
         return new ReportDTO(categories: $reportCategories, fields: $columns);
     }
 
-    private function buildReport(array $allCategories, Collection $categoryGroupedAccounts, callable $balanceCalculator, array $balanceFields, array $allFields, ?callable $initializeCategoryBalances = null, bool $includeRetainedEarnings = false, ?string $startDate = null): ReportDTO
+    public function buildTrialBalanceReport(string $startDate, string $endDate, array $columns = []): ReportDTO
     {
+        $orderedCategories = AccountCategory::getOrderedCategories();
+
+        $accounts = $this->accountService->getAccountBalances($startDate, $endDate)->get();
+
+        $balanceFields = ['debit_balance', 'credit_balance'];
+
         $accountCategories = [];
         $reportTotalBalances = array_fill_keys($balanceFields, 0);
 
-        foreach ($allCategories as $categoryName) {
-            $accountsInCategory = $categoryGroupedAccounts[$categoryName] ?? collect();
-            $categorySummaryBalances = array_fill_keys($balanceFields, 0);
+        foreach ($orderedCategories as $category) {
+            $accountsInCategory = $accounts->where('category', $category)
+                ->sortBy('code', SORT_NATURAL);
 
-            if ($initializeCategoryBalances) {
-                $initializeCategoryBalances($categoryName, $categorySummaryBalances);
-            }
+            $categorySummaryBalances = array_fill_keys($balanceFields, 0);
 
             $categoryAccounts = [];
 
+            /** @var Account $account */
             foreach ($accountsInCategory as $account) {
-                /** @var Account $account */
-                $accountBalances = $balanceCalculator($account);
+                $accountBalances = $this->calculateAccountBalances($account, $category);
 
-                if (array_sum($accountBalances) === 0) {
-                    continue;
-                }
+                $endingBalance = $accountBalances['ending_balance'] ?? $accountBalances['net_movement'];
+
+                $trialBalance = $this->calculateTrialBalance($account->category, $endingBalance);
 
-                foreach ($accountBalances as $accountBalanceType => $accountBalance) {
-                    if (array_key_exists($accountBalanceType, $categorySummaryBalances)) {
-                        $categorySummaryBalances[$accountBalanceType] += $accountBalance;
-                    }
+                foreach ($trialBalance as $balanceType => $balance) {
+                    $categorySummaryBalances[$balanceType] += $balance;
                 }
 
-                $filteredAccountBalances = $this->filterBalances($accountBalances, $balanceFields);
-                $formattedAccountBalances = $this->formatBalances($filteredAccountBalances);
+                $formattedAccountBalances = $this->formatBalances($trialBalance);
 
                 $categoryAccounts[] = new AccountDTO(
                     $account->name,
                     $account->code,
                     $account->id,
                     $formattedAccountBalances,
+                    Carbon::parse($startDate)->toDateString(),
+                    Carbon::parse($endDate)->toDateString(),
                 );
             }
 
-            if ($includeRetainedEarnings && $categoryName === AccountCategory::Equity->getPluralLabel()) {
-                $retainedEarnings = $this->accountService->getRetainedEarnings($startDate);
-                $retainedEarningsAmount = $retainedEarnings->getAmount();
+            if ($category === AccountCategory::Equity) {
+                $modifiedStartDate = Carbon::parse($this->accountService->getEarliestTransactionDate())->startOfYear()->toDateString();
+                $modifiedEndDate = Carbon::parse($startDate)->subYear()->endOfYear()->toDateString();
 
-                if ($retainedEarningsAmount >= 0) {
-                    $categorySummaryBalances['credit_balance'] += $retainedEarningsAmount;
-                    $categoryAccounts[] = new AccountDTO(
-                        'Retained Earnings',
-                        'RE',
-                        null,
-                        $this->formatBalances(['debit_balance' => 0, 'credit_balance' => $retainedEarningsAmount])
-                    );
-                } else {
-                    $categorySummaryBalances['debit_balance'] += abs($retainedEarningsAmount);
-                    $categoryAccounts[] = new AccountDTO(
-                        'Retained Earnings',
-                        'RE',
-                        null,
-                        $this->formatBalances(['debit_balance' => abs($retainedEarningsAmount), 'credit_balance' => 0])
-                    );
-                }
+                $retainedEarningsAmount = $this->calculateRetainedEarnings($startDate)->getAmount();
+                $isCredit = $retainedEarningsAmount >= 0;
+
+                $categorySummaryBalances[$isCredit ? 'credit_balance' : 'debit_balance'] += abs($retainedEarningsAmount);
+
+                $categoryAccounts[] = new AccountDTO(
+                    'Retained Earnings',
+                    'RE',
+                    null,
+                    $this->formatBalances([
+                        'debit_balance' => $isCredit ? 0 : abs($retainedEarningsAmount),
+                        'credit_balance' => $isCredit ? $retainedEarningsAmount : 0,
+                    ]),
+                    $modifiedStartDate,
+                    $modifiedEndDate,
+                );
             }
 
-            foreach ($balanceFields as $field) {
-                if (array_key_exists($field, $categorySummaryBalances)) {
-                    $reportTotalBalances[$field] += $categorySummaryBalances[$field];
-                }
+            foreach ($categorySummaryBalances as $balanceType => $balance) {
+                $reportTotalBalances[$balanceType] += $balance;
             }
 
-            $filteredCategorySummaryBalances = $this->filterBalances($categorySummaryBalances, $balanceFields);
-            $formattedCategorySummaryBalances = $this->formatBalances($filteredCategorySummaryBalances);
+            $formattedCategorySummaryBalances = $this->formatBalances($categorySummaryBalances);
 
-            $accountCategories[$categoryName] = new AccountCategoryDTO(
+            $accountCategories[$category->getPluralLabel()] = new AccountCategoryDTO(
                 $categoryAccounts,
                 $formattedCategorySummaryBalances,
             );
@@ -257,38 +309,12 @@ class ReportService
 
         $formattedReportTotalBalances = $this->formatBalances($reportTotalBalances);
 
-        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $allFields);
-    }
-
-    private function adjustAccountBalanceCategoryFields(string $categoryName, array &$categorySummaryBalances): void
-    {
-        if (in_array($categoryName, [AccountCategory::Expense->getPluralLabel(), AccountCategory::Revenue->getPluralLabel()], true)) {
-            unset($categorySummaryBalances['starting_balance'], $categorySummaryBalances['ending_balance']);
-        }
-    }
-
-    public function buildTrialBalanceReport(string $startDate, string $endDate, array $columns = []): ReportDTO
-    {
-        $allCategories = $this->accountService->getAccountCategoryOrder();
-
-        $categoryGroupedAccounts = $this->getCategoryGroupedAccounts($allCategories);
-
-        $balanceFields = ['debit_balance', 'credit_balance'];
-
-        return $this->buildReport($allCategories, $categoryGroupedAccounts, function (Account $account) use ($startDate, $endDate) {
-            $endingBalance = $this->accountService->getEndingBalance($account, $startDate, $endDate)?->getAmount() ?? 0;
-
-            if ($endingBalance === 0) {
-                return [];
-            }
-
-            return $this->calculateTrialBalance($account->category, $endingBalance);
-        }, $balanceFields, $columns, null, true, $startDate);
+        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
     }
 
     private function calculateTrialBalance(AccountCategory $category, int $endingBalance): array
     {
-        if (in_array($category, [AccountCategory::Asset, AccountCategory::Expense], true)) {
+        if ($category->isNormalDebitBalance()) {
             if ($endingBalance >= 0) {
                 return ['debit_balance' => $endingBalance, 'credit_balance' => 0];
             }
@@ -302,4 +328,74 @@ class ReportService
 
         return ['debit_balance' => abs($endingBalance), 'credit_balance' => 0];
     }
+
+    public function buildIncomeStatementReport(string $startDate, string $endDate, array $columns = []): ReportDTO
+    {
+        $accounts = $this->accountService->getAccountBalances($startDate, $endDate)->get();
+
+        $accountCategories = [];
+        $totalRevenue = 0;
+        $cogs = 0;
+        $totalExpenses = 0;
+
+        $categoryGroups = [
+            'Revenue' => [
+                'accounts' => $accounts->where('category', AccountCategory::Revenue),
+                'total' => &$totalRevenue,
+            ],
+            'Cost of Goods Sold' => [
+                'accounts' => $accounts->where('subtype.name', 'Cost of Goods Sold'),
+                'total' => &$cogs,
+            ],
+            'Expenses' => [
+                'accounts' => $accounts->where('category', AccountCategory::Expense)->where('subtype.name', '!=', 'Cost of Goods Sold'),
+                'total' => &$totalExpenses,
+            ],
+        ];
+
+        foreach ($categoryGroups as $label => $group) {
+            $categoryAccounts = [];
+            $netMovement = 0;
+
+            foreach ($group['accounts']->sortBy('code', SORT_NATURAL) as $account) {
+                $category = null;
+
+                if ($label === 'Revenue') {
+                    $category = AccountCategory::Revenue;
+                } elseif ($label === 'Expenses') {
+                    $category = AccountCategory::Expense;
+                } elseif ($label === 'Cost of Goods Sold') {
+                    // COGS is treated as part of Expenses, so we use AccountCategory::Expense
+                    $category = AccountCategory::Expense;
+                }
+
+                if ($category !== null) {
+                    $accountBalances = $this->calculateAccountBalances($account, $category);
+                    $movement = $accountBalances['net_movement'];
+                    $netMovement += $movement;
+                    $group['total'] += $movement;
+
+                    $categoryAccounts[] = new AccountDTO(
+                        $account->name,
+                        $account->code,
+                        $account->id,
+                        $this->formatBalances(['net_movement' => $movement]),
+                        Carbon::parse($startDate)->toDateString(),
+                        Carbon::parse($endDate)->toDateString(),
+                    );
+                }
+            }
+
+            $accountCategories[$label] = new AccountCategoryDTO(
+                $categoryAccounts,
+                $this->formatBalances(['net_movement' => $netMovement]),
+            );
+        }
+
+        $grossProfit = $totalRevenue - $cogs;
+        $netProfit = $grossProfit - $totalExpenses;
+        $formattedReportTotalBalances = $this->formatBalances(['net_movement' => $netProfit]);
+
+        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
+    }
 }

app/Support/Column.php

@@ -18,6 +18,8 @@ class Column extends Component
     use HasLabel;
     use HasName;
 
+    protected bool $isDate = false;
+
     final public function __construct(string $name)
     {
         $this->name($name);
@@ -40,4 +42,16 @@ class Column extends Component
             default => '',
         };
     }
+
+    public function markAsDate(): static
+    {
+        $this->isDate = true;
+
+        return $this;
+    }
+
+    public function isDate(): bool
+    {
+        return $this->isDate;
+    }
 }

app/Transformers/AccountBalanceReportTransformer.php

@@ -46,6 +46,8 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
                         'account_name' => [
                             'name' => $account->accountName,
                             'id' => $account->accountId ?? null,
+                            'start_date' => $account->startDate,
+                            'end_date' => $account->endDate,
                         ],
                         'starting_balance' => $account->balance->startingBalance ?? '',
                         'debit_balance' => $account->balance->debitBalance,

app/Transformers/IncomeStatementReportTransformer.php

@@ -0,0 +1,132 @@
+<?php
+
+namespace App\Transformers;
+
+use App\DTO\AccountDTO;
+use App\DTO\ReportCategoryDTO;
+use App\Support\Column;
+
+class IncomeStatementReportTransformer extends BaseReportTransformer
+{
+    protected string $totalRevenue = '$0.00';
+
+    protected string $totalCogs = '$0.00';
+
+    protected string $totalExpenses = '$0.00';
+
+    public function getTitle(): string
+    {
+        return 'Income Statement';
+    }
+
+    public function getHeaders(): array
+    {
+        return array_map(fn (Column $column) => $column->getLabel(), $this->getColumns());
+    }
+
+    public function calculateTotals(): void
+    {
+        foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
+            match ($accountCategoryName) {
+                'Revenue' => $this->totalRevenue = $accountCategory->summary->netMovement ?? '',
+                'Cost of Goods Sold' => $this->totalCogs = $accountCategory->summary->netMovement ?? '',
+                'Expenses' => $this->totalExpenses = $accountCategory->summary->netMovement ?? '',
+            };
+        }
+    }
+
+    public function getCategories(): array
+    {
+        $categories = [];
+
+        foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
+            // Initialize header with empty strings
+            $header = [];
+
+            foreach ($this->getColumns() as $index => $column) {
+                if ($column->getName() === 'account_name') {
+                    $header[$index] = $accountCategoryName;
+                } else {
+                    $header[$index] = '';
+                }
+            }
+
+            $data = array_map(function (AccountDTO $account) {
+                $row = [];
+
+                foreach ($this->getColumns() as $column) {
+                    $row[] = match ($column->getName()) {
+                        'account_code' => $account->accountCode,
+                        'account_name' => [
+                            'name' => $account->accountName,
+                            'id' => $account->accountId ?? null,
+                            'start_date' => $account->startDate,
+                            'end_date' => $account->endDate,
+                        ],
+                        'net_movement' => $account->balance->netMovement ?? '',
+                        default => '',
+                    };
+                }
+
+                return $row;
+            }, $accountCategory->accounts);
+
+            $summary = [];
+
+            foreach ($this->getColumns() as $column) {
+                $summary[] = match ($column->getName()) {
+                    'account_name' => 'Total ' . $accountCategoryName,
+                    'net_movement' => $accountCategory->summary->netMovement ?? '',
+                    default => '',
+                };
+            }
+
+            $categories[] = new ReportCategoryDTO(
+                header: $header,
+                data: $data,
+                summary: $summary,
+            );
+        }
+
+        return $categories;
+    }
+
+    public function getOverallTotals(): array
+    {
+        $totals = [];
+
+        foreach ($this->getColumns() as $column) {
+            $totals[] = match ($column->getName()) {
+                'account_name' => 'Net Earnings',
+                'net_movement' => $this->report->overallTotal->netMovement ?? '',
+                default => '',
+            };
+        }
+
+        return $totals;
+    }
+
+    public function getSummary(): array
+    {
+        $this->calculateTotals();
+
+        return [
+            [
+                'label' => 'Revenue',
+                'value' => $this->totalRevenue,
+            ],
+            [
+                'label' => 'Cost of Goods Sold',
+                'value' => $this->totalCogs,
+            ],
+            [
+                'label' => 'Expenses',
+                'value' => $this->totalExpenses,
+            ],
+            [
+                'label' => 'Net Earnings',
+                'value' => $this->report->overallTotal->netMovement ?? '',
+            ],
+        ];
+    }
+}

app/Transformers/TrialBalanceReportTransformer.php

@@ -46,6 +46,8 @@ class TrialBalanceReportTransformer extends BaseReportTransformer
                         'account_name' => [
                             'name' => $account->accountName,
                             'id' => $account->accountId ?? null,
+                            'start_date' => $account->startDate,
+                            'end_date' => $account->endDate,
                         ],
                         'debit_balance' => $account->balance->debitBalance,
                         'credit_balance' => $account->balance->creditBalance,

database/factories/UserFactory.php

@@ -68,7 +68,15 @@ class UserFactory extends Factory
 
         return $this->afterCreating(function (User $user) use ($countryCode) {
             Company::factory()
-                ->has(CompanyProfile::factory()->withCountry($countryCode), 'profile')
+                ->has(
+                    CompanyProfile::factory()
+                        ->withCountry($countryCode)
+                        ->state([
+                            'created_by' => $user->id,
+                            'updated_by' => $user->id,
+                        ]),
+                    'profile'
+                )
                 ->afterCreating(function (Company $company) use ($user, $countryCode) {
                     DB::transaction(function () use ($company, $user, $countryCode) {
                         $companyDefaultService = app()->make(CompanyDefaultService::class);

package-lock.json

@@ -541,9 +541,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.19.1.tgz",
-            "integrity": "sha512-XzqSg714++M+FXhHfXpS1tDnNZNpgxxuGZWlRG/jSj+VEPmZ0yg6jV4E0AL3uyBKxO8mO3xtOsP5mQ+XLfrlww==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz",
+            "integrity": "sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==",
             "cpu": [
                 "arm"
             ],
@@ -555,9 +555,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.19.1.tgz",
-            "integrity": "sha512-thFUbkHteM20BGShD6P08aungq4irbIZKUNbG70LN8RkO7YztcGPiKTTGZS7Kw+x5h8hOXs0i4OaHwFxlpQN6A==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz",
+            "integrity": "sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==",
             "cpu": [
                 "arm64"
             ],
@@ -569,9 +569,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.19.1.tgz",
-            "integrity": "sha512-8o6eqeFZzVLia2hKPUZk4jdE3zW7LCcZr+MD18tXkgBBid3lssGVAYuox8x6YHoEPDdDa9ixTaStcmx88lio5Q==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz",
+            "integrity": "sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==",
             "cpu": [
                 "arm64"
             ],
@@ -583,9 +583,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.19.1.tgz",
-            "integrity": "sha512-4T42heKsnbjkn7ovYiAdDVRRWZLU9Kmhdt6HafZxFcUdpjlBlxj4wDrt1yFWLk7G4+E+8p2C9tcmSu0KA6auGA==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz",
+            "integrity": "sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==",
             "cpu": [
                 "x64"
             ],
@@ -597,9 +597,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.19.1.tgz",
-            "integrity": "sha512-MXg1xp+e5GhZ3Vit1gGEyoC+dyQUBy2JgVQ+3hUrD9wZMkUw/ywgkpK7oZgnB6kPpGrxJ41clkPPnsknuD6M2Q==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz",
+            "integrity": "sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==",
             "cpu": [
                 "arm"
             ],
@@ -611,9 +611,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.19.1.tgz",
-            "integrity": "sha512-DZNLwIY4ftPSRVkJEaxYkq7u2zel7aah57HESuNkUnz+3bZHxwkCUkrfS2IWC1sxK6F2QNIR0Qr/YXw7nkF3Pw==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz",
+            "integrity": "sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==",
             "cpu": [
                 "arm"
             ],
@@ -625,9 +625,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.19.1.tgz",
-            "integrity": "sha512-C7evongnjyxdngSDRRSQv5GvyfISizgtk9RM+z2biV5kY6S/NF/wta7K+DanmktC5DkuaJQgoKGf7KUDmA7RUw==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz",
+            "integrity": "sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==",
             "cpu": [
                 "arm64"
             ],
@@ -639,9 +639,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.19.1.tgz",
-            "integrity": "sha512-89tFWqxfxLLHkAthAcrTs9etAoBFRduNfWdl2xUs/yLV+7XDrJ5yuXMHptNqf1Zw0UCA3cAutkAiAokYCkaPtw==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz",
+            "integrity": "sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==",
             "cpu": [
                 "arm64"
             ],
@@ -653,9 +653,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.19.1.tgz",
-            "integrity": "sha512-PromGeV50sq+YfaisG8W3fd+Cl6mnOOiNv2qKKqKCpiiEke2KiKVyDqG/Mb9GWKbYMHj5a01fq/qlUR28PFhCQ==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz",
+            "integrity": "sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==",
             "cpu": [
                 "ppc64"
             ],
@@ -667,9 +667,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.19.1.tgz",
-            "integrity": "sha512-/1BmHYh+iz0cNCP0oHCuF8CSiNj0JOGf0jRlSo3L/FAyZyG2rGBuKpkZVH9YF+x58r1jgWxvm1aRg3DHrLDt6A==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz",
+            "integrity": "sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==",
             "cpu": [
                 "riscv64"
             ],
@@ -681,9 +681,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.19.1.tgz",
-            "integrity": "sha512-0cYP5rGkQWRZKy9/HtsWVStLXzCF3cCBTRI+qRL8Z+wkYlqN7zrSYm6FuY5Kd5ysS5aH0q5lVgb/WbG4jqXN1Q==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz",
+            "integrity": "sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==",
             "cpu": [
                 "s390x"
             ],
@@ -695,9 +695,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.19.1.tgz",
-            "integrity": "sha512-XUXeI9eM8rMP8aGvii/aOOiMvTs7xlCosq9xCjcqI9+5hBxtjDpD+7Abm1ZhVIFE1J2h2VIg0t2DX/gjespC2Q==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz",
+            "integrity": "sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==",
             "cpu": [
                 "x64"
             ],
@@ -709,9 +709,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.19.1.tgz",
-            "integrity": "sha512-V7cBw/cKXMfEVhpSvVZhC+iGifD6U1zJ4tbibjjN+Xi3blSXaj/rJynAkCFFQfoG6VZrAiP7uGVzL440Q6Me2Q==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz",
+            "integrity": "sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==",
             "cpu": [
                 "x64"
             ],
@@ -723,9 +723,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.19.1.tgz",
-            "integrity": "sha512-88brja2vldW/76jWATlBqHEoGjJLRnP0WOEKAUbMcXaAZnemNhlAHSyj4jIwMoP2T750LE9lblvD4e2jXleZsA==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz",
+            "integrity": "sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==",
             "cpu": [
                 "arm64"
             ],
@@ -737,9 +737,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.19.1.tgz",
-            "integrity": "sha512-LdxxcqRVSXi6k6JUrTah1rHuaupoeuiv38du8Mt4r4IPer3kwlTo+RuvfE8KzZ/tL6BhaPlzJ3835i6CxrFIRQ==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz",
+            "integrity": "sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==",
             "cpu": [
                 "ia32"
             ],
@@ -751,9 +751,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.19.1.tgz",
-            "integrity": "sha512-2bIrL28PcK3YCqD9anGxDxamxdiJAxA+l7fWIwM5o8UqNy1t3d1NdAweO2XhA0KTDJ5aH1FsuiT5+7VhtHliXg==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz",
+            "integrity": "sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==",
             "cpu": [
                 "x64"
             ],
@@ -765,22 +765,22 @@
             ]
         },
         "node_modules/@tailwindcss/forms": {
-            "version": "0.5.7",
-            "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.7.tgz",
-            "integrity": "sha512-QE7X69iQI+ZXwldE+rzasvbJiyV/ju1FGHH0Qn2W3FKbuYtqp8LKcy6iSw79fVUT5/Vvf+0XgLCeYVG+UV6hOw==",
+            "version": "0.5.9",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.9.tgz",
+            "integrity": "sha512-tM4XVr2+UVTxXJzey9Twx48c1gcxFStqn1pQz0tRsX8o3DvxhN5oY5pvyAbUx7VTaZxpej4Zzvc6h+1RJBzpIg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "mini-svg-data-uri": "^1.2.3"
             },
             "peerDependencies": {
-                "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1"
+                "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1 || >= 4.0.0-alpha.20"
             }
         },
         "node_modules/@tailwindcss/typography": {
-            "version": "0.5.13",
-            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.13.tgz",
-            "integrity": "sha512-ADGcJ8dX21dVVHIwTRgzrcunY6YY9uSlAHHGVKvkA+vLc5qLwEszvKts40lx7z0qc4clpjclwLeK5rVCV2P/uw==",
+            "version": "0.5.15",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.15.tgz",
+            "integrity": "sha512-AqhlCXl+8grUz8uqExv5OTtgpjuVIwFTSXTrh8y9/pw6q2ek7fJ+Y8ZEVw7EB2DCcuCOtEjf9w3+J3rzts01uA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -790,7 +790,7 @@
                 "postcss-selector-parser": "6.0.10"
             },
             "peerDependencies": {
-                "tailwindcss": ">=3.0.0 || insiders"
+                "tailwindcss": ">=3.0.0 || insiders || >=4.0.0-alpha.20"
             }
         },
         "node_modules/@types/estree": {
@@ -801,9 +801,9 @@
             "license": "MIT"
         },
         "node_modules/ansi-regex": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-            "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+            "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -862,9 +862,9 @@
             "license": "MIT"
         },
         "node_modules/autoprefixer": {
-            "version": "10.4.19",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz",
-            "integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==",
+            "version": "10.4.20",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
+            "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
             "dev": true,
             "funding": [
                 {
@@ -882,11 +882,11 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "browserslist": "^4.23.0",
-                "caniuse-lite": "^1.0.30001599",
+                "browserslist": "^4.23.3",
+                "caniuse-lite": "^1.0.30001646",
                 "fraction.js": "^4.3.7",
                 "normalize-range": "^0.1.2",
-                "picocolors": "^1.0.0",
+                "picocolors": "^1.0.1",
                 "postcss-value-parser": "^4.2.0"
             },
             "bin": {
@@ -900,9 +900,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.7.2",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
-            "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
+            "version": "1.7.7",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+            "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -955,9 +955,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.23.2",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz",
-            "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==",
+            "version": "4.23.3",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
+            "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
             "dev": true,
             "funding": [
                 {
@@ -975,9 +975,9 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "caniuse-lite": "^1.0.30001640",
-                "electron-to-chromium": "^1.4.820",
-                "node-releases": "^2.0.14",
+                "caniuse-lite": "^1.0.30001646",
+                "electron-to-chromium": "^1.5.4",
+                "node-releases": "^2.0.18",
                 "update-browserslist-db": "^1.1.0"
             },
             "bin": {
@@ -998,9 +998,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001643",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz",
-            "integrity": "sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==",
+            "version": "1.0.30001659",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001659.tgz",
+            "integrity": "sha512-Qxxyfv3RdHAfJcXelgf0hU4DFUVXBGTjqrBUZLUh8AtlGnsDo+CnncYtTd95+ZKfnANUOzxyIQCuU/UeBZBYoA==",
             "dev": true,
             "funding": [
                 {
@@ -1159,9 +1159,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.2",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.2.tgz",
-            "integrity": "sha512-kc4r3U3V3WLaaZqThjYz/Y6z8tJe+7K0bbjUVo3i+LWIypVdMx5nXCkwRe6SWbY6ILqLdc1rKcKmr3HoH7wjSQ==",
+            "version": "1.5.18",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.18.tgz",
+            "integrity": "sha512-1OfuVACu+zKlmjsNdcJuVQuVE61sZOLbNM4JAQ1Rvh6EOj0/EUKhMJjRH73InPlXSh8HIJk1cVZ8pyOV/FMdUQ==",
             "dev": true,
             "license": "ISC"
         },
@@ -1212,9 +1212,9 @@
             }
         },
         "node_modules/escalade": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-            "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -1275,9 +1275,9 @@
             }
         },
         "node_modules/follow-redirects": {
-            "version": "1.15.6",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-            "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+            "version": "1.15.9",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+            "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
             "dev": true,
             "funding": [
                 {
@@ -1296,9 +1296,9 @@
             }
         },
         "node_modules/foreground-child": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz",
-            "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==",
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+            "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
@@ -1427,9 +1427,9 @@
             }
         },
         "node_modules/is-core-module": {
-            "version": "2.15.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz",
-            "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==",
+            "version": "2.15.1",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+            "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1594,9 +1594,9 @@
             }
         },
         "node_modules/micromatch": {
-            "version": "4.0.7",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
-            "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+            "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1786,9 +1786,9 @@
             }
         },
         "node_modules/picocolors": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-            "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+            "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
             "dev": true,
             "license": "ISC"
         },
@@ -1826,9 +1826,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.40",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz",
-            "integrity": "sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==",
+            "version": "8.4.45",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz",
+            "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==",
             "dev": true,
             "funding": [
                 {
@@ -1968,9 +1968,9 @@
             }
         },
         "node_modules/postcss-nested/node_modules/postcss-selector-parser": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz",
-            "integrity": "sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==",
+            "version": "6.1.2",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2056,9 +2056,9 @@
             }
         },
         "node_modules/postcss-nesting/node_modules/postcss-selector-parser": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz",
-            "integrity": "sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==",
+            "version": "6.1.2",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2171,9 +2171,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.19.1",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.19.1.tgz",
-            "integrity": "sha512-K5vziVlg7hTpYfFBI+91zHBEMo6jafYXpkMlqZjg7/zhIG9iHqazBf4xz9AVdjS9BruRn280ROqLI7G3OFRIlw==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.2.tgz",
+            "integrity": "sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2187,22 +2187,22 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.19.1",
-                "@rollup/rollup-android-arm64": "4.19.1",
-                "@rollup/rollup-darwin-arm64": "4.19.1",
-                "@rollup/rollup-darwin-x64": "4.19.1",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.19.1",
-                "@rollup/rollup-linux-arm-musleabihf": "4.19.1",
-                "@rollup/rollup-linux-arm64-gnu": "4.19.1",
-                "@rollup/rollup-linux-arm64-musl": "4.19.1",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.19.1",
-                "@rollup/rollup-linux-riscv64-gnu": "4.19.1",
-                "@rollup/rollup-linux-s390x-gnu": "4.19.1",
-                "@rollup/rollup-linux-x64-gnu": "4.19.1",
-                "@rollup/rollup-linux-x64-musl": "4.19.1",
-                "@rollup/rollup-win32-arm64-msvc": "4.19.1",
-                "@rollup/rollup-win32-ia32-msvc": "4.19.1",
-                "@rollup/rollup-win32-x64-msvc": "4.19.1",
+                "@rollup/rollup-android-arm-eabi": "4.21.2",
+                "@rollup/rollup-android-arm64": "4.21.2",
+                "@rollup/rollup-darwin-arm64": "4.21.2",
+                "@rollup/rollup-darwin-x64": "4.21.2",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.21.2",
+                "@rollup/rollup-linux-arm-musleabihf": "4.21.2",
+                "@rollup/rollup-linux-arm64-gnu": "4.21.2",
+                "@rollup/rollup-linux-arm64-musl": "4.21.2",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.21.2",
+                "@rollup/rollup-linux-riscv64-gnu": "4.21.2",
+                "@rollup/rollup-linux-s390x-gnu": "4.21.2",
+                "@rollup/rollup-linux-x64-gnu": "4.21.2",
+                "@rollup/rollup-linux-x64-musl": "4.21.2",
+                "@rollup/rollup-win32-arm64-msvc": "4.21.2",
+                "@rollup/rollup-win32-ia32-msvc": "4.21.2",
+                "@rollup/rollup-win32-x64-msvc": "4.21.2",
                 "fsevents": "~2.3.2"
             }
         },
@@ -2267,9 +2267,9 @@
             }
         },
         "node_modules/source-map-js": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-            "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+            "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
             "dev": true,
             "license": "BSD-3-Clause",
             "engines": {
@@ -2417,9 +2417,9 @@
             }
         },
         "node_modules/tailwindcss": {
-            "version": "3.4.7",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.7.tgz",
-            "integrity": "sha512-rxWZbe87YJb4OcSopb7up2Ba4U82BoiSGUdoDr3Ydrg9ckxFS/YWsvhN323GMcddgU65QRy7JndC7ahhInhvlQ==",
+            "version": "3.4.10",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.10.tgz",
+            "integrity": "sha512-KWZkVPm7yJRhdu4SRSl9d4AK2wM3a50UsvgHZO7xY77NQr2V+fIrEuoDGQcbvswWvFGbS2f6e+jC/6WJm1Dl0w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2455,9 +2455,9 @@
             }
         },
         "node_modules/tailwindcss/node_modules/postcss-selector-parser": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz",
-            "integrity": "sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==",
+            "version": "6.1.2",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2550,15 +2550,15 @@
             "license": "MIT"
         },
         "node_modules/vite": {
-            "version": "5.3.5",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.5.tgz",
-            "integrity": "sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==",
+            "version": "5.4.3",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.3.tgz",
+            "integrity": "sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "esbuild": "^0.21.3",
-                "postcss": "^8.4.39",
-                "rollup": "^4.13.0"
+                "postcss": "^8.4.43",
+                "rollup": "^4.20.0"
             },
             "bin": {
                 "vite": "bin/vite.js"
@@ -2577,6 +2577,7 @@
                 "less": "*",
                 "lightningcss": "^1.21.0",
                 "sass": "*",
+                "sass-embedded": "*",
                 "stylus": "*",
                 "sugarss": "*",
                 "terser": "^5.4.0"
@@ -2594,6 +2595,9 @@
                 "sass": {
                     "optional": true
                 },
+                "sass-embedded": {
+                    "optional": true
+                },
                 "stylus": {
                     "optional": true
                 },
@@ -2731,9 +2735,9 @@
             }
         },
         "node_modules/yaml": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz",
-            "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==",
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz",
+            "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==",
             "dev": true,
             "license": "ISC",
             "bin": {

resources/css/filament/company/theme.css

@@ -13,8 +13,7 @@
 }
 
 .choices__group {
-    color: rgba(var(--gray-900), 1);
-    font-weight: bold;
+    @apply text-gray-900 dark:text-white font-semibold;
 }
 
 .choices[data-type="select-one"] .choices__inner {
@@ -25,7 +24,7 @@
     box-sizing: border-box;
 }
 
-.choices__item {
+.choices:not(.is-disabled) .choices__item {
     cursor: pointer;
 }
 
@@ -148,13 +147,12 @@
     left: 0;
     width: 100%;
     height: 100%;
-    background-image:
-        linear-gradient(99.6deg,
-            rgba(232, 233, 235, 1) 10.6%,
-            rgba(240, 241, 243, 1) 32.9%,
-            rgba(248, 249, 251, 0.7) 50%,
-            rgba(240, 241, 243, 1) 67.1%,
-            rgba(232, 233, 235, 1) 83.4%);
+    background-image: linear-gradient(99.6deg,
+    rgba(232, 233, 235, 1) 10.6%,
+    rgba(240, 241, 243, 1) 32.9%,
+    rgba(248, 249, 251, 0.7) 50%,
+    rgba(240, 241, 243, 1) 67.1%,
+    rgba(232, 233, 235, 1) 83.4%);
     pointer-events: none;
     z-index: -1;
 }
@@ -178,7 +176,7 @@
         rgba(var(--primary-900), 0.5) 45%,
         rgba(var(--primary-950), 0.3) 60%,
         rgba(var(--primary-950), 0.1) 75%,
-        rgba(3,7,18,0) 100%
+        rgba(3, 7, 18, 0) 100%
     );
     width: 100%;
     height: 100%;

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

@@ -129,7 +129,11 @@
                 ])>
                 @foreach($transaction as $cellIndex => $cell)
                     <td class="{{ $report->getAlignmentClass($cellIndex) }} {{ $cellIndex === 1 ? 'whitespace-normal' : 'whitespace-nowrap' }}">
-                        {{ $cell }}
+                        @if(is_array($cell) && isset($cell['description']))
+                            {{ $cell['description'] }}
+                        @else
+                            {{ $cell }}
+                        @endif
                     </td>
                 @endforeach
             </tr>

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

@@ -84,7 +84,7 @@
 
         .category-summary-row > td,
         .table-footer-row > td {
-            font-weight: 600;
+            font-weight: bold;
             background-color: #ffffff; /* White background for footer */
         }
     </style>
@@ -118,7 +118,7 @@
             <tr>
                 @foreach($account as $index => $cell)
                     <td class="{{ $report->getAlignmentClass($index) }} {{ $index === 1 ? 'whitespace-normal' : 'whitespace-nowrap' }}">
-                        @if(isset($cell['id']) && isset($cell['name']))
+                        @if(is_array($cell) && isset($cell['name']))
                             {{ $cell['name'] }}
                         @else
                             {{ $cell }}
@@ -139,7 +139,7 @@
         </tr>
         </tbody>
     @endforeach
-    <tfoot>
+    <tbody>
     <tr class="table-footer-row">
         @foreach ($report->getOverallTotals() as $index => $total)
             <td class="{{ $report->getAlignmentClass($index) }}">
@@ -147,7 +147,7 @@
             </td>
         @endforeach
     </tr>
-    </tfoot>
+    </tbody>
 </table>
 </body>
 </html>

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

@@ -1,4 +1,4 @@
-<table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5" x-data>
+<table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
     <thead class="divide-y divide-gray-200 dark:divide-white/5">
     <tr class="bg-gray-50 dark:bg-white/5">
         @foreach($report->getHeaders() as $index => $header)
@@ -27,14 +27,32 @@
                     <x-filament-tables::cell class="{{ $report->getAlignmentClass($cellIndex) }}">
                         <div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">
                             @if(is_array($cell) && isset($cell['name']))
-                                @if(isset($cell['id']))
+                                @if($cell['name'] === 'Retained Earnings' && isset($cell['start_date']) && isset($cell['end_date']))
                                     <x-filament::link
                                         color="primary"
                                         target="_blank"
                                         icon="heroicon-o-arrow-top-right-on-square"
                                         :icon-position="\Filament\Support\Enums\IconPosition::After"
                                         :icon-size="\Filament\Support\Enums\IconSize::Small"
-                                        href="{{ \App\Filament\Company\Pages\Reports\AccountTransactions::getUrl(['account_id' => $cell['id']]) }}"
+                                        href="{{ \App\Filament\Company\Pages\Reports\IncomeStatement::getUrl([
+                                            'startDate' => $cell['start_date'],
+                                            'endDate' => $cell['end_date']
+                                        ]) }}"
+                                    >
+                                        {{ $cell['name'] }}
+                                    </x-filament::link>
+                                @elseif(isset($cell['id']) && isset($cell['start_date']) && isset($cell['end_date']))
+                                    <x-filament::link
+                                        color="primary"
+                                        target="_blank"
+                                        icon="heroicon-o-arrow-top-right-on-square"
+                                        :icon-position="\Filament\Support\Enums\IconPosition::After"
+                                        :icon-size="\Filament\Support\Enums\IconSize::Small"
+                                        href="{{ \App\Filament\Company\Pages\Reports\AccountTransactions::getUrl([
+                                            'startDate' => $cell['start_date'],
+                                            'endDate' => $cell['end_date'],
+                                            'selectedAccount' => $cell['id']
+                                        ]) }}"
                                     >
                                         {{ $cell['name'] }}
                                     </x-filament::link>

resources/views/components/panel-shift-dropdown.blade.php

@@ -11,8 +11,8 @@
     $panels = $component->getNavigationAsHierarchyArray();
 @endphp
 
-<div x-data="panelShiftDropdown">
-    <div x-on:click="toggleDropdown()" class="flex cursor-pointer">
+<div x-data="panelShiftDropdown" x-on:click.outside="closeDropdown">
+    <div x-on:click="toggleDropdown" class="flex cursor-pointer">
         <button
             type="button"
             class="fi-tenant-menu-trigger group flex w-full items-center justify-center gap-x-3 rounded-lg p-2 text-sm font-medium outline-none transition duration-75 hover:bg-gray-100 focus-visible:bg-gray-100 dark:hover:bg-white/5 dark:focus-visible:bg-white/5"
@@ -41,22 +41,25 @@
             />
         </button>
     </div>
-    <div x-show="open" class="flex flex-col transition duration-200 ease-in-out grow shrink mt-4 absolute z-10 w-screen max-w-[360px] end-8 rounded-lg bg-white shadow-lg ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10 overflow-hidden">
+    <div x-show="open"
+         class="flex flex-col transition duration-200 ease-in-out grow shrink mt-4 absolute z-10 w-screen max-w-[360px] end-8 rounded-lg bg-white shadow-lg ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10 overflow-hidden">
         @foreach($panels as $panelId => $panel)
             <x-panel-shift-dropdown.panel :panel-id="$panelId">
                 @if($panelId !== 'main' && isset($panel['label']))
-                    <x-panel-shift-dropdown.subpanel-header :label="$panel['label']" :panel-id="$panelId" />
+                    <x-panel-shift-dropdown.subpanel-header :label="$panel['label']" :panel-id="$panelId"/>
                 @endif
                 @if($panel['renderItems'])
                     @foreach($panel['items'] as $item)
-                        <x-panel-shift-dropdown.content-handler :item="$item" />
+                        <x-panel-shift-dropdown.content-handler :item="$item"/>
                     @endforeach
                 @endif
                 @if($panelId === 'company-settings')
-                    <x-panel-shift-dropdown.company-settings :current-tenant="$currentTenant" icon="heroicon-m-building-office-2" />
+                    <x-panel-shift-dropdown.company-settings :current-tenant="$currentTenant"
+                                                             icon="heroicon-m-building-office-2"/>
                 @endif
                 @if($panelId === 'company-switcher')
-                    <x-panel-shift-dropdown.company-switcher :current-tenant="$currentTenant" icon="heroicon-m-adjustments-horizontal" />
+                    <x-panel-shift-dropdown.company-switcher :current-tenant="$currentTenant"
+                                                             icon="heroicon-m-adjustments-horizontal"/>
                 @endif
                 @if($panelId === 'display-and-accessibility')
                     <x-panel-shift-dropdown.display-accessibility icon="heroicon-s-moon"/>
@@ -91,6 +94,10 @@
                 this.open = !this.open;
             },
 
+            closeDropdown() {
+                this.open = false;
+            },
+
             setActiveMenu(menu) {
                 this.transitionPanel(menu, 'forward');
             },

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

@@ -1,19 +1,24 @@
 <x-filament-panels::page>
+    <x-filament::section>
+        @if(method_exists($this, 'filtersForm'))
+            {{ $this->filtersForm }}
+        @endif
+    </x-filament::section>
+
     <x-filament-tables::container>
-        <form wire:submit="loadReportData" class="p-6">
-            {{ $this->form }}
-        </form>
-        <div class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
-            <div wire:init="loadReportData" class="flex items-center justify-center w-full h-full absolute">
-                <div wire:loading wire:target="loadReportData">
-                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300" />
+        <div class="es-table__header-ctn"></div>
+        <div
+            class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
+            <div wire:init="applyFilters" class="flex items-center justify-center w-full h-full absolute">
+                <div wire:loading wire:target="applyFilters">
+                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
                 </div>
             </div>
 
             @if($this->reportLoaded)
-                <div wire:loading.remove wire:target="loadReportData">
+                <div wire:loading.remove wire:target="applyFilters">
                     @if($this->report && !$this->tableHasEmptyState())
-                        <x-company.tables.reports.account-transactions :report="$this->report" />
+                        <x-company.tables.reports.account-transactions :report="$this->report"/>
                     @else
                         <x-filament-tables::empty-state
                             :actions="$this->getEmptyStateActions()"

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

@@ -1,33 +1,41 @@
 <x-filament-panels::page>
+    <x-filament::section>
+        <div class="flex flex-col md:flex-row items-start md:items-center justify-between gap-4">
+            <!-- Form Container -->
+            @if(method_exists($this, 'filtersForm'))
+                {{ $this->filtersForm }}
+            @endif
+
+            <!-- Grouping Button and Column Toggle -->
+            @if($this->hasToggleableColumns())
+                <x-filament-tables::column-toggle.dropdown
+                    :form="$this->toggleTableColumnForm"
+                    :trigger-action="$this->toggleColumnsAction"
+                />
+            @endif
+
+            <div class="inline-flex items-center min-w-0 md:min-w-[9.5rem] justify-end">
+                {{ $this->applyFiltersAction }}
+            </div>
+        </div>
+    </x-filament::section>
+
     <x-filament-tables::container>
-        <form wire:submit="loadReportData" class="p-6">
-            <div class="flex flex-col md:flex-row items-start md:items-center justify-center gap-4 md:gap-12">
-                {{ $this->form }}
-                @if($this->hasToggleableColumns())
-                    <x-filament-tables::column-toggle.dropdown
-                        :form="$this->toggleTableColumnForm"
-                        :trigger-action="$this->toggleColumnsAction"
-                    />
-                @endif
-                <x-filament::button type="submit" wire:target="loadReportData" class="flex-shrink-0">
-                    Update Report
-                </x-filament::button>
+        <div class="es-table__header-ctn"></div>
+        <div
+            class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
+            <div wire:init="applyFilters" class="flex items-center justify-center w-full h-full absolute">
+                <div wire:loading wire:target="applyFilters">
+                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
+                </div>
             </div>
-        </form>
-        <div wire:init="loadReportData"
-             class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
+
             @if($this->reportLoaded)
-                <div wire:loading.remove wire:target="loadReportData">
+                <div wire:loading.remove wire:target="applyFilters">
                     @if($this->report)
                         <x-company.tables.reports.detailed-report :report="$this->report"/>
                     @endif
                 </div>
-            @else
-                <div class="absolute inset-0 flex items-center justify-center">
-                    <div wire:loading wire:target="loadReportData">
-                        <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
-                    </div>
-                </div>
             @endif
         </div>
         <div class="es-table__footer-ctn border-t border-gray-200"></div>

resources/views/filament/company/pages/reports/income-statement.blade.php

@@ -0,0 +1,81 @@
+<x-filament-panels::page>
+    <x-filament::section>
+        <div class="flex flex-col md:flex-row items-start md:items-center justify-between gap-4">
+            <!-- Form Container -->
+            @if(method_exists($this, 'filtersForm'))
+                {{ $this->filtersForm }}
+            @endif
+
+            <!-- Grouping Button and Column Toggle -->
+            @if($this->hasToggleableColumns())
+                <x-filament-tables::column-toggle.dropdown
+                    :form="$this->toggleTableColumnForm"
+                    :trigger-action="$this->toggleColumnsAction"
+                />
+            @endif
+
+            <div class="inline-flex items-center min-w-0 md:min-w-[9.5rem] justify-end">
+                {{ $this->applyFiltersAction }}
+            </div>
+        </div>
+    </x-filament::section>
+
+
+    <x-filament::section>
+        <!-- Summary Section -->
+        @if($this->reportLoaded)
+            <div
+                class="flex flex-col md:flex-row items-center md:items-end text-center justify-center gap-4 md:gap-8">
+                @foreach($this->report->getSummary() as $summary)
+                    <div class="text-sm">
+                        <div class="text-gray-600 font-medium mb-2">{{ $summary['label'] }}</div>
+
+                        @php
+                            $isNetEarnings = $summary['label'] === 'Net Earnings';
+                            $isPositive = money($summary['value'], \App\Utilities\Currency\CurrencyAccessor::getDefaultCurrency())->isPositive();
+                        @endphp
+
+                        <strong
+                            @class([
+                                'text-lg',
+                                'text-green-700' => $isNetEarnings && $isPositive,
+                                'text-danger-700' => $isNetEarnings && ! $isPositive,
+                            ])
+                        >
+                            {{ $summary['value'] }}
+                        </strong>
+                    </div>
+
+                    @if(! $loop->last)
+                        <div class="flex items-center justify-center px-2">
+                            <strong class="text-lg">
+                                {{ $loop->remaining === 1 ? '=' : '-' }}
+                            </strong>
+                        </div>
+                    @endif
+                @endforeach
+            </div>
+        @endif
+    </x-filament::section>
+
+    <x-filament-tables::container>
+        <div class="es-table__header-ctn"></div>
+        <div
+            class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
+            <div wire:init="applyFilters" class="flex items-center justify-center w-full h-full absolute">
+                <div wire:loading wire:target="applyFilters">
+                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
+                </div>
+            </div>
+
+            @if($this->reportLoaded)
+                <div wire:loading.remove wire:target="applyFilters">
+                    @if($this->report)
+                        <x-company.tables.reports.detailed-report :report="$this->report"/>
+                    @endif
+                </div>
+            @endif
+        </div>
+        <div class="es-table__footer-ctn border-t border-gray-200"></div>
+    </x-filament-tables::container>
+</x-filament-panels::page>