refactor

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

@@ -38,30 +38,30 @@ class AccountBalances extends BaseReportPage
     {
         return [
             Column::make('account_code')
-                ->label('Account Code')
-                ->toggleable()
-                ->alignment(Alignment::Center),
+                ->label('ACCOUNT CODE')
+                ->toggleable(isToggledHiddenByDefault: true)
+                ->alignment(Alignment::Left),
             Column::make('account_name')
-                ->label('Account')
+                ->label('ACCOUNT')
                 ->alignment(Alignment::Left),
             Column::make('starting_balance')
-                ->label('Starting Balance')
+                ->label('STARTING BALANCE')
                 ->toggleable()
                 ->alignment(Alignment::Right),
             Column::make('debit_balance')
-                ->label('Debit')
+                ->label('DEBIT')
                 ->toggleable()
                 ->alignment(Alignment::Right),
             Column::make('credit_balance')
-                ->label('Credit')
+                ->label('CREDIT')
                 ->toggleable()
                 ->alignment(Alignment::Right),
             Column::make('net_movement')
-                ->label('Net Movement')
+                ->label('NET MOVEMENT')
                 ->toggleable()
                 ->alignment(Alignment::Right),
             Column::make('ending_balance')
-                ->label('Ending Balance')
+                ->label('ENDING BALANCE')
                 ->toggleable()
                 ->alignment(Alignment::Right),
         ];

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

@@ -60,20 +60,20 @@ class AccountTransactions extends BaseReportPage
     {
         return [
             Column::make('date')
-                ->label('Date')
+                ->label('DATE')
                 ->markAsDate()
                 ->alignment(Alignment::Left),
             Column::make('description')
-                ->label('Description')
+                ->label('DESCRIPTION')
                 ->alignment(Alignment::Left),
             Column::make('debit')
-                ->label('Debit')
+                ->label('DEBIT')
                 ->alignment(Alignment::Right),
             Column::make('credit')
-                ->label('Credit')
+                ->label('CREDIT')
                 ->alignment(Alignment::Right),
             Column::make('balance')
-                ->label('Running Balance')
+                ->label('RUNNING BALANCE')
                 ->alignment(Alignment::Right),
         ];
     }

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

@@ -37,14 +37,14 @@ class BalanceSheet extends BaseReportPage
     {
         return [
             Column::make('account_code')
-                ->label('Account Code')
+                ->label('ACCOUNT CODE')
                 ->toggleable(isToggledHiddenByDefault: true)
                 ->alignment(Alignment::Left),
             Column::make('account_name')
-                ->label('Account')
+                ->label('ACCOUNTS')
                 ->alignment(Alignment::Left),
             Column::make('ending_balance')
-                ->label('Amount')
+                ->label($this->getDisplayAsOfDate())
                 ->alignment(Alignment::Right),
         ];
     }

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

@@ -169,6 +169,29 @@ abstract class BaseReportPage extends Page
         return Carbon::parse($this->getFilterState('asOfDate'))->endOfDay()->toDateTimeString();
     }
 
+    public function getDisplayAsOfDate(): string
+    {
+        return Carbon::parse($this->getFilterState('asOfDate'))->toDefaultDateFormat();
+    }
+
+    public function getDisplayStartDate(): string
+    {
+        return Carbon::parse($this->getFilterState('startDate'))->toDefaultDateFormat();
+    }
+
+    public function getDisplayEndDate(): string
+    {
+        return Carbon::parse($this->getFilterState('endDate'))->toDefaultDateFormat();
+    }
+
+    public function getDisplayDateRange(): string
+    {
+        $startDate = Carbon::parse($this->getFilterState('startDate'));
+        $endDate = Carbon::parse($this->getFilterState('endDate'));
+
+        return $startDate->toDefaultDateFormat() . ' - ' . $endDate->toDefaultDateFormat();
+    }
+
     protected function getHeaderActions(): array
     {
         return [

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

@@ -39,14 +39,14 @@ class CashFlowStatement extends BaseReportPage
     {
         return [
             Column::make('account_code')
-                ->label('Account Code')
+                ->label('ACCOUNT CODE')
                 ->toggleable(isToggledHiddenByDefault: true)
                 ->alignment(Alignment::Left),
             Column::make('account_name')
-                ->label('Account')
+                ->label('CASH INFLOWS AND OUTFLOWS')
                 ->alignment(Alignment::Left),
             Column::make('net_movement')
-                ->label('Amount')
+                ->label($this->getDisplayDateRange())
                 ->alignment(Alignment::Right),
         ];
     }

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

@@ -39,14 +39,14 @@ class IncomeStatement extends BaseReportPage
     {
         return [
             Column::make('account_code')
-                ->label('Account Code')
+                ->label('ACCOUNT CODE')
                 ->toggleable(isToggledHiddenByDefault: true)
                 ->alignment(Alignment::Left),
             Column::make('account_name')
-                ->label('Account')
+                ->label('ACCOUNTS')
                 ->alignment(Alignment::Left),
             Column::make('net_movement')
-                ->label('Amount')
+                ->label($this->getDisplayDateRange())
                 ->alignment(Alignment::Right),
         ];
     }

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

@@ -43,17 +43,17 @@ class TrialBalance extends BaseReportPage
     {
         return [
             Column::make('account_code')
-                ->label('Account Code')
-                ->toggleable()
-                ->alignment(Alignment::Center),
+                ->label('ACCOUNT CODE')
+                ->toggleable(isToggledHiddenByDefault: true)
+                ->alignment(Alignment::Left),
             Column::make('account_name')
-                ->label('Account')
+                ->label('ACCOUNTS')
                 ->alignment(Alignment::Left),
             Column::make('debit_balance')
-                ->label('Debit')
+                ->label('DEBIT')
                 ->alignment(Alignment::Right),
             Column::make('credit_balance')
-                ->label('Credit')
+                ->label('CREDIT')
                 ->alignment(Alignment::Right),
         ];
     }

app/Services/ExportService.php

@@ -4,6 +4,7 @@ namespace App\Services;
 
 use App\Contracts\ExportableReport;
 use App\Models\Company;
+use App\Transformers\CashFlowStatementReportTransformer;
 use Barryvdh\Snappy\Facades\SnappyPdf;
 use Carbon\Exceptions\InvalidFormatException;
 use Illuminate\Support\Carbon;
@@ -72,6 +73,10 @@ class ExportService
                 $csv->insertOne([]);
             }
 
+            if ($report->getTitle() === 'Cash Flow Statement') {
+                $this->writeOverviewTableToCsv($csv, $report);
+            }
+
             if (filled($report->getOverallTotals())) {
                 $csv->insertOne($report->getOverallTotals());
             }
@@ -80,6 +85,45 @@ class ExportService
         return response()->streamDownload($callback, $filename, $headers);
     }
 
+    /**
+     * @throws CannotInsertRecord
+     * @throws Exception
+     */
+    protected function writeOverviewTableToCsv(Writer $csv, ExportableReport $report): void
+    {
+        /** @var CashFlowStatementReportTransformer $report */
+        $headers = $report->getOverviewHeaders();
+
+        if (filled($headers)) {
+            $csv->insertOne($headers);
+        }
+
+        foreach ($report->getOverview() as $overviewCategory) {
+            if (filled($overviewCategory->header)) {
+                $this->writeDataRowsToCsv($csv, $overviewCategory->header, $overviewCategory->data, $report->getColumns());
+            }
+
+            if (filled($overviewCategory->summary)) {
+                $csv->insertOne($overviewCategory->summary);
+            }
+
+            if ($overviewCategory->header['account_name'] === 'Starting Balance') {
+                foreach ($report->getOverviewAlignedWithColumns() as $summaryRow) {
+                    $row = [];
+
+                    foreach ($report->getColumns() as $column) {
+                        $columnName = $column->getName();
+                        $row[] = $summaryRow[$columnName] ?? '';
+                    }
+
+                    if (array_filter($row)) {
+                        $csv->insertOne($row);
+                    }
+                }
+            }
+        }
+    }
+
     public function exportToPdf(Company $company, ExportableReport $report, ?string $startDate = null, ?string $endDate = null): StreamedResponse
     {
         if ($startDate && $endDate) {

app/Transformers/BalanceSheetReportTransformer.php

@@ -244,37 +244,6 @@ class BalanceSheetReportTransformer extends SummaryReportTransformer
         return [];
     }
 
-    public function getTitleHeaders(): array
-    {
-        return once(function (): array {
-            $headers = [];
-
-            $dateRange = $this->getEndDate() ? $this->getEndDate() : '';
-
-            foreach ($this->getColumns() as $column) {
-                $headers[$column->getName()] = match ($column->getName()) {
-                    'account_name' => 'ACCOUNTS',
-                    'ending_balance' => $dateRange,
-                    default => '',
-                };
-            }
-
-            return $headers;
-        });
-    }
-
-    public function getSummaryTitleHeaders(): array
-    {
-        return once(function (): array {
-            $headers = $this->getTitleHeaders();
-
-            // Remove the account_code key if it exists
-            unset($headers['account_code']);
-
-            return $headers;
-        });
-    }
-
     public function getSummary(): array
     {
         return [

app/Transformers/CashFlowStatementReportTransformer.php

@@ -234,39 +234,6 @@ class CashFlowStatementReportTransformer extends SummaryReportTransformer
         }, $this->getOverviewAlignedWithColumns());
     }
 
-    public function getCashInflowAndOutflowHeaders(): array
-    {
-        return once(function (): array {
-            $headers = [];
-
-            $dateRange = $this->getStartDate() && $this->getEndDate()
-                ? "{$this->getStartDate()} - {$this->getEndDate()}"
-                : '';
-
-            foreach ($this->getColumns() as $column) {
-                $headers[$column->getName()] = match ($column->getName()) {
-                    'account_name' => 'CASH INFLOWS AND OUTFLOWS',
-                    'net_movement' => $dateRange,
-                    default => '',
-                };
-            }
-
-            return $headers;
-        });
-    }
-
-    public function getSummaryCashInflowAndOutflowHeaders(): array
-    {
-        return once(function (): array {
-            $headers = $this->getCashInflowAndOutflowHeaders();
-
-            // Remove the account_code key if it exists
-            unset($headers['account_code']);
-
-            return $headers;
-        });
-    }
-
     public function getOverviewHeaders(): array
     {
         return once(function (): array {

app/Transformers/IncomeStatementReportTransformer.php

@@ -179,38 +179,6 @@ class IncomeStatementReportTransformer extends SummaryReportTransformer
         return $totals;
     }
 
-    public function getTitleHeaders(): array
-    {
-        return once(function (): array {
-            $headers = [];
-
-            $dateRange = $this->getStartDate() && $this->getEndDate()
-                ? "{$this->getStartDate()} - {$this->getEndDate()}"
-                : '';
-
-            foreach ($this->getColumns() as $column) {
-                $headers[$column->getName()] = match ($column->getName()) {
-                    'account_name' => 'ACCOUNTS',
-                    'net_movement' => $dateRange,
-                    default => '',
-                };
-            }
-
-            return $headers;
-        });
-    }
-
-    public function getSummaryTitleHeaders(): array
-    {
-        return once(function (): array {
-            $headers = $this->getTitleHeaders();
-
-            unset($headers['account_code']);
-
-            return $headers;
-        });
-    }
-
     public function getSummary(): array
     {
         return [

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.325.5",
+            "version": "3.325.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "195d003c902a741de53008c839cbcebddbe1f326"
+                "reference": "9e4be60c907ce5ef05ee36dafd42afd9944591c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/195d003c902a741de53008c839cbcebddbe1f326",
-                "reference": "195d003c902a741de53008c839cbcebddbe1f326",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/9e4be60c907ce5ef05ee36dafd42afd9944591c6",
+                "reference": "9e4be60c907ce5ef05ee36dafd42afd9944591c6",
                 "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.325.5"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.325.6"
             },
-            "time": "2024-11-08T19:12:57+00:00"
+            "time": "2024-11-11T19:05:26+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -10783,16 +10783,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.9",
+            "version": "1.12.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "ceb937fb39a92deabc02d20709cf14b2c452502c"
+                "reference": "fc463b5d0fe906dcf19689be692c65c50406a071"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ceb937fb39a92deabc02d20709cf14b2c452502c",
-                "reference": "ceb937fb39a92deabc02d20709cf14b2c452502c",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/fc463b5d0fe906dcf19689be692c65c50406a071",
+                "reference": "fc463b5d0fe906dcf19689be692c65c50406a071",
                 "shasum": ""
             },
             "require": {
@@ -10837,7 +10837,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-11-10T17:10:04+00:00"
+            "time": "2024-11-11T15:37:09+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

package-lock.json

@@ -1026,9 +1026,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001679",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001679.tgz",
-            "integrity": "sha512-j2YqID/YwpLnKzCmBOS4tlZdWprXm3ZmQLBH9ZBXFOhoxLA46fwyBvx6toCBWBmnuwUY/qB3kEU6gFx8qgCroA==",
+            "version": "1.0.30001680",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz",
+            "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==",
             "dev": true,
             "funding": [
                 {
@@ -1187,9 +1187,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.55",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.55.tgz",
-            "integrity": "sha512-6maZ2ASDOTBtjt9FhqYPRnbvKU5tjG0IN9SztUOWYw2AzNDNpKJYLJmlK0/En4Hs/aiWnB+JZ+gW19PIGszgKg==",
+            "version": "1.5.56",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.56.tgz",
+            "integrity": "sha512-7lXb9dAvimCFdvUMTyucD4mnIndt/xhRKFAlky0CyFogdnNmdPQNoHI23msF/2V4mpTxMzgMdjK4+YRlFlRQZw==",
             "dev": true,
             "license": "ISC"
         },
@@ -1854,9 +1854,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.47",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
-            "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+            "version": "8.4.49",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+            "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
             "dev": true,
             "funding": [
                 {
@@ -1875,7 +1875,7 @@
             "license": "MIT",
             "dependencies": {
                 "nanoid": "^3.3.7",
-                "picocolors": "^1.1.0",
+                "picocolors": "^1.1.1",
                 "source-map-js": "^1.2.1"
             },
             "engines": {
@@ -2580,9 +2580,9 @@
             "license": "MIT"
         },
         "node_modules/vite": {
-            "version": "5.4.10",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.10.tgz",
-            "integrity": "sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==",
+            "version": "5.4.11",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz",
+            "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {

resources/views/components/company/reports/account-transactions-report-pdf.blade.php

@@ -5,87 +5,87 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ $report->getTitle() }}</title>
     <style>
-        .header {
-            color: #374151;
-            margin-bottom: 1rem;
+        .category-header-row > td {
+            background-color: #f3f4f6;
+            font-weight: bold;
         }
 
-        .header > * + * {
-            margin-top: 0.5rem;
+        .category-summary-row > td,
+        .table-footer-row > td {
+            background-color: #ffffff;
+            font-weight: bold;
         }
 
-        .table-head {
-            display: table-row-group;
+        .company-name {
+            font-size: 1.125rem;
+            font-weight: bold;
         }
 
-        .text-left {
-            text-align: left;
+        .date-range {
+            font-size: 0.875rem;
         }
 
-        .text-right {
-            text-align: right;
+        .header {
+            color: #374151;
+            margin-bottom: 1rem;
         }
 
-        .text-center {
-            text-align: center;
+        .header div + div {
+            margin-top: 0.5rem;
         }
 
-        .table-class th,
-        .table-class td {
-            color: #374151;
+        .spacer-row > td {
+            height: 0.75rem;
         }
 
-        .whitespace-normal {
-            white-space: normal;
+        .table-body tr {
+            background-color: #ffffff;
         }
 
-        .whitespace-nowrap {
-            white-space: nowrap;
+        .table-class {
+            border-collapse: collapse;
+            width: 100%;
         }
 
-        .title {
-            font-size: 1.5rem;
+        .table-class td,
+        .table-class th {
+            border-bottom: 1px solid #d1d5db;
+            color: #374151;
+            font-size: 0.75rem;
+            line-height: 1rem;
+            padding: 0.75rem;
         }
 
-        .company-name {
-            font-size: 1.125rem;
-            font-weight: bold;
+        .table-head {
+            display: table-row-group;
         }
 
-        .date-range {
-            font-size: 0.875rem;
+        .text-center {
+            text-align: center;
         }
 
-        .table-class {
-            width: 100%;
-            border-collapse: collapse;
+        .text-left {
+            text-align: left;
         }
 
-        .table-class th,
-        .table-class td {
-            padding: 0.75rem;
-            font-size: 0.75rem;
-            line-height: 1rem;
-            border-bottom: 1px solid #d1d5db; /* Gray border for all rows */
+        .text-right {
+            text-align: right;
         }
 
-        .category-header-row > td {
-            background-color: #f3f4f6; /* Gray background for category names */
-            font-weight: bold;
+        .title {
+            font-size: 1.5rem;
         }
 
-        .table-body tr {
-            background-color: #ffffff; /* White background for other rows */
+        .whitespace-normal {
+            white-space: normal;
         }
 
-        .spacer-row > td {
-            height: 0.75rem;
+        .whitespace-nowrap {
+            white-space: nowrap;
         }
 
-        .category-summary-row > td,
-        .table-footer-row > td {
-            font-weight: bold;
-            background-color: #ffffff; /* White background for footer */
+        table tfoot {
+            display: table-row-group;
         }
     </style>
 </head>
@@ -128,7 +128,12 @@
                     'category-header-row' => $loop->first || $loop->last || $loop->remaining === 1,
                 ])>
                 @foreach($transaction as $cellIndex => $cell)
-                    <td class="{{ $report->getAlignmentClass($cellIndex) }} {{ $cellIndex === 1 ? 'whitespace-normal' : 'whitespace-nowrap' }}">
+                    <td @class([
+                            $report->getAlignmentClass($cellIndex),
+                            'whitespace-normal' => $cellIndex === 'description',
+                            'whitespace-nowrap' => $cellIndex !== 'description',
+                        ])
+                    >
                         @if(is_array($cell) && isset($cell['description']))
                             {{ $cell['description'] }}
                         @else

resources/views/components/company/reports/cash-flow-statement-pdf.blade.php

@@ -5,127 +5,111 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ $report->getTitle() }}</title>
     <style>
-        .header {
-            color: #374151;
-            margin-bottom: 1rem;
+        .font-bold {
+            font-weight: bold;
         }
 
-        .header > * + * {
-            margin-top: 0.5rem;
+        .category-header-row > td,
+        .type-header-row > td {
+            background-color: #f3f4f6;
+            font-weight: bold;
         }
 
-        .table-head {
-            display: table-row-group;
+        .category-summary-row > td,
+        .table-footer-row > td,
+        .type-summary-row > td {
+            background-color: #ffffff;
+            font-weight: bold;
         }
 
-        .text-left {
-            text-align: left;
+        .cell {
+            padding-bottom: 5px;
+            position: relative;
         }
 
-        .text-right {
-            text-align: right;
+        .company-name {
+            font-size: 1.125rem;
+            font-weight: bold;
         }
 
-        .text-center {
-            text-align: center;
+        .date-range {
+            font-size: 0.875rem;
         }
 
-        .table-class th,
-        .table-class td {
+        .header {
             color: #374151;
+            margin-bottom: 1rem;
         }
 
-        .whitespace-normal {
-            white-space: normal;
-        }
-
-        .whitespace-nowrap {
-            white-space: nowrap;
-        }
-
-        .title {
-            font-size: 1.5rem;
+        .header div + div {
+            margin-top: 0.5rem;
         }
 
-        .company-name {
-            font-size: 1.125rem;
-            font-weight: bold;
+        .spacer-row > td {
+            height: 0.75rem;
         }
 
-        .date-range {
-            font-size: 0.875rem;
+        .table-body tr {
+            background-color: #ffffff;
         }
 
         .table-class {
-            width: 100%;
             border-collapse: collapse;
+            table-layout: fixed;
+            width: 100%;
         }
 
-        .table-class th,
-        .table-class td {
-            padding: 0.75rem;
+        .table-class .type-row-indent {
+            padding-left: 1.5rem;
+        }
+
+        .table-class td,
+        .table-class th {
+            border-bottom: 1px solid #d1d5db;
+            color: #374151;
             font-size: 0.75rem;
             line-height: 1rem;
-            border-bottom: 1px solid #d1d5db; /* Gray border for all rows */
+            padding: 0.75rem;
         }
 
-        .category-header-row > td,
-        .type-header-row > td {
-            background-color: #f3f4f6; /* Gray background for category names */
-            font-weight: bold;
+        .table-head {
+            display: table-row-group;
         }
 
-        .type-header-row > td,
-        .type-data-row > td,
-        .type-summary-row > td {
-            padding-left: 1.5rem; /* Indentation for type rows */
+        .text-center {
+            text-align: center;
         }
 
-        .table-body tr {
-            background-color: #ffffff; /* White background for other rows */
+        .text-left {
+            text-align: left;
         }
 
-        .spacer-row > td {
-            height: 0.75rem;
+        .text-right {
+            text-align: right;
         }
 
-        .bold {
-            font-weight: bold;
+        .title {
+            font-size: 1.5rem;
         }
 
-        .category-summary-row > td,
-        .type-summary-row > td,
-        .table-footer-row > td {
-            font-weight: bold;
-            background-color: #ffffff; /* White background for footer */
+        .table-class .underline-bold {
+            border-bottom: 2px solid #374151;
         }
 
-        .underline-thin::after {
-            content: '';
-            display: block;
-            position: absolute;
-            bottom: 0;
-            left: 0;
-            width: 100%;
-            height: 1px;
-            background-color: #374151; /* Adjust as needed */
+        .table-class .underline-thin {
+            border-bottom: 1px solid #374151;
         }
 
-        .underline-bold::after {
-            content: '';
-            display: block;
-            position: absolute;
-            bottom: 0;
-            left: 0;
-            width: 100%;
-            height: 2px; /* Adjust as needed */
-            background-color: #374151; /* Adjust as needed */
+        .whitespace-normal {
+            white-space: normal;
         }
 
-        /* Ensure td is relatively positioned to contain the absolute underline */
-        .cell {
-            position: relative;
-            padding-bottom: 5px; /* Adjust padding to add space for the underline */
+        .whitespace-nowrap {
+            white-space: nowrap;
+        }
+
+        table tfoot {
+            display: table-row-group;
         }
     </style>
 </head>
@@ -140,9 +124,19 @@
     @endif
 </div>
 <table class="table-class">
+    <colgroup>
+        @if(array_key_exists('account_code', $report->getHeaders()))
+            <col span="1" style="width: 20%;">
+            <col span="1" style="width: 55%;">
+            <col span="1" style="width: 25%;">
+        @else
+            <col span="1" style="width: 65%;">
+            <col span="1" style="width: 35%;">
+        @endif
+    </colgroup>
     <thead class="table-head">
     <tr>
-        @foreach($report->getCashInflowAndOutflowHeaders() as $index => $header)
+        @foreach($report->getHeaders() as $index => $header)
             <th class="{{ $report->getAlignmentClass($index) }}">
                 {{ $header }}
             </th>
@@ -161,7 +155,12 @@
         @foreach($category->data as $account)
             <tr>
                 @foreach($account as $index => $cell)
-                    <td class="{{ $report->getAlignmentClass($index) }} {{ $index === 1 ? 'whitespace-normal' : 'whitespace-nowrap' }}">
+                    <td @class([
+                            $report->getAlignmentClass($index),
+                            'whitespace-normal' => $index === 'account_name',
+                            'whitespace-nowrap' => $index !== 'account_name',
+                        ])
+                    >
                         @if(is_array($cell) && isset($cell['name']))
                             {{ $cell['name'] }}
                         @else
@@ -177,7 +176,11 @@
             <!-- Type Header -->
             <tr class="type-header-row">
                 @foreach($type->header as $index => $header)
-                    <td class="{{ $report->getAlignmentClass($index) }}">
+                    <td @class([
+                            $report->getAlignmentClass($index),
+                            'type-row-indent' => $index === 'account_name',
+                        ])
+                    >
                         {{ $header }}
                     </td>
                 @endforeach
@@ -187,7 +190,12 @@
             @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' }}">
+                        <td @class([
+                                $report->getAlignmentClass($index),
+                                'whitespace-normal type-row-indent' => $index === 'account_name',
+                                'whitespace-nowrap' => $index !== 'account_name',
+                            ])
+                        >
                             @if(is_array($cell) && isset($cell['name']))
                                 {{ $cell['name'] }}
                             @else
@@ -201,7 +209,11 @@
             <!-- Type Summary -->
             <tr class="type-summary-row">
                 @foreach($type->summary as $index => $cell)
-                    <td class="{{ $report->getAlignmentClass($index) }}">
+                    <td @class([
+                            $report->getAlignmentClass($index),
+                            'type-row-indent' => $index === 'account_name',
+                        ])
+                    >
                         {{ $cell }}
                     </td>
                 @endforeach
@@ -210,8 +222,7 @@
 
         <tr class="category-summary-row">
             @foreach($category->summary as $index => $cell)
-                <td
-                    @class([
+                <td @class([
                         'cell',
                         $report->getAlignmentClass($index),
                         'underline-bold' => $loop->last,
@@ -222,12 +233,14 @@
             @endforeach
         </tr>
 
-        <tr class="spacer-row">
-            <td colspan="{{ count($report->getHeaders()) }}"></td>
-        </tr>
+        @unless($loop->last && empty($report->getOverallTotals()))
+            <tr class="spacer-row">
+                <td colspan="{{ count($report->getHeaders()) }}"></td>
+            </tr>
+        @endunless
         </tbody>
     @endforeach
-    <tbody>
+    <tfoot>
     <tr class="table-footer-row">
         @foreach ($report->getOverallTotals() as $index => $total)
             <td class="{{ $report->getAlignmentClass($index) }}">
@@ -235,11 +248,21 @@
             </td>
         @endforeach
     </tr>
-    </tbody>
+    </tfoot>
 </table>
 
 <!-- Second Overview Table -->
-<table class="table-class mt-4 border-t">
+<table class="table-class">
+    <colgroup>
+        @if(array_key_exists('account_code', $report->getHeaders()))
+            <col span="1" style="width: 20%;">
+            <col span="1" style="width: 55%;">
+            <col span="1" style="width: 25%;">
+        @else
+            <col span="1" style="width: 65%;">
+            <col span="1" style="width: 35%;">
+        @endif
+    </colgroup>
     <thead class="table-head">
     <tr>
         @foreach($report->getOverviewHeaders() as $index => $header)
@@ -262,7 +285,12 @@
         @foreach($overviewCategory->data as $overviewAccount)
             <tr>
                 @foreach($overviewAccount as $index => $cell)
-                    <td class="{{ $report->getAlignmentClass($index) }} {{ $index === 'account_name' ? 'whitespace-normal' : 'whitespace-nowrap' }}">
+                    <td @class([
+                            $report->getAlignmentClass($index),
+                            'whitespace-normal' => $index === 'account_name',
+                            'whitespace-nowrap' => $index !== 'account_name',
+                        ])
+                    >
                         @if(is_array($cell) && isset($cell['name']))
                             {{ $cell['name'] }}
                         @else
@@ -280,18 +308,17 @@
                 </td>
             @endforeach
         </tr>
-       
+
         @if($overviewCategory->header['account_name'] === 'Starting Balance')
             @foreach($report->getOverviewAlignedWithColumns() as $summaryRow)
                 <tr>
                     @foreach($summaryRow as $index => $summaryCell)
-                        <td
-                            @class([
+                        <td @class([
                                 'cell',
                                 $report->getAlignmentClass($index),
-                                'bold' => $loop->parent->last,
-                                'underline-thin' => $loop->parent->remaining === 1 && $index === 'net_movement', // Thin underline
-                                'underline-bold' => $loop->parent->last && $index === 'net_movement', // Bold underline
+                                'font-bold' => $loop->parent->last,
+                                'underline-thin' => $loop->parent->remaining === 1 && $index === 'net_movement',
+                                'underline-bold' => $loop->parent->last && $index === 'net_movement',
                             ])
                         >
                             {{ $summaryCell }}

resources/views/components/company/reports/report-pdf.blade.php

@@ -5,95 +5,105 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ $report->getTitle() }}</title>
     <style>
+        .font-bold {
+            font-weight: bold;
+        }
+
+        .category-header-row > td,
+        .type-header-row > td {
+            background-color: #f3f4f6;
+            font-weight: bold;
+        }
+
+        .category-summary-row > td,
+        .table-footer-row > td,
+        .type-summary-row > td {
+            background-color: #ffffff;
+            font-weight: bold;
+        }
+
+        .company-name {
+            font-size: 1.125rem;
+            font-weight: bold;
+        }
+
+        .date-range {
+            font-size: 0.875rem;
+        }
+
         .header {
             color: #374151;
             margin-bottom: 1rem;
         }
 
-        .header > * + * {
+        .header div + div {
             margin-top: 0.5rem;
         }
 
-        .table-head {
-            display: table-row-group;
+        .spacer-row > td {
+            height: 0.75rem;
         }
 
-        .text-left {
-            text-align: left;
+        .table-body tr {
+            background-color: #ffffff;
         }
 
-        .text-right {
-            text-align: right;
+        .table-class {
+            border-collapse: collapse;
+            width: 100%;
         }
 
-        .text-center {
-            text-align: center;
+        .table-class .type-row-indent {
+            padding-left: 1.5rem;
         }
 
-        .table-class th,
-        .table-class td {
+        .table-class td,
+        .table-class th {
+            border-bottom: 1px solid #d1d5db;
             color: #374151;
+            font-size: 0.75rem;
+            line-height: 1rem;
+            padding: 0.75rem;
         }
 
-        .whitespace-normal {
-            white-space: normal;
-        }
-
-        .whitespace-nowrap {
-            white-space: nowrap;
-        }
-
-        .title {
-            font-size: 1.5rem;
+        .table-head {
+            display: table-row-group;
         }
 
-        .company-name {
-            font-size: 1.125rem;
-            font-weight: bold;
+        .text-center {
+            text-align: center;
         }
 
-        .date-range {
-            font-size: 0.875rem;
+        .text-left {
+            text-align: left;
         }
 
-        .table-class {
-            width: 100%;
-            border-collapse: collapse;
+        .text-right {
+            text-align: right;
         }
 
-        .table-class th,
-        .table-class td {
-            padding: 0.75rem;
-            font-size: 0.75rem;
-            line-height: 1rem;
-            border-bottom: 1px solid #d1d5db; /* Gray border for all rows */
+        .title {
+            font-size: 1.5rem;
         }
 
-        .category-header-row > td,
-        .type-header-row > td {
-            background-color: #f3f4f6; /* Gray background for category names */
-            font-weight: bold;
+        .table-class .underline-bold {
+            border-bottom: 2px solid #374151;
         }
 
-        .type-header-row > td,
-        .type-data-row > td,
-        .type-summary-row > td {
-            padding-left: 1.5rem; /* Indentation for type rows */
+        .table-class .underline-thin {
+            border-bottom: 1px solid #374151;
         }
 
-        .table-body tr {
-            background-color: #ffffff; /* White background for other rows */
+        .whitespace-normal {
+            white-space: normal;
         }
 
-        .spacer-row > td {
-            height: 0.75rem;
+        .whitespace-nowrap {
+            white-space: nowrap;
         }
 
-        .category-summary-row > td,
-        .type-summary-row > td,
-        .table-footer-row > td {
-            font-weight: bold;
-            background-color: #ffffff; /* White background for footer */
+        table tfoot {
+            display: table-row-group;
         }
     </style>
 </head>
@@ -129,7 +139,12 @@
         @foreach($category->data as $account)
             <tr>
                 @foreach($account as $index => $cell)
-                    <td class="{{ $report->getAlignmentClass($index) }} {{ $index === 1 ? 'whitespace-normal' : 'whitespace-nowrap' }}">
+                    <td @class([
+                            $report->getAlignmentClass($index),
+                            'whitespace-normal' => $index === 'account_name',
+                            'whitespace-nowrap' => $index !== 'account_name',
+                        ])
+                    >
                         @if(is_array($cell) && isset($cell['name']))
                             {{ $cell['name'] }}
                         @else
@@ -145,7 +160,11 @@
             <!-- Type Header -->
             <tr class="type-header-row">
                 @foreach($type->header as $index => $header)
-                    <td class="{{ $report->getAlignmentClass($index) }}">
+                    <td @class([
+                            $report->getAlignmentClass($index),
+                            'type-row-indent' => $index === 'account_name',
+                        ])
+                    >
                         {{ $header }}
                     </td>
                 @endforeach
@@ -155,7 +174,12 @@
             @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' }}">
+                        <td @class([
+                                $report->getAlignmentClass($index),
+                                'whitespace-normal type-row-indent' => $index === 'account_name',
+                                'whitespace-nowrap' => $index !== 'account_name',
+                            ])
+                        >
                             @if(is_array($cell) && isset($cell['name']))
                                 {{ $cell['name'] }}
                             @else
@@ -169,7 +193,11 @@
             <!-- Type Summary -->
             <tr class="type-summary-row">
                 @foreach($type->summary as $index => $cell)
-                    <td class="{{ $report->getAlignmentClass($index) }}">
+                    <td @class([
+                            $report->getAlignmentClass($index),
+                            'type-row-indent' => $index === 'account_name',
+                        ])
+                    >
                         {{ $cell }}
                     </td>
                 @endforeach
@@ -183,12 +211,15 @@
                 </td>
             @endforeach
         </tr>
-        <tr class="spacer-row">
-            <td colspan="{{ count($report->getHeaders()) }}"></td>
-        </tr>
+
+        @unless($loop->last && empty($report->getOverallTotals()))
+            <tr class="spacer-row">
+                <td colspan="{{ count($report->getHeaders()) }}"></td>
+            </tr>
+        @endunless
         </tbody>
     @endforeach
-    <tbody>
+    <tfoot>
     <tr class="table-footer-row">
         @foreach ($report->getOverallTotals() as $index => $total)
             <td class="{{ $report->getAlignmentClass($index) }}">
@@ -196,7 +227,7 @@
             </td>
         @endforeach
     </tr>
-    </tbody>
+    </tfoot>
 </table>
 </body>
 </html>

resources/views/components/company/tables/reports/balance-sheet-summary.blade.php

@@ -3,7 +3,7 @@
         <col span="1" style="width: 65%;">
         <col span="1" style="width: 35%;">
     </colgroup>
-    <x-company.tables.header :headers="$report->getSummaryTitleHeaders()"
+    <x-company.tables.header :headers="$report->getSummaryHeaders()"
                              :alignment-class="[$report, 'getAlignmentClass']"/>
     @foreach($report->getSummaryCategories() as $accountCategory)
         <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">

resources/views/components/company/tables/reports/balance-sheet.blade.php

@@ -9,7 +9,7 @@
             <col span="1" style="width: 35%;">
         @endif
     </colgroup>
-    <x-company.tables.header :headers="$report->getTitleHeaders()" :alignment-class="[$report, 'getAlignmentClass']"/>
+    <x-company.tables.header :headers="$report->getHeaders()" :alignment-class="[$report, 'getAlignmentClass']"/>
     @foreach($report->getCategories() as $accountCategory)
         <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
         <x-company.tables.category-header :category-headers="$accountCategory->header"

resources/views/components/company/tables/reports/cash-flow-statement-summary.blade.php

@@ -3,7 +3,7 @@
         <col span="1" style="width: 65%;">
         <col span="1" style="width: 35%;">
     </colgroup>
-    <x-company.tables.header :headers="$report->getSummaryCashInflowAndOutflowHeaders()"
+    <x-company.tables.header :headers="$report->getSummaryHeaders()"
                              :alignment-class="[$report, 'getAlignmentClass']"/>
     @foreach($report->getSummaryCategories() as $accountCategory)
         <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">

resources/views/components/company/tables/reports/cash-flow-statement.blade.php

@@ -9,8 +9,7 @@
             <col span="1" style="width: 35%;">
         @endif
     </colgroup>
-    <x-company.tables.header :headers="$report->getCashInflowAndOutflowHeaders()"
-                             :alignment-class="[$report, 'getAlignmentClass']"/>
+    <x-company.tables.header :headers="$report->getHeaders()" :alignment-class="[$report, 'getAlignmentClass']"/>
     @foreach($report->getCategories() as $accountCategory)
         <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
         <x-company.tables.category-header :category-headers="$accountCategory->header"

resources/views/components/company/tables/reports/income-statement-summary.blade.php

@@ -3,7 +3,7 @@
         <col span="1" style="width: 65%;">
         <col span="1" style="width: 35%;">
     </colgroup>
-    <x-company.tables.header :headers="$report->getSummaryTitleHeaders()"
+    <x-company.tables.header :headers="$report->getSummaryHeaders()"
                              :alignment-class="[$report, 'getAlignmentClass']"/>
     @foreach($report->getSummaryCategories() as $accountCategory)
         <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">

resources/views/components/company/tables/reports/income-statement.blade.php

@@ -9,7 +9,7 @@
             <col span="1" style="width: 35%;">
         @endif
     </colgroup>
-    <x-company.tables.header :headers="$report->getTitleHeaders()" :alignment-class="[$report, 'getAlignmentClass']"/>
+    <x-company.tables.header :headers="$report->getHeaders()" :alignment-class="[$report, 'getAlignmentClass']"/>
     @foreach($report->getCategories() as $accountCategory)
         <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
         <x-company.tables.category-header :category-headers="$accountCategory->header"