refactor: Report design pattern

app/Contracts/ExportableReport.php

@@ -8,7 +8,13 @@ interface ExportableReport
 
     public function getHeaders(): array;
 
-    public function getData(): array;
+    public function getCategories(): array;
 
     public function getOverallTotals(): array;
+
+    public function getRightAlignedColumns(): array;
+
+    public function getLeftAlignedColumns(): array;
+
+    public function getCenterAlignedColumns(): array;
 }

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

@@ -2,7 +2,7 @@
 
 namespace App\Filament\Company\Pages\Reports;
 
-use App\DTO\ReportDTO;
+use App\Contracts\ExportableReport;
 use App\Services\ExportService;
 use App\Services\ReportService;
 use App\Transformers\AccountBalanceReportTransformer;
@@ -20,7 +20,7 @@ class AccountBalances extends BaseReportPage
 
     protected ReportService $reportService;
 
-    public ReportDTO $accountBalanceReport;
+    public ExportableReport $accountBalanceReport;
 
     protected ExportService $exportService;
 
@@ -32,7 +32,8 @@ class AccountBalances extends BaseReportPage
 
     public function loadReportData(): void
     {
-        $this->accountBalanceReport = $this->reportService->buildAccountBalanceReport($this->startDate, $this->endDate);
+        $reportDTO = $this->reportService->buildAccountBalanceReport($this->startDate, $this->endDate);
+        $this->accountBalanceReport = new AccountBalanceReportTransformer($reportDTO);
     }
 
     public function form(Form $form): Form
@@ -49,15 +50,11 @@ class AccountBalances extends BaseReportPage
 
     public function exportCSV(): StreamedResponse
     {
-        $transformer = new AccountBalanceReportTransformer($this->accountBalanceReport);
-
-        return $this->exportService->exportToCsv($this->company, $transformer, $this->startDate, $this->endDate);
+        return $this->exportService->exportToCsv($this->company, $this->accountBalanceReport, $this->startDate, $this->endDate);
     }
 
     public function exportPDF(): StreamedResponse
     {
-        $transformer = new AccountBalanceReportTransformer($this->accountBalanceReport);
-
-        return $this->exportService->exportToPdf($this->company, $transformer, $this->startDate, $this->endDate);
+        return $this->exportService->exportToPdf($this->company, $this->accountBalanceReport, $this->startDate, $this->endDate);
     }
 }

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

@@ -2,7 +2,7 @@
 
 namespace App\Filament\Company\Pages\Reports;
 
-use App\DTO\ReportDTO;
+use App\Contracts\ExportableReport;
 use App\Services\ExportService;
 use App\Services\ReportService;
 use App\Transformers\TrialBalanceReportTransformer;
@@ -20,7 +20,7 @@ class TrialBalance extends BaseReportPage
 
     protected ReportService $reportService;
 
-    public ReportDTO $trialBalanceReport;
+    public ExportableReport $trialBalanceReport;
 
     protected ExportService $exportService;
 
@@ -32,7 +32,8 @@ class TrialBalance extends BaseReportPage
 
     public function loadReportData(): void
     {
-        $this->trialBalanceReport = $this->reportService->buildTrialBalanceReport($this->startDate, $this->endDate);
+        $reportDTO = $this->reportService->buildTrialBalanceReport($this->startDate, $this->endDate);
+        $this->trialBalanceReport = new TrialBalanceReportTransformer($reportDTO);
     }
 
     public function form(Form $form): Form
@@ -49,15 +50,11 @@ class TrialBalance extends BaseReportPage
 
     public function exportCSV(): StreamedResponse
     {
-        $transformer = new TrialBalanceReportTransformer($this->trialBalanceReport);
-
-        return $this->exportService->exportToCsv($this->company, $transformer, $this->startDate, $this->endDate);
+        return $this->exportService->exportToCsv($this->company, $this->trialBalanceReport, $this->startDate, $this->endDate);
     }
 
     public function exportPDF(): StreamedResponse
     {
-        $transformer = new TrialBalanceReportTransformer($this->trialBalanceReport);
-
-        return $this->exportService->exportToPdf($this->company, $transformer, $this->startDate, $this->endDate);
+        return $this->exportService->exportToPdf($this->company, $this->trialBalanceReport, $this->startDate, $this->endDate);
     }
 }

app/Services/ExportService.php

@@ -29,8 +29,15 @@ class ExportService
 
             fputcsv($file, $report->getHeaders());
 
-            foreach ($report->getData() as $row) {
-                fputcsv($file, $row);
+            foreach ($report->getCategories() as $category) {
+                fputcsv($file, $category['header']);
+
+                foreach ($category['data'] as $accountRow) {
+                    fputcsv($file, $accountRow);
+                }
+
+                fputcsv($file, $category['summary']);
+                fputcsv($file, []); // Empty row for spacing
             }
 
             fputcsv($file, $report->getOverallTotals());

app/Transformers/AccountBalanceReportTransformer.php

@@ -2,18 +2,10 @@
 
 namespace App\Transformers;
 
-use App\Contracts\ExportableReport;
-use App\DTO\ReportDTO;
+use App\DTO\AccountDTO;
 
-class AccountBalanceReportTransformer implements ExportableReport
+class AccountBalanceReportTransformer extends BaseReportTransformer
 {
-    protected ReportDTO $report;
-
-    public function __construct(ReportDTO $report)
-    {
-        $this->report = $report;
-    }
-
     public function getTitle(): string
     {
         return 'Account Balances';
@@ -21,46 +13,55 @@ class AccountBalanceReportTransformer implements ExportableReport
 
     public function getHeaders(): array
     {
-        return ['ACCOUNT CODE', 'ACCOUNT', 'STARTING BALANCE', 'DEBIT', 'CREDIT', 'NET MOVEMENT', 'ENDING BALANCE'];
+        return ['', 'Account', 'Starting Balance', 'Debit', 'Credit', 'Net Movement', 'Ending Balance'];
     }
 
-    public function getData(): array
+    public function getRightAlignedColumns(): array
     {
-        $data = [];
+        return [2, 3, 4, 5, 6];
+    }
 
-        foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
-            // Category Header row
-            $data[] = ['', $accountCategoryName];
+    public function getLeftAlignedColumns(): array
+    {
+        return [1];
+    }
 
-            // Account rows
-            foreach ($accountCategory->accounts as $account) {
-                $data[] = [
-                    $account->accountCode,
-                    $account->accountName,
-                    $account->balance->startingBalance ?? '',
-                    $account->balance->debitBalance,
-                    $account->balance->creditBalance,
-                    $account->balance->netMovement,
-                    $account->balance->endingBalance ?? '',
-                ];
-            }
+    public function getCenterAlignedColumns(): array
+    {
+        return [0];
+    }
 
-            // Category Summary row
-            $data[] = [
-                '',
-                'Total ' . $accountCategoryName,
-                $accountCategory->summary->startingBalance ?? '',
-                $accountCategory->summary->debitBalance,
-                $accountCategory->summary->creditBalance,
-                $accountCategory->summary->netMovement,
-                $accountCategory->summary->endingBalance ?? '',
-            ];
+    public function getCategories(): array
+    {
+        $categories = [];
 
-            // Add an empty row after each category
-            $data[] = [''];
+        foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
+            $categories[] = [
+                'header' => ['', $accountCategoryName, '', '', '', '', ''],
+                'data' => array_map(static function (AccountDTO $account) {
+                    return [
+                        $account->accountCode,
+                        $account->accountName,
+                        $account->balance->startingBalance ?? '',
+                        $account->balance->debitBalance,
+                        $account->balance->creditBalance,
+                        $account->balance->netMovement,
+                        $account->balance->endingBalance ?? '',
+                    ];
+                }, $accountCategory->accounts),
+                'summary' => [
+                    '',
+                    'Total ' . $accountCategoryName,
+                    $accountCategory->summary->startingBalance ?? '',
+                    $accountCategory->summary->debitBalance,
+                    $accountCategory->summary->creditBalance,
+                    $accountCategory->summary->netMovement,
+                    $accountCategory->summary->endingBalance ?? '',
+                ],
+            ];
         }
 
-        return $data;
+        return $categories;
     }
 
     public function getOverallTotals(): array

app/Transformers/BaseReportTransformer.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Transformers;
+
+use App\Contracts\ExportableReport;
+use App\DTO\ReportDTO;
+use Livewire\Wireable;
+
+abstract class BaseReportTransformer implements ExportableReport, Wireable
+{
+    protected ReportDTO $report;
+
+    public function __construct(ReportDTO $report)
+    {
+        $this->report = $report;
+    }
+
+    public function getAlignmentClass(int $index): string
+    {
+        if (in_array($index, $this->getRightAlignedColumns())) {
+            return 'text-right';
+        }
+
+        if (in_array($index, $this->getCenterAlignedColumns())) {
+            return 'text-center';
+        }
+
+        return 'text-left';
+    }
+
+    abstract public function getRightAlignedColumns(): array;
+
+    abstract public function getCenterAlignedColumns(): array;
+
+    abstract public function getLeftAlignedColumns(): array;
+
+    public function toLivewire(): array
+    {
+        return [
+            'report' => $this->report->toLivewire(),
+        ];
+    }
+
+    public static function fromLivewire($value): static
+    {
+        return new static(
+            ReportDTO::fromLivewire($value['report']),
+        );
+    }
+}

app/Transformers/TrialBalanceReportTransformer.php

@@ -2,18 +2,10 @@
 
 namespace App\Transformers;
 
-use App\Contracts\ExportableReport;
-use App\DTO\ReportDTO;
+use App\DTO\AccountDTO;
 
-class TrialBalanceReportTransformer implements ExportableReport
+class TrialBalanceReportTransformer extends BaseReportTransformer
 {
-    protected ReportDTO $report;
-
-    public function __construct(ReportDTO $report)
-    {
-        $this->report = $report;
-    }
-
     public function getTitle(): string
     {
         return 'Trial Balance';
@@ -21,40 +13,49 @@ class TrialBalanceReportTransformer implements ExportableReport
 
     public function getHeaders(): array
     {
-        return ['ACCOUNT CODE', 'ACCOUNT', 'DEBIT', 'CREDIT'];
+        return ['', 'Account', 'Debit', 'Credit'];
     }
 
-    public function getData(): array
+    public function getRightAlignedColumns(): array
     {
-        $data = [];
+        return [2, 3];
+    }
 
-        foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
-            // Category Header row
-            $data[] = ['', $accountCategoryName];
+    public function getLeftAlignedColumns(): array
+    {
+        return [1];
+    }
 
-            // Account rows
-            foreach ($accountCategory->accounts as $account) {
-                $data[] = [
-                    $account->accountCode,
-                    $account->accountName,
-                    $account->balance->debitBalance,
-                    $account->balance->creditBalance,
-                ];
-            }
+    public function getCenterAlignedColumns(): array
+    {
+        return [0];
+    }
 
-            // Category Summary row
-            $data[] = [
-                '',
-                'Total ' . $accountCategoryName,
-                $accountCategory->summary->debitBalance,
-                $accountCategory->summary->creditBalance,
-            ];
+    public function getCategories(): array
+    {
+        $categories = [];
 
-            // Add an empty row after each category
-            $data[] = [''];
+        foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
+            $categories[] = [
+                'header' => ['', $accountCategoryName, '', ''],
+                'data' => array_map(static function (AccountDTO $account) {
+                    return [
+                        $account->accountCode,
+                        $account->accountName,
+                        $account->balance->debitBalance,
+                        $account->balance->creditBalance,
+                    ];
+                }, $accountCategory->accounts),
+                'summary' => [
+                    '',
+                    'Total ' . $accountCategoryName,
+                    $accountCategory->summary->debitBalance,
+                    $accountCategory->summary->creditBalance,
+                ],
+            ];
         }
 
-        return $data;
+        return $categories;
     }
 
     public function getOverallTotals(): array

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.308.3",
+            "version": "3.308.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "7fa0625056fa1fcf6732f89ba37b3f630d78de59"
+                "reference": "81386b0d0fd18ae8015f279247f714c5d5acb696"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7fa0625056fa1fcf6732f89ba37b3f630d78de59",
-                "reference": "7fa0625056fa1fcf6732f89ba37b3f630d78de59",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/81386b0d0fd18ae8015f279247f714c5d5acb696",
+                "reference": "81386b0d0fd18ae8015f279247f714c5d5acb696",
                 "shasum": ""
             },
             "require": {
@@ -586,9 +586,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.308.3"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.308.5"
             },
-            "time": "2024-05-24T18:29:40+00:00"
+            "time": "2024-05-29T18:08:33+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -1985,16 +1985,16 @@
         },
         {
             "name": "filament/actions",
-            "version": "v3.2.82",
+            "version": "v3.2.83",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
-                "reference": "889cb3538090cfe0eef1ca51ce7808646133b7ed"
+                "reference": "fa17a8b9aecd68313cc027d05b47bb95e9d897ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/actions/zipball/889cb3538090cfe0eef1ca51ce7808646133b7ed",
-                "reference": "889cb3538090cfe0eef1ca51ce7808646133b7ed",
+                "url": "https://api.github.com/repos/filamentphp/actions/zipball/fa17a8b9aecd68313cc027d05b47bb95e9d897ae",
+                "reference": "fa17a8b9aecd68313cc027d05b47bb95e9d897ae",
                 "shasum": ""
             },
             "require": {
@@ -2034,20 +2034,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-05-23T12:08:12+00:00"
+            "time": "2024-05-27T10:09:11+00:00"
         },
         {
             "name": "filament/filament",
-            "version": "v3.2.82",
+            "version": "v3.2.83",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
-                "reference": "b73e49d6ef02dba8f118d2934435748ed4feffa2"
+                "reference": "56cd6e4f88427dcf16b2f1728f74f5d9319e5d47"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/b73e49d6ef02dba8f118d2934435748ed4feffa2",
-                "reference": "b73e49d6ef02dba8f118d2934435748ed4feffa2",
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/56cd6e4f88427dcf16b2f1728f74f5d9319e5d47",
+                "reference": "56cd6e4f88427dcf16b2f1728f74f5d9319e5d47",
                 "shasum": ""
             },
             "require": {
@@ -2099,20 +2099,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-05-23T12:08:29+00:00"
+            "time": "2024-05-27T10:09:09+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v3.2.82",
+            "version": "v3.2.83",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "c97fb3c5a6e5dd0d4d9cdbaa8b43c99c0cc35a01"
+                "reference": "c594707c89c7af2a7c70557640900781cd3a25c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/c97fb3c5a6e5dd0d4d9cdbaa8b43c99c0cc35a01",
-                "reference": "c97fb3c5a6e5dd0d4d9cdbaa8b43c99c0cc35a01",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/c594707c89c7af2a7c70557640900781cd3a25c0",
+                "reference": "c594707c89c7af2a7c70557640900781cd3a25c0",
                 "shasum": ""
             },
             "require": {
@@ -2155,20 +2155,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-05-23T12:08:13+00:00"
+            "time": "2024-05-27T10:09:06+00:00"
         },
         {
             "name": "filament/infolists",
-            "version": "v3.2.82",
+            "version": "v3.2.83",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
-                "reference": "d473d1b11ad32c917cf6e3610411fd790b8c1e27"
+                "reference": "601f9e456afea1f987a424e35a488dd1e960d95f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/d473d1b11ad32c917cf6e3610411fd790b8c1e27",
-                "reference": "d473d1b11ad32c917cf6e3610411fd790b8c1e27",
+                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/601f9e456afea1f987a424e35a488dd1e960d95f",
+                "reference": "601f9e456afea1f987a424e35a488dd1e960d95f",
                 "shasum": ""
             },
             "require": {
@@ -2206,11 +2206,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-05-23T12:08:25+00:00"
+            "time": "2024-05-27T10:09:10+00:00"
         },
         {
             "name": "filament/notifications",
-            "version": "v3.2.82",
+            "version": "v3.2.83",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
@@ -2262,7 +2262,7 @@
         },
         {
             "name": "filament/support",
-            "version": "v3.2.82",
+            "version": "v3.2.83",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
@@ -2320,16 +2320,16 @@
         },
         {
             "name": "filament/tables",
-            "version": "v3.2.82",
+            "version": "v3.2.83",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
-                "reference": "6c183a98ee19f491f229dbca732f0b00ad9e31be"
+                "reference": "04d464ea199cf8f5551fadd6c2e14da04f64b7f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/6c183a98ee19f491f229dbca732f0b00ad9e31be",
-                "reference": "6c183a98ee19f491f229dbca732f0b00ad9e31be",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/04d464ea199cf8f5551fadd6c2e14da04f64b7f5",
+                "reference": "04d464ea199cf8f5551fadd6c2e14da04f64b7f5",
                 "shasum": ""
             },
             "require": {
@@ -2369,11 +2369,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-05-23T12:08:36+00:00"
+            "time": "2024-05-27T10:09:23+00:00"
         },
         {
             "name": "filament/widgets",
-            "version": "v3.2.82",
+            "version": "v3.2.83",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
@@ -3161,16 +3161,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.8.0",
+            "version": "v11.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "ceb892a25817c888ef3df4d1a2af9cac53978300"
+                "reference": "60167ce91c59ed5eea2ad4f2a7b6d686fb103ba7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/ceb892a25817c888ef3df4d1a2af9cac53978300",
-                "reference": "ceb892a25817c888ef3df4d1a2af9cac53978300",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/60167ce91c59ed5eea2ad4f2a7b6d686fb103ba7",
+                "reference": "60167ce91c59ed5eea2ad4f2a7b6d686fb103ba7",
                 "shasum": ""
             },
             "require": {
@@ -3362,20 +3362,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-05-21T17:57:45+00:00"
+            "time": "2024-05-28T18:16:41+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.1.22",
+            "version": "v0.1.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "37f94de71758dbfbccc9d299b0e5eb76e02a40f5"
+                "reference": "9bc4df7c699b0452c6b815e64a2d84b6d7f99400"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/37f94de71758dbfbccc9d299b0e5eb76e02a40f5",
-                "reference": "37f94de71758dbfbccc9d299b0e5eb76e02a40f5",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/9bc4df7c699b0452c6b815e64a2d84b6d7f99400",
+                "reference": "9bc4df7c699b0452c6b815e64a2d84b6d7f99400",
                 "shasum": ""
             },
             "require": {
@@ -3418,9 +3418,9 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.1.22"
+                "source": "https://github.com/laravel/prompts/tree/v0.1.23"
             },
-            "time": "2024-05-10T19:22:18+00:00"
+            "time": "2024-05-27T13:53:20+00:00"
         },
         {
             "name": "laravel/sanctum",
@@ -4543,16 +4543,16 @@
         },
         {
             "name": "matomo/device-detector",
-            "version": "6.3.1",
+            "version": "6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/matomo-org/device-detector.git",
-                "reference": "8096093346917ee2477d802ab3b00c4c091c5cee"
+                "reference": "fd4042cb6a7f3f985a81aedc075dd59e0b991a51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/8096093346917ee2477d802ab3b00c4c091c5cee",
-                "reference": "8096093346917ee2477d802ab3b00c4c091c5cee",
+                "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/fd4042cb6a7f3f985a81aedc075dd59e0b991a51",
+                "reference": "fd4042cb6a7f3f985a81aedc075dd59e0b991a51",
                 "shasum": ""
             },
             "require": {
@@ -4608,7 +4608,7 @@
                 "source": "https://github.com/matomo-org/matomo",
                 "wiki": "https://dev.matomo.org/"
             },
-            "time": "2024-04-12T12:16:21+00:00"
+            "time": "2024-05-28T10:16:19+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -11776,16 +11776,16 @@
         },
         {
             "name": "spatie/ignition",
-            "version": "1.14.1",
+            "version": "1.14.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/ignition.git",
-                "reference": "c23cc018c5f423d2f413b99f84655fceb6549811"
+                "reference": "5e11c11f675bb5251f061491a493e04a1a571532"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/ignition/zipball/c23cc018c5f423d2f413b99f84655fceb6549811",
-                "reference": "c23cc018c5f423d2f413b99f84655fceb6549811",
+                "url": "https://api.github.com/repos/spatie/ignition/zipball/5e11c11f675bb5251f061491a493e04a1a571532",
+                "reference": "5e11c11f675bb5251f061491a493e04a1a571532",
                 "shasum": ""
             },
             "require": {
@@ -11855,7 +11855,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-05-03T15:56:16+00:00"
+            "time": "2024-05-29T08:10:20+00:00"
         },
         {
             "name": "spatie/laravel-ignition",

package-lock.json

@@ -931,9 +931,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001621",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001621.tgz",
-            "integrity": "sha512-+NLXZiviFFKX0fk8Piwv3PfLPGtRqJeq2TiNoUff/qB5KJgwecJTvCXDpmlyP/eCI/GUEmp/h/y5j0yckiiZrA==",
+            "version": "1.0.30001625",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001625.tgz",
+            "integrity": "sha512-4KE9N2gcRH+HQhpeiRZXd+1niLB/XNLAhSy4z7fI8EzcbcPoAqjNInxVHTiTwWfTIV4w096XG8OtCOCQQKPv3w==",
             "dev": true,
             "funding": [
                 {
@@ -1079,9 +1079,9 @@
             "dev": true
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.783",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.783.tgz",
-            "integrity": "sha512-bT0jEz/Xz1fahQpbZ1D7LgmPYZ3iHVY39NcWWro1+hA2IvjiPeaXtfSqrQ+nXjApMvQRE2ASt1itSLRrebHMRQ==",
+            "version": "1.4.784",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.784.tgz",
+            "integrity": "sha512-9CZwh+sDrhDAeOEFh8s3PqwduzTyYIeYwZolc1b9ENAUt3ePu7R1sJSCWr/820ISssRxCJUyHI9Wb7j+0Uo1AA==",
             "dev": true
         },
         "node_modules/emoji-regex": {
@@ -2365,9 +2365,9 @@
             "dev": true
         },
         "node_modules/vite": {
-            "version": "5.2.11",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.11.tgz",
-            "integrity": "sha512-HndV31LWW05i1BLPMUCE1B9E9GFbOu1MbenhS58FuK6owSO5qHm7GiCotrNY1YE5rMeQSFBGmT5ZaLEjFizgiQ==",
+            "version": "5.2.12",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.12.tgz",
+            "integrity": "sha512-/gC8GxzxMK5ntBwb48pR32GGhENnjtY30G4A0jemunsBkiEZFw60s8InGpN8gkhHEkjnRK1aSAxeQgwvFhUHAA==",
             "dev": true,
             "dependencies": {
                 "esbuild": "^0.20.1",

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

@@ -12,27 +12,28 @@
 
         .header {
             color: #374151;
+            margin-bottom: 1rem;
         }
 
-        .table-class th,
-        .table-class td {
-            text-align: right;
-            color: #374151;
+        .table-head {
+            display: table-row-group;
         }
 
-        /* Align the first column header and data to the left */
-        .table-class th:first-child, .table-class td:first-child,
-        .table-class th:nth-child(2), .table-class td:nth-child(2) {
+        .text-left {
             text-align: left;
         }
 
-        .header {
-            margin-bottom: 1rem; /* Space between header and table */
+        .text-right {
+            text-align: right;
         }
 
-        /* Ensure category name is left-aligned */
-        .category-name-cell {
-            text-align: left;
+        .text-center {
+            text-align: center;
+        }
+
+        .table-class th,
+        .table-class td {
+            color: #374151;
         }
 
         .header .title,
@@ -41,9 +42,18 @@
             margin-bottom: 0.125rem; /* Uniform space between header elements */
         }
 
-        .title { font-size: 1.5rem; }
-        .company-name { font-size: 1.125rem; font-weight: 600; }
-        .date-range { font-size: 0.875rem; }
+        .title {
+            font-size: 1.5rem;
+        }
+
+        .company-name {
+            font-size: 1.125rem;
+            font-weight: 600;
+        }
+
+        .date-range {
+            font-size: 0.875rem;
+        }
 
         .table-class {
             width: 100%;
@@ -58,15 +68,20 @@
             border-bottom: 1px solid #d1d5db; /* Gray border for all rows */
         }
 
-        .category-row > td {
+        .category-header-row > td {
             background-color: #f3f4f6; /* Gray background for category names */
             font-weight: 600;
         }
 
-        .table-body tr { background-color: #ffffff; /* White background for other rows */ }
+        .table-body tr {
+            background-color: #ffffff; /* White background for other rows */
+        }
 
-        .spacer-row > td { height: 0.75rem; }
+        .spacer-row > td {
+            height: 0.75rem;
+        }
 
+        .category-summary-row > td,
         .table-footer-row > td {
             font-weight: 600;
             background-color: #ffffff; /* White background for footer */
@@ -74,49 +89,60 @@
     </style>
 </head>
 <body>
-    <div class="header">
-        <div class="title">{{ $report->getTitle() }}</div>
-        <div class="company-name">{{ $company->name }}</div>
-        <div class="date-range">Date Range: {{ $startDate }} to {{ $endDate }}</div>
-    </div>
-    <table class="table-class">
-        <thead class="table-head" style="display: table-row-group;">
+<div class="header">
+    <div class="title">{{ $report->getTitle() }}</div>
+    <div class="company-name">{{ $company->name }}</div>
+    <div class="date-range">Date Range: {{ $startDate }} to {{ $endDate }}</div>
+</div>
+<table class="table-class">
+    <thead class="table-head">
+    <tr>
+        @foreach($report->getHeaders() as $index => $header)
+            <th class="{{ $report->getAlignmentClass($index) }}">
+                {{ $header }}
+            </th>
+        @endforeach
+    </tr>
+    </thead>
+    @foreach($report->getCategories() as $category)
+        <tbody>
+        <tr class="category-header-row">
+            @foreach($category['header'] as $index => $header)
+                <td class="{{ $report->getAlignmentClass($index) }}">
+                    {{ $header }}
+                </td>
+            @endforeach
+        </tr>
+        @foreach($category['data'] as $account)
             <tr>
-                @foreach($report->getHeaders() as $header)
-                    <th>{{ $header }}</th>
+                @foreach($account as $index => $cell)
+                    <td class="{{ $report->getAlignmentClass($index) }}">
+                        {{ $cell }}
+                    </td>
                 @endforeach
             </tr>
-        </thead>
-        <tbody>
-            @foreach($report->getData() as $row)
-                @if (count($row) === 2 && empty($row[0]))
-                    <tr class="category-row">
-                        <td></td>
-                        <td class="category-name-cell">{{ $row[1] }}</td>
-                        @for ($i = 2; $i < count($report->getHeaders()); $i++)
-                            <td></td>
-                        @endfor
-                    </tr>
-                @elseif (count($row) > 2)
-                    <tr>
-                        @foreach ($row as $cell)
-                            <td>{{ $cell }}</td>
-                        @endforeach
-                    </tr>
-                @elseif ($row[0] === '')
-                    <tr class="spacer-row">
-                        <td colspan="{{ count($report->getHeaders()) }}"></td>
-                    </tr>
-                @endif
+        @endforeach
+        <tr class="category-summary-row">
+            @foreach($category['summary'] as $index => $cell)
+                <td class="{{ $report->getAlignmentClass($index) }}">
+                    {{ $cell }}
+                </td>
             @endforeach
+        </tr>
+        <tr class="spacer-row">
+            <td colspan="{{ count($report->getHeaders()) }}"></td>
+        </tr>
         </tbody>
-        <tfoot>
-            <tr class="table-footer-row">
-                @foreach ($report->getOverallTotals() as $total)
-                    <td>{{ $total }}</td>
-                @endforeach
-            </tr>
-        </tfoot>
-    </table>
+    @endforeach
+    <tfoot>
+    <tr class="table-footer-row">
+        @foreach ($report->getOverallTotals() as $index => $total)
+            <td class="{{ $report->getAlignmentClass($index) }}">
+                {{ $total }}
+            </td>
+        @endforeach
+    </tr>
+    </tfoot>
+</table>
 </body>
 </html>

resources/views/components/company/tables/reports/detailed-report.blade.php

@@ -0,0 +1,62 @@
+<table class="w-full table-auto divide-y divide-gray-200 text-start dark:divide-white/5">
+    <thead class="divide-y divide-gray-200 dark:divide-white/5">
+        <tr class="bg-gray-50 dark:bg-white/5">
+            @foreach($report->getHeaders() as $index => $header)
+                <th class="px-3 py-3.5 sm:first-of-type:ps-6 sm:last-of-type:pe-6 {{ $report->getAlignmentClass($index) }}">
+                    <span class="text-sm font-semibold text-gray-950 dark:text-white">
+                        {{ $header }}
+                    </span>
+                </th>
+            @endforeach
+        </tr>
+    </thead>
+    @foreach($report->getCategories() as $category)
+        <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
+        <tr class="bg-gray-50 dark:bg-white/5">
+            @foreach($category['header'] as $index => $header)
+                <x-filament-tables::cell class="{{ $report->getAlignmentClass($index) }}">
+                    <div class="px-3 py-2 text-sm font-semibold text-gray-950 dark:text-white">
+                        {{ $header }}
+                    </div>
+                </x-filament-tables::cell>
+            @endforeach
+        </tr>
+        @foreach($category['data'] as $account)
+            <tr>
+                @foreach($account as $index => $cell)
+                    <x-filament-tables::cell class="{{ $report->getAlignmentClass($index) }}">
+                        <div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">
+                            {{ $cell }}
+                        </div>
+                    </x-filament-tables::cell>
+                @endforeach
+            </tr>
+        @endforeach
+        <tr>
+            @foreach($category['summary'] as $index => $cell)
+                <x-filament-tables::cell class="{{ $report->getAlignmentClass($index) }}">
+                    <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
+                        {{ $cell }}
+                    </div>
+                </x-filament-tables::cell>
+            @endforeach
+        </tr>
+        <tr>
+            <x-filament-tables::cell colspan="{{ count($report->getHeaders()) }}">
+                <div class="px-3 py-2 leading-6 invisible">Hidden Text</div>
+            </x-filament-tables::cell>
+        </tr>
+        </tbody>
+    @endforeach
+    <tfoot>
+        <tr class="bg-gray-50 dark:bg-white/5">
+            @foreach($report->getOverallTotals() as $index => $total)
+                <x-filament-tables::cell class="{{ $report->getAlignmentClass($index) }}">
+                    <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
+                        {{ $total }}
+                    </div>
+                </x-filament-tables::cell>
+            @endforeach
+        </tr>
+    </tfoot>
+</table>

resources/views/filament/company/pages/reports/account-balances.blade.php

@@ -14,60 +14,7 @@
                 </form>
             </div>
             <div class="divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10">
-                <table class="w-full table-auto divide-y divide-gray-200 text-start dark:divide-white/5">
-                    <thead class="divide-y divide-gray-200 dark:divide-white/5">
-                        <tr class="bg-gray-50 dark:bg-white/5">
-                            <x-filament-tables::header-cell>Account</x-filament-tables::header-cell>
-                            <x-filament-tables::header-cell alignment="end">Starting Balance</x-filament-tables::header-cell>
-                            <x-filament-tables::header-cell alignment="end">Debit</x-filament-tables::header-cell>
-                            <x-filament-tables::header-cell alignment="end">Credit</x-filament-tables::header-cell>
-                            <x-filament-tables::header-cell alignment="end">Net Movement</x-filament-tables::header-cell>
-                            <x-filament-tables::header-cell alignment="end">Ending Balance</x-filament-tables::header-cell>
-                        </tr>
-                    </thead>
-                    @foreach($accountBalanceReport->categories as $accountCategoryName => $accountCategory)
-                        <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
-                        <tr class="bg-gray-50 dark:bg-white/5">
-                            <x-filament-tables::cell colspan="6">
-                                <div class="px-3 py-2 text-sm font-medium text-gray-950 dark:text-white">{{ $accountCategoryName }}</div>
-                            </x-filament-tables::cell>
-                        </tr>
-                        @foreach($accountCategory->accounts as $account)
-                            <x-filament-tables::row>
-                                <x-filament-tables::cell><div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">{{ $account->accountName }}</div></x-filament-tables::cell>
-                                <x-filament-tables::cell class="text-right"><div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">{{ $account->balance->startingBalance ?? '' }}</div></x-filament-tables::cell>
-                                <x-filament-tables::cell class="text-right"><div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">{{ $account->balance->debitBalance }}</div></x-filament-tables::cell>
-                                <x-filament-tables::cell class="text-right"><div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">{{ $account->balance->creditBalance }}</div></x-filament-tables::cell>
-                                <x-filament-tables::cell class="text-right"><div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">{{ $account->balance->netMovement }}</div></x-filament-tables::cell>
-                                <x-filament-tables::cell class="text-right"><div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">{{ $account->balance->endingBalance ?? '' }}</div></x-filament-tables::cell>
-                            </x-filament-tables::row>
-                        @endforeach
-                        <x-filament-tables::row>
-                            <x-filament-tables::cell><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">Total {{ $accountCategoryName }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $accountCategory->summary->startingBalance ?? '' }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $accountCategory->summary->debitBalance }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $accountCategory->summary->creditBalance }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $accountCategory->summary->netMovement }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $accountCategory->summary->endingBalance ?? '' }}</div></x-filament-tables::cell>
-                        </x-filament-tables::row>
-                        <x-filament-tables::row>
-                            <x-filament-tables::cell colspan="6">
-                                <div class="px-3 py-2 invisible">Hidden Text</div>
-                            </x-filament-tables::cell>
-                        </x-filament-tables::row>
-                        </tbody>
-                    @endforeach
-                    <tfoot>
-                        <tr class="bg-gray-50 dark:bg-white/5">
-                            <x-filament-tables::cell><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">Total for all accounts</div></x-filament-tables::cell>
-                            <x-filament-tables::cell><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white"></div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $accountBalanceReport->overallTotal->debitBalance }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $accountBalanceReport->overallTotal->creditBalance }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white"></div></x-filament-tables::cell>
-                            <x-filament-tables::cell><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white"></div></x-filament-tables::cell>
-                        </tr>
-                    </tfoot>
-                </table>
+                <x-company.tables.reports.detailed-report :report="$accountBalanceReport" />
             </div>
             <div class="es-table__footer-ctn border-t border-gray-200"></div>
         </x-filament-tables::container>

resources/views/filament/company/pages/reports/trial-balance.blade.php

@@ -14,48 +14,7 @@
                 </form>
             </div>
             <div class="divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10">
-                <table class="w-full table-auto divide-y divide-gray-200 text-start dark:divide-white/5">
-                    <thead class="divide-y divide-gray-200 dark:divide-white/5">
-                        <tr class="bg-gray-50 dark:bg-white/5">
-                            <x-filament-tables::header-cell>Account</x-filament-tables::header-cell>
-                            <x-filament-tables::header-cell alignment="end">Debit</x-filament-tables::header-cell>
-                            <x-filament-tables::header-cell alignment="end">Credit</x-filament-tables::header-cell>
-                        </tr>
-                    </thead>
-                    @foreach($trialBalanceReport->categories as $accountCategoryName => $accountCategory)
-                        <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
-                        <tr class="bg-gray-50 dark:bg-white/5">
-                            <x-filament-tables::cell colspan="3">
-                                <div class="px-3 py-2 text-sm font-medium text-gray-950 dark:text-white">{{ $accountCategoryName }}</div>
-                            </x-filament-tables::cell>
-                        </tr>
-                        @foreach($accountCategory->accounts as $account)
-                            <x-filament-tables::row>
-                                <x-filament-tables::cell><div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">{{ $account->accountName }}</div></x-filament-tables::cell>
-                                <x-filament-tables::cell class="text-right"><div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">{{ $account->balance->debitBalance ?? '' }}</div></x-filament-tables::cell>
-                                <x-filament-tables::cell class="text-right"><div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">{{ $account->balance->creditBalance ?? '' }}</div></x-filament-tables::cell>
-                            </x-filament-tables::row>
-                        @endforeach
-                        <x-filament-tables::row>
-                            <x-filament-tables::cell><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">Total {{ $accountCategoryName }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $accountCategory->summary->debitBalance }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $accountCategory->summary->creditBalance }}</div></x-filament-tables::cell>
-                        </x-filament-tables::row>
-                        <x-filament-tables::row>
-                            <x-filament-tables::cell colspan="3">
-                                <div class="px-3 py-2 invisible">Hidden Text</div>
-                            </x-filament-tables::cell>
-                        </x-filament-tables::row>
-                        </tbody>
-                    @endforeach
-                    <tfoot>
-                        <tr class="bg-gray-50 dark:bg-white/5">
-                            <x-filament-tables::cell><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">Total for all accounts</div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $trialBalanceReport->overallTotal->debitBalance }}</div></x-filament-tables::cell>
-                            <x-filament-tables::cell class="text-right"><div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">{{ $trialBalanceReport->overallTotal->creditBalance }}</div></x-filament-tables::cell>
-                        </tr>
-                    </tfoot>
-                </table>
+                <x-company.tables.reports.detailed-report :report="$trialBalanceReport" />
             </div>
             <div class="es-table__footer-ctn border-t border-gray-200"></div>
         </x-filament-tables::container>