wip

app/Filament/Company/Resources/Purchases/BillResource.php

@@ -375,9 +375,13 @@ class BillResource extends Resource
                                 Forms\Components\Select::make('bank_account_id')
                                     ->label('Account')
                                     ->required()
-                                    ->options(BankAccount::query()
-                                        ->get()
-                                        ->pluck('account.name', 'id'))
+                                    ->options(function () {
+                                        return BankAccount::query()
+                                            ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
+                                            ->select(['bank_accounts.id', 'accounts.name'])
+                                            ->pluck('accounts.name', 'bank_accounts.id')
+                                            ->toArray();
+                                    })
                                     ->searchable(),
                                 Forms\Components\Textarea::make('notes')
                                     ->label('Notes'),
@@ -484,9 +488,13 @@ class BillResource extends Resource
                             Forms\Components\Select::make('bank_account_id')
                                 ->label('Account')
                                 ->required()
-                                ->options(BankAccount::query()
-                                    ->get()
-                                    ->pluck('account.name', 'id'))
+                                ->options(function () {
+                                    return BankAccount::query()
+                                        ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
+                                        ->select(['bank_accounts.id', 'accounts.name'])
+                                        ->pluck('accounts.name', 'bank_accounts.id')
+                                        ->toArray();
+                                })
                                 ->searchable(),
                             Forms\Components\Textarea::make('notes')
                                 ->label('Notes'),

app/Filament/Company/Resources/Purchases/BillResource/RelationManagers/PaymentsRelationManager.php

@@ -93,9 +93,13 @@ class PaymentsRelationManager extends RelationManager
                 Forms\Components\Select::make('bank_account_id')
                     ->label('Account')
                     ->required()
-                    ->options(BankAccount::query()
-                        ->get()
-                        ->pluck('account.name', 'id'))
+                    ->options(function () {
+                        return BankAccount::query()
+                            ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
+                            ->select(['bank_accounts.id', 'accounts.name'])
+                            ->pluck('accounts.name', 'bank_accounts.id')
+                            ->toArray();
+                    })
                     ->searchable(),
                 Forms\Components\Textarea::make('notes')
                     ->label('Notes'),

app/Filament/Company/Resources/Sales/InvoiceResource/RelationManagers/PaymentsRelationManager.php

@@ -100,9 +100,13 @@ class PaymentsRelationManager extends RelationManager
                 Forms\Components\Select::make('bank_account_id')
                     ->label('Account')
                     ->required()
-                    ->options(BankAccount::query()
-                        ->get()
-                        ->pluck('account.name', 'id'))
+                    ->options(function () {
+                        return BankAccount::query()
+                            ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
+                            ->select(['bank_accounts.id', 'accounts.name'])
+                            ->pluck('accounts.name', 'bank_accounts.id')
+                            ->toArray();
+                    })
                     ->searchable(),
                 Forms\Components\Textarea::make('notes')
                     ->label('Notes'),

app/Listeners/CreateConnectedAccount.php

@@ -57,7 +57,7 @@ class CreateConnectedAccount
 
     public function processConnectedBankAccount($plaidAccount, Company $company, Institution $institution, $authResponse, $accessToken): void
     {
-        $identifierHash = md5($institution->external_institution_id . $plaidAccount->name . $plaidAccount->mask);
+        $identifierHash = md5($company->id . $institution->external_institution_id . $plaidAccount->name . $plaidAccount->mask);
 
         $company->connectedBankAccounts()->updateOrCreate([
             'identifier' => $identifierHash,

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

@@ -108,14 +108,15 @@ class ListInstitutions extends Component implements HasActions, HasForms
         $options = ['new' => 'New Account'];
 
         if ($institutionId) {
-            $options += BankAccount::query()
-                ->where('company_id', $this->user->currentCompany->id)
-                ->where('institution_id', $institutionId)
+            $accountOptions = BankAccount::query()
+                ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
+                ->where('bank_accounts.institution_id', $institutionId)
                 ->whereDoesntHave('connectedBankAccount')
-                ->with('account')
-                ->get()
-                ->pluck('account.name', 'id')
+                ->select(['bank_accounts.id', 'accounts.name'])
+                ->pluck('accounts.name', 'bank_accounts.id')
                 ->toArray();
+
+            $options += $accountOptions;
         }
 
         return $options;

app/Services/TransactionService.php

@@ -46,7 +46,10 @@ class TransactionService
     {
         $transactionType = $startingBalance >= 0 ? TransactionType::Deposit : TransactionType::Withdrawal;
         $accountName = $startingBalance >= 0 ? "Owner's Investment" : "Owner's Drawings";
-        $chartAccount = $account->where('category', AccountCategory::Equity)->where('name', $accountName)->first();
+        $chartAccount = $company->accounts()
+            ->where('category', AccountCategory::Equity)
+            ->where('name', $accountName)
+            ->firstOrFail();
 
         $postedAt = Carbon::parse($startDate)->subDay()->toDateTimeString();