Andrew Wallo 4 个月前
父节点
当前提交
050f44171e

+ 1
- 1
app/Filament/Company/Resources/Accounting/TransactionResource.php 查看文件

100
                 Tables\Filters\SelectFilter::make('bank_account_id')
100
                 Tables\Filters\SelectFilter::make('bank_account_id')
101
                     ->label('Account')
101
                     ->label('Account')
102
                     ->searchable()
102
                     ->searchable()
103
-                    ->options(static fn () => Transaction::getBankAccountOptions(false)),
103
+                    ->options(static fn () => Transaction::getBankAccountOptions(excludeArchived: false)),
104
                 Tables\Filters\SelectFilter::make('account_id')
104
                 Tables\Filters\SelectFilter::make('account_id')
105
                     ->label('Category')
105
                     ->label('Category')
106
                     ->multiple()
106
                     ->multiple()

+ 9
- 5
app/Models/Accounting/Transaction.php 查看文件

115
         }
115
         }
116
     }
116
     }
117
 
117
 
118
-    public static function getBankAccountOptions(?int $excludedAccountId = null, ?int $currentBankAccountId = null): array
118
+    public static function getBankAccountOptions(?int $excludedAccountId = null, ?int $currentBankAccountId = null, bool $excludeArchived = true): array
119
     {
119
     {
120
         return BankAccount::query()
120
         return BankAccount::query()
121
-            ->whereHas('account', function (Builder $query) {
122
-                $query->where('archived', false);
121
+            ->whereHas('account', function (Builder $query) use ($excludeArchived) {
122
+                if ($excludeArchived) {
123
+                    $query->where('archived', false);
124
+                }
123
             })
125
             })
124
-            ->with(['account' => function ($query) {
125
-                $query->where('archived', false);
126
+            ->with(['account' => function ($query) use ($excludeArchived) {
127
+                if ($excludeArchived) {
128
+                    $query->where('archived', false);
129
+                }
126
             }, 'account.subtype' => function ($query) {
130
             }, 'account.subtype' => function ($query) {
127
                 $query->select(['id', 'name']);
131
                 $query->select(['id', 'name']);
128
             }])
132
             }])

正在加载...
取消
保存