wip

app/Filament/Company/Pages/Reports/AccountTransactions.php

@@ -71,7 +71,7 @@ class AccountTransactions extends BaseReportPage
                 ->label('Credit')
                 ->alignment(Alignment::Right),
             Column::make('balance')
-                ->label('Balance')
+                ->label('Running Balance')
                 ->alignment(Alignment::Right),
         ];
     }

app/Filament/Company/Pages/Reports/BalanceSheet.php

@@ -77,11 +77,11 @@ class BalanceSheet extends BaseReportPage
 
     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'));
     }
 }

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.324.6",
+            "version": "3.324.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "7412a44da62fd607efbaac4084e69d6621f29de1"
+                "reference": "c430d00e5ea6ce23739d6345f073fdd39e8ef0dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7412a44da62fd607efbaac4084e69d6621f29de1",
-                "reference": "7412a44da62fd607efbaac4084e69d6621f29de1",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c430d00e5ea6ce23739d6345f073fdd39e8ef0dc",
+                "reference": "c430d00e5ea6ce23739d6345f073fdd39e8ef0dc",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.324.6"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.324.7"
             },
-            "time": "2024-10-18T18:06:33+00:00"
+            "time": "2024-10-21T18:06:52+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",

package-lock.json

@@ -955,9 +955,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
-            "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
+            "version": "4.24.2",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+            "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
             "dev": true,
             "funding": [
                 {
@@ -975,10 +975,10 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "caniuse-lite": "^1.0.30001663",
-                "electron-to-chromium": "^1.5.28",
+                "caniuse-lite": "^1.0.30001669",
+                "electron-to-chromium": "^1.5.41",
                 "node-releases": "^2.0.18",
-                "update-browserslist-db": "^1.1.0"
+                "update-browserslist-db": "^1.1.1"
             },
             "bin": {
                 "browserslist": "cli.js"

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>

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) }}">