浏览代码

update report links

3.x
Andrew Wallo 1年前
父节点
当前提交
2124b94e47

+ 2
- 0
app/DTO/AccountDTO.php 查看文件

9
         public string $accountCode,
9
         public string $accountCode,
10
         public ?int $accountId,
10
         public ?int $accountId,
11
         public AccountBalanceDTO $balance,
11
         public AccountBalanceDTO $balance,
12
+        public ?string $startDate,
13
+        public ?string $endDate,
12
     ) {}
14
     ) {}
13
 }
15
 }

+ 1
- 1
app/Filament/Company/Pages/Reports/AccountTransactions.php 查看文件

40
 
40
 
41
     protected function initializeDefaultFilters(): void
41
     protected function initializeDefaultFilters(): void
42
     {
42
     {
43
-        if (! $this->getFilterState('selectedAccount')) {
43
+        if (empty($this->getFilterState('selectedAccount'))) {
44
             $this->setFilterState('selectedAccount', 'all');
44
             $this->setFilterState('selectedAccount', 'all');
45
         }
45
         }
46
     }
46
     }

+ 3
- 1
app/Filament/Company/Pages/Reports/BaseReportPage.php 查看文件

32
     /**
32
     /**
33
      * @var array<string, mixed> | null
33
      * @var array<string, mixed> | null
34
      */
34
      */
35
-    #[Url(keep: true)]
35
+    #[Url]
36
     public ?array $filters = null;
36
     public ?array $filters = null;
37
 
37
 
38
     /**
38
     /**
97
         if ($this->filters !== null) {
97
         if ($this->filters !== null) {
98
             $this->filters = $this->normalizeFilters($this->filters);
98
             $this->filters = $this->normalizeFilters($this->filters);
99
         }
99
         }
100
+
101
+        ray($this->filters);
100
     }
102
     }
101
 
103
 
102
     protected function convertDatesToDateTimeString(array $filters): array
104
     protected function convertDatesToDateTimeString(array $filters): array

+ 9
- 1
app/Services/ReportService.php 查看文件

73
                     $account->code,
73
                     $account->code,
74
                     $account->id,
74
                     $account->id,
75
                     $formattedAccountBalances,
75
                     $formattedAccountBalances,
76
+                    Carbon::parse($startDate)->toDateString(),
77
+                    Carbon::parse($endDate)->toDateString(),
76
                 );
78
                 );
77
             }
79
             }
78
 
80
 
266
                     $account->code,
268
                     $account->code,
267
                     $account->id,
269
                     $account->id,
268
                     $formattedAccountBalances,
270
                     $formattedAccountBalances,
271
+                    Carbon::parse($startDate)->toDateString(),
272
+                    Carbon::parse($endDate)->toDateString(),
269
                 );
273
                 );
270
             }
274
             }
271
 
275
 
282
                     $this->formatBalances([
286
                     $this->formatBalances([
283
                         'debit_balance' => $isCredit ? 0 : abs($retainedEarningsAmount),
287
                         'debit_balance' => $isCredit ? 0 : abs($retainedEarningsAmount),
284
                         'credit_balance' => $isCredit ? $retainedEarningsAmount : 0,
288
                         'credit_balance' => $isCredit ? $retainedEarningsAmount : 0,
285
-                    ])
289
+                    ]),
290
+                    null,
291
+                    null,
286
                 );
292
                 );
287
             }
293
             }
288
 
294
 
371
                         $account->code,
377
                         $account->code,
372
                         $account->id,
378
                         $account->id,
373
                         $this->formatBalances(['net_movement' => $movement]),
379
                         $this->formatBalances(['net_movement' => $movement]),
380
+                        Carbon::parse($startDate)->toDateString(),
381
+                        Carbon::parse($endDate)->toDateString(),
374
                     );
382
                     );
375
                 }
383
                 }
376
             }
384
             }

+ 2
- 0
app/Transformers/AccountBalanceReportTransformer.php 查看文件

46
                         'account_name' => [
46
                         'account_name' => [
47
                             'name' => $account->accountName,
47
                             'name' => $account->accountName,
48
                             'id' => $account->accountId ?? null,
48
                             'id' => $account->accountId ?? null,
49
+                            'start_date' => $account->startDate,
50
+                            'end_date' => $account->endDate,
49
                         ],
51
                         ],
50
                         'starting_balance' => $account->balance->startingBalance ?? '',
52
                         'starting_balance' => $account->balance->startingBalance ?? '',
51
                         'debit_balance' => $account->balance->debitBalance,
53
                         'debit_balance' => $account->balance->debitBalance,

+ 2
- 0
app/Transformers/IncomeStatementReportTransformer.php 查看文件

60
                         'account_name' => [
60
                         'account_name' => [
61
                             'name' => $account->accountName,
61
                             'name' => $account->accountName,
62
                             'id' => $account->accountId ?? null,
62
                             'id' => $account->accountId ?? null,
63
+                            'start_date' => $account->startDate,
64
+                            'end_date' => $account->endDate,
63
                         ],
65
                         ],
64
                         'net_movement' => $account->balance->netMovement ?? '',
66
                         'net_movement' => $account->balance->netMovement ?? '',
65
                         default => '',
67
                         default => '',

+ 6
- 2
resources/views/components/company/tables/reports/detailed-report.blade.php 查看文件

27
                     <x-filament-tables::cell class="{{ $report->getAlignmentClass($cellIndex) }}">
27
                     <x-filament-tables::cell class="{{ $report->getAlignmentClass($cellIndex) }}">
28
                         <div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">
28
                         <div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">
29
                             @if(is_array($cell) && isset($cell['name']))
29
                             @if(is_array($cell) && isset($cell['name']))
30
-                                @if(isset($cell['id']))
30
+                                @if(isset($cell['id']) && isset($cell['start_date']) && isset($cell['end_date']))
31
                                     <x-filament::link
31
                                     <x-filament::link
32
                                         color="primary"
32
                                         color="primary"
33
                                         target="_blank"
33
                                         target="_blank"
34
                                         icon="heroicon-o-arrow-top-right-on-square"
34
                                         icon="heroicon-o-arrow-top-right-on-square"
35
                                         :icon-position="\Filament\Support\Enums\IconPosition::After"
35
                                         :icon-position="\Filament\Support\Enums\IconPosition::After"
36
                                         :icon-size="\Filament\Support\Enums\IconSize::Small"
36
                                         :icon-size="\Filament\Support\Enums\IconSize::Small"
37
-                                        href="{{ \App\Filament\Company\Pages\Reports\AccountTransactions::getUrl(['selectedAccount' => $cell['id']]) }}"
37
+                                        href="{{ \App\Filament\Company\Pages\Reports\AccountTransactions::getUrl([
38
+                                            'filters[startDate]' => $cell['start_date'],
39
+                                            'filters[endDate]' => $cell['end_date'],
40
+                                            'filters[selectedAccount]' => $cell['id']
41
+                                        ]) }}"
38
                                     >
42
                                     >
39
                                         {{ $cell['name'] }}
43
                                         {{ $cell['name'] }}
40
                                     </x-filament::link>
44
                                     </x-filament::link>

正在加载...
取消
保存