wip

andrewdwallo · Oct 22, 2024 · 5ba8e26 · 5ba8e26
1 parent add50b0
commit 5ba8e26
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 21 deletions.
diff --git a/app/Filament/Company/Pages/Reports/AccountTransactions.php b/app/Filament/Company/Pages/Reports/AccountTransactions.php
@@ -71,7 +71,7 @@ public function getTable(): array
                 ->label('Credit')
                 ->alignment(Alignment::Right),
             Column::make('balance')
-                ->label('Balance')
+                ->label('Running Balance')
                 ->alignment(Alignment::Right),
         ];
     }

diff --git a/app/Filament/Company/Pages/Reports/BalanceSheet.php b/app/Filament/Company/Pages/Reports/BalanceSheet.php
@@ -77,11 +77,11 @@ protected function getTransformer(ReportDTO $reportDTO): ExportableReport
 
     public function exportCSV(): StreamedResponse
     {
-        return $this->exportService->exportToCsv($this->company, $this->report, $this->getFilterState('asOfDate'));
+        return $this->exportService->exportToCsv($this->company, $this->report, endDate: $this->getFilterState('asOfDate'));
     }
 
     public function exportPDF(): StreamedResponse
     {
-        return $this->exportService->exportToPdf($this->company, $this->report, $this->getFilterState('asOfDate'));
+        return $this->exportService->exportToPdf($this->company, $this->report, endDate: $this->getFilterState('asOfDate'));
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/resources/views/components/company/reports/account-transactions-report-pdf.blade.php b/resources/views/components/company/reports/account-transactions-report-pdf.blade.php
@@ -49,7 +49,7 @@
 
         .company-name {
             font-size: 1.125rem;
-            font-weight: 600;
+            font-weight: bold;
         }
 
         .date-range {
@@ -71,7 +71,7 @@
 
         .category-header-row > td {
             background-color: #f3f4f6; /* Gray background for category names */
-            font-weight: 600;
+            font-weight: bold;
         }
 
         .table-body tr {
@@ -84,7 +84,7 @@
 
         .category-summary-row > td,
         .table-footer-row > td {
-            font-weight: 600;
+            font-weight: bold;
             background-color: #ffffff; /* White background for footer */
         }
     </style>

diff --git a/resources/views/components/company/reports/report-pdf.blade.php b/resources/views/components/company/reports/report-pdf.blade.php
@@ -49,7 +49,7 @@
 
         .company-name {
             font-size: 1.125rem;
-            font-weight: 600;
+            font-weight: bold;
         }
 
         .date-range {
@@ -69,9 +69,16 @@
             border-bottom: 1px solid #d1d5db; /* Gray border for all rows */
         }
 
-        .category-header-row > td {
+        .category-header-row > td,
+        .type-header-row > td {
             background-color: #f3f4f6; /* Gray background for category names */
-            font-weight: 600;
+            font-weight: bold;
+        }
+
+        .type-header-row > td,
+        .type-data-row > td,
+        .type-summary-row > td {
+            padding-left: 1.5rem; /* Indentation for type rows */
         }
 
         .table-body tr {
@@ -83,6 +90,7 @@
         }
 
         .category-summary-row > td,
+        .type-summary-row > td,
         .table-footer-row > td {
             font-weight: bold;
             background-color: #ffffff; /* White background for footer */
@@ -131,6 +139,43 @@
                 @endforeach
             </tr>
         @endforeach
+
+        <!-- Category Types -->
+        @foreach($category->types ?? [] as $type)
+            <!-- Type Header -->
+            <tr class="type-header-row">
+                @foreach($type->header as $index => $header)
+                    <td class="{{ $report->getAlignmentClass($index) }}">
+                        {{ $header }}
+                    </td>
+                @endforeach
+            </tr>
+
+            <!-- Type Data -->
+            @foreach($type->data as $typeRow)
+                <tr class="type-data-row">
+                    @foreach($typeRow as $index => $cell)
+                        <td class="{{ $report->getAlignmentClass($index) }} {{ $index === 'account_name' ? 'whitespace-normal' : 'whitespace-nowrap' }}">
+                            @if(is_array($cell) && isset($cell['name']))
+                                {{ $cell['name'] }}
+                            @else
+                                {{ $cell }}
+                            @endif
+                        </td>
+                    @endforeach
+                </tr>
+            @endforeach
+
+            <!-- Type Summary -->
+            <tr class="type-summary-row">
+                @foreach($type->summary as $index => $cell)
+                    <td class="{{ $report->getAlignmentClass($index) }}">
+                        {{ $cell }}
+                    </td>
+                @endforeach
+            </tr>
+        @endforeach
+
         <tr class="category-summary-row">
             @foreach($category->summary as $index => $cell)
                 <td class="{{ $report->getAlignmentClass($index) }}">