瀏覽代碼

update report links

3.x
Andrew Wallo 1 年之前
父節點
當前提交
2124b94e47

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

@@ -9,5 +9,7 @@ class AccountDTO
9 9
         public string $accountCode,
10 10
         public ?int $accountId,
11 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,7 +40,7 @@ class AccountTransactions extends BaseReportPage
40 40
 
41 41
     protected function initializeDefaultFilters(): void
42 42
     {
43
-        if (! $this->getFilterState('selectedAccount')) {
43
+        if (empty($this->getFilterState('selectedAccount'))) {
44 44
             $this->setFilterState('selectedAccount', 'all');
45 45
         }
46 46
     }

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

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

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

@@ -73,6 +73,8 @@ class ReportService
73 73
                     $account->code,
74 74
                     $account->id,
75 75
                     $formattedAccountBalances,
76
+                    Carbon::parse($startDate)->toDateString(),
77
+                    Carbon::parse($endDate)->toDateString(),
76 78
                 );
77 79
             }
78 80
 
@@ -266,6 +268,8 @@ class ReportService
266 268
                     $account->code,
267 269
                     $account->id,
268 270
                     $formattedAccountBalances,
271
+                    Carbon::parse($startDate)->toDateString(),
272
+                    Carbon::parse($endDate)->toDateString(),
269 273
                 );
270 274
             }
271 275
 
@@ -282,7 +286,9 @@ class ReportService
282 286
                     $this->formatBalances([
283 287
                         'debit_balance' => $isCredit ? 0 : abs($retainedEarningsAmount),
284 288
                         'credit_balance' => $isCredit ? $retainedEarningsAmount : 0,
285
-                    ])
289
+                    ]),
290
+                    null,
291
+                    null,
286 292
                 );
287 293
             }
288 294
 
@@ -371,6 +377,8 @@ class ReportService
371 377
                         $account->code,
372 378
                         $account->id,
373 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,6 +46,8 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
46 46
                         'account_name' => [
47 47
                             'name' => $account->accountName,
48 48
                             'id' => $account->accountId ?? null,
49
+                            'start_date' => $account->startDate,
50
+                            'end_date' => $account->endDate,
49 51
                         ],
50 52
                         'starting_balance' => $account->balance->startingBalance ?? '',
51 53
                         'debit_balance' => $account->balance->debitBalance,

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

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

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

@@ -27,14 +27,18 @@
27 27
                     <x-filament-tables::cell class="{{ $report->getAlignmentClass($cellIndex) }}">
28 28
                         <div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">
29 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 31
                                     <x-filament::link
32 32
                                         color="primary"
33 33
                                         target="_blank"
34 34
                                         icon="heroicon-o-arrow-top-right-on-square"
35 35
                                         :icon-position="\Filament\Support\Enums\IconPosition::After"
36 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 43
                                         {{ $cell['name'] }}
40 44
                                     </x-filament::link>

Loading…
取消
儲存