wip

README.md

@@ -5,14 +5,14 @@
 ![Screenshot 2023-12-06 at 3 28 46 AM](https://github.com/andrewdwallo/erpsaas/assets/104294090/33beed6c-3ff5-4819-a8ae-71feaa6b95da)
 ![Screenshot 2023-12-07 at 11 12 30 PM](https://github.com/andrewdwallo/erpsaas/assets/104294090/bdef3b98-f456-4b70-bf76-4a5b435c0939)
 
-
 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
 
@@ -74,48 +74,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
@@ -125,7 +135,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' => [
@@ -138,28 +149,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
 {
@@ -170,12 +194,16 @@ public static function getAllLanguages(): array
 ## 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
 
-***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/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

@@ -22,12 +22,16 @@ trait CompanyOwned
                     session(['current_company_id' => $companyId]);
                 }
 
+                if (! $companyId) {
+                    $companyId = Auth::user()->currentCompany->id;
+                }
+
                 if ($companyId) {
                     $model->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.');
+                    throw new ModelNotFoundException('CurrentCompanyScope: No company_id set in the session, user, or database.');
                 }
             }
         });

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

@@ -62,8 +62,6 @@ trait HasDeferredFiltersForm
     public function updatedFilters(): void
     {
         $this->deferredFilters = $this->filters;
-
-        $this->handleFilterUpdates();
     }
 
     protected function isValidDate($date): bool
@@ -71,17 +69,10 @@ trait HasDeferredFiltersForm
         return strtotime($date) !== false;
     }
 
-    protected function handleFilterUpdates(): void
-    {
-        //
-    }
-
     public function applyFilters(): void
     {
         $this->filters = $this->deferredFilters;
 
-        $this->handleFilterUpdates();
-
         $this->loadReportData();
     }
 
@@ -185,9 +176,4 @@ trait HasDeferredFiltersForm
             }
         }
     }
-
-    protected function isDateFilter($value): bool
-    {
-        return $value instanceof Carbon || strtotime($value) !== false;
-    }
 }

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

@@ -14,6 +14,7 @@ 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;
@@ -38,6 +39,11 @@ class AccountTransactions extends BaseReportPage
         $this->exportService = $exportService;
     }
 
+    public function getMaxContentWidth(): MaxWidth | string | null
+    {
+        return 'max-w-[90rem]';
+    }
+
     protected function initializeDefaultFilters(): void
     {
         if (empty($this->getFilterState('selectedAccount'))) {
@@ -45,11 +51,6 @@ class AccountTransactions extends BaseReportPage
         }
     }
 
-    protected function extraQueryStrings(): array
-    {
-        return ['selectedAccount'];
-    }
-
     /**
      * @return array<Column>
      */

app/Scopes/CurrentCompanyScope.php

@@ -16,6 +16,10 @@ class CurrentCompanyScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
+        if (app()->runningInConsole()) {
+            return;
+        }
+
         $companyId = session('current_company_id');
 
         if (! $companyId && Auth::check() && Auth::user()->currentCompany) {
@@ -23,6 +27,10 @@ class CurrentCompanyScope implements Scope
             session(['current_company_id' => $companyId]);
         }
 
+        if (! $companyId) {
+            $companyId = Auth::user()->currentCompany->id;
+        }
+
         if ($companyId) {
             $builder->where("{$model->getTable()}.company_id", $companyId);
         } else {

app/Services/ReportService.php

@@ -274,6 +274,9 @@ class ReportService
             }
 
             if ($category === AccountCategory::Equity) {
+                $modifiedStartDate = Carbon::parse($this->accountService->getEarliestTransactionDate())->startOfYear()->toDateString();
+                $modifiedEndDate = Carbon::parse($startDate)->subYear()->endOfYear()->toDateString();
+
                 $retainedEarningsAmount = $this->calculateRetainedEarnings($startDate)->getAmount();
                 $isCredit = $retainedEarningsAmount >= 0;
 
@@ -287,8 +290,8 @@ class ReportService
                         'debit_balance' => $isCredit ? 0 : abs($retainedEarningsAmount),
                         'credit_balance' => $isCredit ? $retainedEarningsAmount : 0,
                     ]),
-                    null,
-                    null,
+                    $modifiedStartDate,
+                    $modifiedEndDate,
                 );
             }
 

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,

composer.lock

@@ -156,16 +156,16 @@
         },
         {
             "name": "andrewdwallo/filament-selectify",
-            "version": "v2.0.8",
+            "version": "v2.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/andrewdwallo/filament-selectify.git",
-                "reference": "53395a2db9c1c3afd819e0aa526a300b476db0db"
+                "reference": "2c01aae4f9ef9910b8746805ebd3ee6801aad57d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/andrewdwallo/filament-selectify/zipball/53395a2db9c1c3afd819e0aa526a300b476db0db",
-                "reference": "53395a2db9c1c3afd819e0aa526a300b476db0db",
+                "url": "https://api.github.com/repos/andrewdwallo/filament-selectify/zipball/2c01aae4f9ef9910b8746805ebd3ee6801aad57d",
+                "reference": "2c01aae4f9ef9910b8746805ebd3ee6801aad57d",
                 "shasum": ""
             },
             "require": {
@@ -214,9 +214,9 @@
             ],
             "support": {
                 "issues": "https://github.com/andrewdwallo/filament-selectify/issues",
-                "source": "https://github.com/andrewdwallo/filament-selectify/tree/v2.0.8"
+                "source": "https://github.com/andrewdwallo/filament-selectify/tree/v2.0.9"
             },
-            "time": "2024-06-27T20:42:06+00:00"
+            "time": "2024-09-10T00:21:38+00:00"
         },
         {
             "name": "andrewdwallo/transmatic",
@@ -302,16 +302,16 @@
         },
         {
             "name": "anourvalar/eloquent-serialize",
-            "version": "1.2.23",
+            "version": "1.2.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/AnourValar/eloquent-serialize.git",
-                "reference": "fd7bc1dc2c98fe705647ab4b81d13ea3d599ea1f"
+                "reference": "77e3fc7da44fa96b6148a1613dd76fe954a5f279"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/AnourValar/eloquent-serialize/zipball/fd7bc1dc2c98fe705647ab4b81d13ea3d599ea1f",
-                "reference": "fd7bc1dc2c98fe705647ab4b81d13ea3d599ea1f",
+                "url": "https://api.github.com/repos/AnourValar/eloquent-serialize/zipball/77e3fc7da44fa96b6148a1613dd76fe954a5f279",
+                "reference": "77e3fc7da44fa96b6148a1613dd76fe954a5f279",
                 "shasum": ""
             },
             "require": {
@@ -362,9 +362,9 @@
             ],
             "support": {
                 "issues": "https://github.com/AnourValar/eloquent-serialize/issues",
-                "source": "https://github.com/AnourValar/eloquent-serialize/tree/1.2.23"
+                "source": "https://github.com/AnourValar/eloquent-serialize/tree/1.2.24"
             },
-            "time": "2024-07-12T10:52:26+00:00"
+            "time": "2024-09-08T15:57:08+00:00"
         },
         {
             "name": "awcodes/filament-table-repeater",
@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.321.6",
+            "version": "3.321.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "3dc53a79677dd1f0e682dfc05f9815901ec7bf58"
+                "reference": "c64ee32d80ec2ab5d8d6a0b77297c2d69602ef3b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3dc53a79677dd1f0e682dfc05f9815901ec7bf58",
-                "reference": "3dc53a79677dd1f0e682dfc05f9815901ec7bf58",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c64ee32d80ec2ab5d8d6a0b77297c2d69602ef3b",
+                "reference": "c64ee32d80ec2ab5d8d6a0b77297c2d69602ef3b",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.321.6"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.321.7"
             },
-            "time": "2024-09-06T18:06:38+00:00"
+            "time": "2024-09-09T18:09:23+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -7681,20 +7681,20 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "0424dff1c58f028c451efff2045f5d92410bd540"
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540",
-                "reference": "0424dff1c58f028c451efff2045f5d92410bd540",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-ctype": "*"
@@ -7740,7 +7740,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -7756,24 +7756,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a"
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a",
-                "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -7818,7 +7818,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -7834,26 +7834,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c"
+                "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c",
-                "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773",
+                "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "symfony/polyfill-intl-normalizer": "^1.10",
-                "symfony/polyfill-php72": "^1.10"
+                "php": ">=7.2",
+                "symfony/polyfill-intl-normalizer": "^1.10"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -7902,7 +7901,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -7918,24 +7917,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb"
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb",
-                "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -7983,7 +7982,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -7999,24 +7998,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c"
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c",
-                "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-mbstring": "*"
@@ -8063,7 +8062,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -8079,97 +8078,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-19T12:30:46+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.30.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "10112722600777e02d2745716b70c5db4ca70442"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/10112722600777e02d2745716b70c5db4ca70442",
-                "reference": "10112722600777e02d2745716b70c5db4ca70442",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.30.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-06-19T12:30:46+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "77fa7995ac1b21ab60769b7323d600a991a90433"
+                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433",
-                "reference": "77fa7995ac1b21ab60769b7323d600a991a90433",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
@@ -8216,7 +8142,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -8232,24 +8158,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-php83",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php83.git",
-                "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9"
+                "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9",
-                "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491",
+                "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
@@ -8292,7 +8218,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -8308,24 +8234,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-19T12:35:24+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
-                "reference": "2ba1f33797470debcda07fe9dce20a0003df18e9"
+                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/2ba1f33797470debcda07fe9dce20a0003df18e9",
-                "reference": "2ba1f33797470debcda07fe9dce20a0003df18e9",
+                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
+                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-uuid": "*"
@@ -8371,7 +8297,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -8387,7 +8313,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/process",
@@ -10103,16 +10029,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.2",
+            "version": "1.12.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "0ca1c7bb55fca8fe6448f16fff0f311ccec960a1"
+                "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0ca1c7bb55fca8fe6448f16fff0f311ccec960a1",
-                "reference": "0ca1c7bb55fca8fe6448f16fff0f311ccec960a1",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0fcbf194ab63d8159bb70d9aa3e1350051632009",
+                "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009",
                 "shasum": ""
             },
             "require": {
@@ -10157,7 +10083,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-05T16:09:28+00:00"
+            "time": "2024-09-09T08:10:35+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -10482,16 +10408,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.32",
+            "version": "10.5.33",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "f069f46840445d37a4e6f0de8c5879598f9c4327"
+                "reference": "4def7a9cda75af9c2bc179ed53a8e41313e7f7cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f069f46840445d37a4e6f0de8c5879598f9c4327",
-                "reference": "f069f46840445d37a4e6f0de8c5879598f9c4327",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4def7a9cda75af9c2bc179ed53a8e41313e7f7cf",
+                "reference": "4def7a9cda75af9c2bc179ed53a8e41313e7f7cf",
                 "shasum": ""
             },
             "require": {
@@ -10563,7 +10489,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.32"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.33"
             },
             "funding": [
                 {
@@ -10579,25 +10505,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-04T13:33:39+00:00"
+            "time": "2024-09-09T06:06:56+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "1.2.4",
+            "version": "1.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "42a4aa23b48b4cfc8ebfeac2b570364e27744381"
+                "reference": "e98aa793ca3fcd17e893cfaf9103ac049775d339"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/42a4aa23b48b4cfc8ebfeac2b570364e27744381",
-                "reference": "42a4aa23b48b4cfc8ebfeac2b570364e27744381",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/e98aa793ca3fcd17e893cfaf9103ac049775d339",
+                "reference": "e98aa793ca3fcd17e893cfaf9103ac049775d339",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.11.11"
+                "phpstan/phpstan": "^1.12.2"
             },
             "conflict": {
                 "rector/rector-doctrine": "*",
@@ -10630,7 +10556,7 @@
             ],
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/1.2.4"
+                "source": "https://github.com/rectorphp/rector/tree/1.2.5"
             },
             "funding": [
                 {
@@ -10638,7 +10564,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-08-23T09:03:01+00:00"
+            "time": "2024-09-08T17:43:24+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -12160,20 +12086,20 @@
         },
         {
             "name": "symfony/polyfill-iconv",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-iconv.git",
-                "reference": "c027e6a3c6aee334663ec21f5852e89738abc805"
+                "reference": "48becf00c920479ca2e910c22a5a39e5d47ca956"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c027e6a3c6aee334663ec21f5852e89738abc805",
-                "reference": "c027e6a3c6aee334663ec21f5852e89738abc805",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/48becf00c920479ca2e910c22a5a39e5d47ca956",
+                "reference": "48becf00c920479ca2e910c22a5a39e5d47ca956",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-iconv": "*"
@@ -12220,7 +12146,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -12236,7 +12162,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/stopwatch",

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

@@ -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": {
@@ -998,9 +998,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001658",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001658.tgz",
-            "integrity": "sha512-N2YVqWbJELVdrnsW5p+apoQyYt51aBMSsBZki1XZEfeBCexcM/sf4xiAHcXQBkuOwJBXtWF7aW1sYX6tKebPHw==",
+            "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": [
                 {
@@ -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": {

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,7 +27,21 @@
                     <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']) && isset($cell['start_date']) && isset($cell['end_date']))
+                                @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\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"

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

@@ -1,22 +1,20 @@
 <x-filament-panels::page>
     <x-filament::section>
-        <div class="flex flex-col md:flex-row items-start md:items-center justify-between gap-4 md:gap-8">
+        <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 -->
-            <div class="flex flex-col md:flex-row items-start md:items-center gap-4 md:gap-8 flex-shrink-0">
-                @if($this->hasToggleableColumns())
-                    <x-filament-tables::column-toggle.dropdown
-                        :form="$this->toggleTableColumnForm"
-                        :trigger-action="$this->toggleColumnsAction"
-                    />
-                @endif
-            </div>
+            @if($this->hasToggleableColumns())
+                <x-filament-tables::column-toggle.dropdown
+                    :form="$this->toggleTableColumnForm"
+                    :trigger-action="$this->toggleColumnsAction"
+                />
+            @endif
 
-            <div class="inline-flex items-center flex-shrink-0 min-w-[8.5rem] justify-end">
+            <div class="inline-flex items-center min-w-0 md:min-w-[9.5rem] justify-end">
                 {{ $this->applyFiltersAction }}
             </div>
         </div>

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

@@ -1,22 +1,20 @@
 <x-filament-panels::page>
     <x-filament::section>
-        <div class="flex flex-col md:flex-row items-start md:items-center justify-between gap-4 md:gap-8">
+        <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 -->
-            <div class="flex flex-col md:flex-row items-start md:items-center gap-4 md:gap-8 flex-shrink-0">
-                @if($this->hasToggleableColumns())
-                    <x-filament-tables::column-toggle.dropdown
-                        :form="$this->toggleTableColumnForm"
-                        :trigger-action="$this->toggleColumnsAction"
-                    />
-                @endif
-            </div>
+            @if($this->hasToggleableColumns())
+                <x-filament-tables::column-toggle.dropdown
+                    :form="$this->toggleTableColumnForm"
+                    :trigger-action="$this->toggleColumnsAction"
+                />
+            @endif
 
-            <div class="inline-flex items-center flex-shrink-0 min-w-[8.5rem] justify-end">
+            <div class="inline-flex items-center min-w-0 md:min-w-[9.5rem] justify-end">
                 {{ $this->applyFiltersAction }}
             </div>
         </div>