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

Development 3.x

app/Filament/Forms/Components/DocumentHeaderSection.php

@@ -2,6 +2,7 @@
 
 namespace App\Filament\Forms\Components;
 
+use App\DTO\CompanyDTO;
 use Closure;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Group;
@@ -73,12 +74,7 @@ class DocumentHeaderSection extends Section
                         ->default(fn () => $this->getDefaultSubheader()),
                     View::make('filament.forms.components.company-info')
                         ->viewData([
-                            'company_name' => $company->name,
-                            'company_address' => $company->profile->address,
-                            'company_city' => $company->profile->city?->name,
-                            'company_state' => $company->profile->state?->name,
-                            'company_zip' => $company->profile->zip_code,
-                            'company_country' => $company->profile->state?->country->name,
+                            'companyDTO' => CompanyDTO::fromModel($company),
                         ]),
                 ])->grow(true),
             ])->from('md'),

app/Listeners/CreateConnectedAccount.php

@@ -35,7 +35,7 @@ class CreateConnectedAccount
 
         $authResponse = $this->plaidService->getAccounts($accessToken);
 
-        $institutionResponse = $this->plaidService->getInstitution($authResponse->item->institution_id, $company->profile->country);
+        $institutionResponse = $this->plaidService->getInstitution($authResponse->item->institution_id, $company->profile?->address?->country_code);
 
         $this->processInstitution($authResponse, $institutionResponse, $company, $accessToken);
     }

app/Listeners/HandleTransactionImport.php

@@ -4,18 +4,11 @@ namespace App\Listeners;
 
 use App\Events\StartTransactionImport;
 use App\Jobs\ProcessTransactionImport;
-use App\Services\ConnectedBankAccountService;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Facades\DB;
 
 class HandleTransactionImport
 {
-    /**
-     * Create the event listener.
-     */
-    public function __construct(
-        protected ConnectedBankAccountService $connectedBankAccountService
-    ) {}
-
     /**
      * Handle the event.
      */
@@ -33,8 +26,40 @@ class HandleTransactionImport
         $selectedBankAccountId = $event->selectedBankAccountId;
         $startDate = $event->startDate;
 
-        $bankAccount = $this->connectedBankAccountService->getOrProcessBankAccountForConnectedBankAccount($company, $connectedBankAccount, $selectedBankAccountId);
-        $account = $this->connectedBankAccountService->getOrProcessAccountForConnectedBankAccount($bankAccount, $company, $connectedBankAccount);
+        if ($selectedBankAccountId === 'new') {
+            $defaultAccountSubtypeName = $connectedBankAccount->type->getDefaultSubtype();
+
+            $accountSubtype = $company->accountSubtypes()
+                ->where('name', $defaultAccountSubtypeName)
+                ->first();
+
+            if ($accountSubtype === null) {
+                throw new ModelNotFoundException("Account subtype '{$defaultAccountSubtypeName}' not found for company '{$company->name}'");
+            }
+
+            $account = $company->accounts()->create([
+                'name' => $connectedBankAccount->name,
+                'currency_code' => $connectedBankAccount->currency_code,
+                'description' => $connectedBankAccount->name,
+                'subtype_id' => $accountSubtype->id,
+            ]);
+
+            $bankAccount = $account->bankAccount()->create([
+                'company_id' => $company->id,
+                'institution_id' => $connectedBankAccount->institution_id,
+                'type' => $connectedBankAccount->type,
+                'number' => $connectedBankAccount->mask,
+                'enabled' => $company->bankAccounts()->where('enabled', true)->doesntExist(),
+            ]);
+        } else {
+            $bankAccount = $company->bankAccounts()->find($selectedBankAccountId);
+
+            if ($bankAccount === null) {
+                throw new ModelNotFoundException("Bank account '{$selectedBankAccountId}' not found for company '{$company->name}'");
+            }
+
+            $account = $bankAccount->account;
+        }
 
         $connectedBankAccount->update([
             'bank_account_id' => $bankAccount->id,
@@ -47,6 +72,6 @@ class HandleTransactionImport
             $bankAccount,
             $connectedBankAccount,
             $startDate,
-        )->onQueue('transactions');
+        );
     }
 }

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

@@ -245,7 +245,7 @@ class ListInstitutions extends Component implements HasActions, HasForms
             $company = $this->user->currentCompany;
 
             $companyLanguage = $company->locale->language ?? 'en';
-            $companyCountry = $company->profile->country ?? 'US';
+            $companyCountry = $company->profile?->address?->country_code ?? 'US';
 
             $plaidUser = $this->plaidService->createPlaidUser($company);
 

app/Observers/AccountObserver.php

@@ -44,7 +44,7 @@ class AccountObserver
         }
     }
 
-    private function setFieldsForBankAccount(Account $account): void
+    private function setAccountCode(Account $account): void
     {
         $generatedAccountCode = AccountCode::generate($account->subtype);
 
@@ -56,8 +56,8 @@ class AccountObserver
      */
     public function created(Account $account): void
     {
-        if ($account->bankAccount && $account->code === null) {
-            $this->setFieldsForBankAccount($account);
+        if (! $account->code) {
+            $this->setAccountCode($account);
             $account->save();
         }
     }

app/Repositories/Accounting/AccountSubtypeRepository.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Repositories\Accounting;
-
-use App\Models\Accounting\AccountSubtype;
-use App\Models\Company;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
-
-class AccountSubtypeRepository
-{
-    public function findAccountSubtypeByNameOrFail(Company $company, $name): AccountSubtype
-    {
-        $accountSubtype = $company->accountSubtypes()
-            ->where('name', $name)
-            ->first();
-
-        if ($accountSubtype === null) {
-            throw new ModelNotFoundException("Account subtype '{$accountSubtype}' not found for company '{$company->name}'");
-        }
-
-        return $accountSubtype;
-    }
-}

app/Repositories/Banking/ConnectedBankAccountRepository.php

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

app/Services/ConnectedBankAccountService.php

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

app/Services/PlaidService.php

@@ -157,7 +157,7 @@ class PlaidService
         return 'en';
     }
 
-    public function getCountry(string $country): string
+    public function getCountry(?string $country = null): string
     {
         if (in_array($country, $this->plaidSupportedCountries, true)) {
             return $country;

app/Services/TransactionService.php

@@ -45,7 +45,9 @@ class TransactionService
     public function createStartingBalanceTransaction(Company $company, Account $account, BankAccount $bankAccount, float $startingBalance, string $startDate): void
     {
         $transactionType = $startingBalance >= 0 ? TransactionType::Deposit : TransactionType::Withdrawal;
-        $chartAccount = $account->where('category', AccountCategory::Equity)->where('name', 'Owner\'s Equity')->first();
+        $accountName = $startingBalance >= 0 ? "Owner's Investment" : "Owner's Drawings";
+        $chartAccount = $account->where('category', AccountCategory::Equity)->where('name', $accountName)->first();
+
         $postedAt = Carbon::parse($startDate)->subDay()->toDateTimeString();
 
         Transaction::create([

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.340.4",
+            "version": "3.342.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "2896cfb3f6b2bd06757b16e99e1cab93c9598af3"
+                "reference": "5b8c837ab0c9754ab3408bd9afe6f0c67516b1fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2896cfb3f6b2bd06757b16e99e1cab93c9598af3",
-                "reference": "2896cfb3f6b2bd06757b16e99e1cab93c9598af3",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5b8c837ab0c9754ab3408bd9afe6f0c67516b1fd",
+                "reference": "5b8c837ab0c9754ab3408bd9afe6f0c67516b1fd",
                 "shasum": ""
             },
             "require": {
@@ -588,9 +588,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.340.4"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.342.0"
             },
-            "time": "2025-02-28T19:13:38+00:00"
+            "time": "2025-03-05T19:20:14+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -1733,7 +1733,7 @@
         },
         {
             "name": "filament/actions",
-            "version": "v3.3.0",
+            "version": "v3.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
@@ -1786,16 +1786,16 @@
         },
         {
             "name": "filament/filament",
-            "version": "v3.3.0",
+            "version": "v3.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
-                "reference": "2ddea9d4c3c7d1bfce2d9ea6b3d7d7fe8c5682ec"
+                "reference": "6ca7e497517a78413777ab74a0688a70337f6b4f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/2ddea9d4c3c7d1bfce2d9ea6b3d7d7fe8c5682ec",
-                "reference": "2ddea9d4c3c7d1bfce2d9ea6b3d7d7fe8c5682ec",
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/6ca7e497517a78413777ab74a0688a70337f6b4f",
+                "reference": "6ca7e497517a78413777ab74a0688a70337f6b4f",
                 "shasum": ""
             },
             "require": {
@@ -1847,20 +1847,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-02-25T08:19:05+00:00"
+            "time": "2025-03-05T09:26:29+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v3.3.0",
+            "version": "v3.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "2d3670835f3fef356e8a0c2dc756eeb9f9acce73"
+                "reference": "420f6b2b30288c853024d189213e38f644dd6f6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/2d3670835f3fef356e8a0c2dc756eeb9f9acce73",
-                "reference": "2d3670835f3fef356e8a0c2dc756eeb9f9acce73",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/420f6b2b30288c853024d189213e38f644dd6f6e",
+                "reference": "420f6b2b30288c853024d189213e38f644dd6f6e",
                 "shasum": ""
             },
             "require": {
@@ -1903,20 +1903,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-02-25T08:19:00+00:00"
+            "time": "2025-03-05T09:26:39+00:00"
         },
         {
             "name": "filament/infolists",
-            "version": "v3.3.0",
+            "version": "v3.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
-                "reference": "3e5f9d2ec79a2be9080c9e081c5284bbeb93ed7a"
+                "reference": "3498bfd23670f94d9c2160d2a7382775dfc97430"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/3e5f9d2ec79a2be9080c9e081c5284bbeb93ed7a",
-                "reference": "3e5f9d2ec79a2be9080c9e081c5284bbeb93ed7a",
+                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/3498bfd23670f94d9c2160d2a7382775dfc97430",
+                "reference": "3498bfd23670f94d9c2160d2a7382775dfc97430",
                 "shasum": ""
             },
             "require": {
@@ -1954,11 +1954,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-02-25T08:19:04+00:00"
+            "time": "2025-03-03T08:11:43+00:00"
         },
         {
             "name": "filament/notifications",
-            "version": "v3.3.0",
+            "version": "v3.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
@@ -2010,16 +2010,16 @@
         },
         {
             "name": "filament/support",
-            "version": "v3.3.0",
+            "version": "v3.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
-                "reference": "9ae768216b8f1cd6921946c98364b95f51053b20"
+                "reference": "fb5ff99b8f7559815434c109d505c12c141510da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/support/zipball/9ae768216b8f1cd6921946c98364b95f51053b20",
-                "reference": "9ae768216b8f1cd6921946c98364b95f51053b20",
+                "url": "https://api.github.com/repos/filamentphp/support/zipball/fb5ff99b8f7559815434c109d505c12c141510da",
+                "reference": "fb5ff99b8f7559815434c109d505c12c141510da",
                 "shasum": ""
             },
             "require": {
@@ -2065,20 +2065,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-02-25T08:19:17+00:00"
+            "time": "2025-03-05T09:26:25+00:00"
         },
         {
             "name": "filament/tables",
-            "version": "v3.3.0",
+            "version": "v3.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
-                "reference": "0b5152d810780d03a560b8e5387dc61881b72b42"
+                "reference": "5f2fbd8f0c6ffd19b2462269778ed96ce3c6fd35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/0b5152d810780d03a560b8e5387dc61881b72b42",
-                "reference": "0b5152d810780d03a560b8e5387dc61881b72b42",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/5f2fbd8f0c6ffd19b2462269778ed96ce3c6fd35",
+                "reference": "5f2fbd8f0c6ffd19b2462269778ed96ce3c6fd35",
                 "shasum": ""
             },
             "require": {
@@ -2117,11 +2117,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-02-25T08:19:15+00:00"
+            "time": "2025-03-03T09:07:30+00:00"
         },
         {
             "name": "filament/widgets",
-            "version": "v3.3.0",
+            "version": "v3.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
@@ -2921,16 +2921,16 @@
         },
         {
             "name": "kirschbaum-development/eloquent-power-joins",
-            "version": "4.2.0",
+            "version": "4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kirschbaum-development/eloquent-power-joins.git",
-                "reference": "aafbe349e0ad4862273880652d0141bb753c4fc7"
+                "reference": "84a24784d9abde8bafb1998a0841a6bc10fa6f8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kirschbaum-development/eloquent-power-joins/zipball/aafbe349e0ad4862273880652d0141bb753c4fc7",
-                "reference": "aafbe349e0ad4862273880652d0141bb753c4fc7",
+                "url": "https://api.github.com/repos/kirschbaum-development/eloquent-power-joins/zipball/84a24784d9abde8bafb1998a0841a6bc10fa6f8e",
+                "reference": "84a24784d9abde8bafb1998a0841a6bc10fa6f8e",
                 "shasum": ""
             },
             "require": {
@@ -2978,9 +2978,9 @@
             ],
             "support": {
                 "issues": "https://github.com/kirschbaum-development/eloquent-power-joins/issues",
-                "source": "https://github.com/kirschbaum-development/eloquent-power-joins/tree/4.2.0"
+                "source": "https://github.com/kirschbaum-development/eloquent-power-joins/tree/4.2.1"
             },
-            "time": "2025-02-13T23:30:29+00:00"
+            "time": "2025-03-05T10:11:33+00:00"
         },
         {
             "name": "knplabs/knp-snappy",
@@ -3051,16 +3051,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.44.0",
+            "version": "v11.44.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "e9a33da34815ac1ed46c7e4c477a775f4592f0a7"
+                "reference": "0883d4175f4e2b5c299e7087ad3c74f2ce195c6d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/e9a33da34815ac1ed46c7e4c477a775f4592f0a7",
-                "reference": "e9a33da34815ac1ed46c7e4c477a775f4592f0a7",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/0883d4175f4e2b5c299e7087ad3c74f2ce195c6d",
+                "reference": "0883d4175f4e2b5c299e7087ad3c74f2ce195c6d",
                 "shasum": ""
             },
             "require": {
@@ -3168,7 +3168,7 @@
                 "league/flysystem-read-only": "^3.25.1",
                 "league/flysystem-sftp-v3": "^3.25.1",
                 "mockery/mockery": "^1.6.10",
-                "orchestra/testbench-core": "^9.9.4",
+                "orchestra/testbench-core": "^9.11.2",
                 "pda/pheanstalk": "^5.0.6",
                 "php-http/discovery": "^1.15",
                 "phpstan/phpstan": "^2.0",
@@ -3262,7 +3262,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-02-24T13:08:54+00:00"
+            "time": "2025-03-05T15:34:10+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -4306,16 +4306,16 @@
         },
         {
             "name": "livewire/livewire",
-            "version": "v3.6.0",
+            "version": "v3.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/livewire/livewire.git",
-                "reference": "4c66b569cb729ba9b2f4a3c4e79f50fd8f2b71d1"
+                "reference": "0df0a762698176d714e42e2dfed92b6b9e24b8e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/4c66b569cb729ba9b2f4a3c4e79f50fd8f2b71d1",
-                "reference": "4c66b569cb729ba9b2f4a3c4e79f50fd8f2b71d1",
+                "url": "https://api.github.com/repos/livewire/livewire/zipball/0df0a762698176d714e42e2dfed92b6b9e24b8e4",
+                "reference": "0df0a762698176d714e42e2dfed92b6b9e24b8e4",
                 "shasum": ""
             },
             "require": {
@@ -4370,7 +4370,7 @@
             "description": "A front-end framework for Laravel.",
             "support": {
                 "issues": "https://github.com/livewire/livewire/issues",
-                "source": "https://github.com/livewire/livewire/tree/v3.6.0"
+                "source": "https://github.com/livewire/livewire/tree/v3.6.1"
             },
             "funding": [
                 {
@@ -4378,7 +4378,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-02-26T00:57:32+00:00"
+            "time": "2025-03-04T21:48:52+00:00"
         },
         {
             "name": "masterminds/html5",
@@ -6120,16 +6120,16 @@
         },
         {
             "name": "ramsey/collection",
-            "version": "2.0.0",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/collection.git",
-                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5"
+                "reference": "3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
-                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
+                "url": "https://api.github.com/repos/ramsey/collection/zipball/3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109",
+                "reference": "3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109",
                 "shasum": ""
             },
             "require": {
@@ -6137,25 +6137,22 @@
             },
             "require-dev": {
                 "captainhook/plugin-composer": "^5.3",
-                "ergebnis/composer-normalize": "^2.28.3",
-                "fakerphp/faker": "^1.21",
+                "ergebnis/composer-normalize": "^2.45",
+                "fakerphp/faker": "^1.24",
                 "hamcrest/hamcrest-php": "^2.0",
-                "jangregor/phpstan-prophecy": "^1.0",
-                "mockery/mockery": "^1.5",
+                "jangregor/phpstan-prophecy": "^2.1",
+                "mockery/mockery": "^1.6",
                 "php-parallel-lint/php-console-highlighter": "^1.0",
-                "php-parallel-lint/php-parallel-lint": "^1.3",
-                "phpcsstandards/phpcsutils": "^1.0.0-rc1",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpstan/extension-installer": "^1.2",
-                "phpstan/phpstan": "^1.9",
-                "phpstan/phpstan-mockery": "^1.1",
-                "phpstan/phpstan-phpunit": "^1.3",
-                "phpunit/phpunit": "^9.5",
-                "psalm/plugin-mockery": "^1.1",
-                "psalm/plugin-phpunit": "^0.18.4",
-                "ramsey/coding-standard": "^2.0.3",
-                "ramsey/conventional-commits": "^1.3",
-                "vimeo/psalm": "^5.4"
+                "php-parallel-lint/php-parallel-lint": "^1.4",
+                "phpspec/prophecy-phpunit": "^2.3",
+                "phpstan/extension-installer": "^1.4",
+                "phpstan/phpstan": "^2.1",
+                "phpstan/phpstan-mockery": "^2.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpunit/phpunit": "^10.5",
+                "ramsey/coding-standard": "^2.3",
+                "ramsey/conventional-commits": "^1.6",
+                "roave/security-advisories": "dev-latest"
             },
             "type": "library",
             "extra": {
@@ -6193,19 +6190,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/collection/issues",
-                "source": "https://github.com/ramsey/collection/tree/2.0.0"
+                "source": "https://github.com/ramsey/collection/tree/2.1.0"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/ramsey",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/ramsey/collection",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-12-31T21:50:55+00:00"
+            "time": "2025-03-02T04:48:29+00:00"
         },
         {
             "name": "ramsey/uuid",

package-lock.json

@@ -1088,9 +1088,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001701",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001701.tgz",
-            "integrity": "sha512-faRs/AW3jA9nTwmJBSO1PQ6L/EOgsB5HMQQq4iCu5zhPgVVgO/pZRHlmatwijZKetFw8/Pr4q6dEN8sJuq8qTw==",
+            "version": "1.0.30001702",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001702.tgz",
+            "integrity": "sha512-LoPe/D7zioC0REI5W73PeR1e1MLCipRGq/VkovJnd6Df+QVqT+vT33OXCp8QUd7kA7RZrHWxb1B36OQKI/0gOA==",
             "dev": true,
             "funding": [
                 {
@@ -1264,9 +1264,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.109",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.109.tgz",
-            "integrity": "sha512-AidaH9JETVRr9DIPGfp1kAarm/W6hRJTPuCnkF+2MqhF4KaAgRIcBc8nvjk+YMXZhwfISof/7WG29eS4iGxQLQ==",
+            "version": "1.5.112",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.112.tgz",
+            "integrity": "sha512-oen93kVyqSb3l+ziUgzIOlWt/oOuy4zRmpwestMn4rhFWAoFJeFuCVte9F2fASjeZZo7l/Cif9TiyrdW4CwEMA==",
             "dev": true,
             "license": "ISC"
         },

resources/views/filament/forms/components/company-info.blade.php

@@ -1,8 +1,6 @@
 <div class="text-xs text-right">
-    <h2 class="text-base font-semibold">{{ $company_name }}</h2>
-    @if($company_address && $company_city && $company_state && $company_zip)
-        <p>{{ $company_address }}</p>
-        <p>{{ $company_city }}, {{ $company_state }} {{ $company_zip }}</p>
-        <p>{{ $company_country }}</p>
+    <h2 class="text-base font-semibold">{{ $companyDTO->name }}</h2>
+    @if($formattedAddress = $companyDTO->getFormattedAddressHtml())
+        {!! $formattedAddress !!}
     @endif
 </div>