wip

app/Contracts/ExportableReport.php

@@ -3,6 +3,7 @@
 namespace App\Contracts;
 
 use App\DTO\ReportCategoryDTO;
+use App\Support\Column;
 
 interface ExportableReport
 {
@@ -17,7 +18,12 @@ interface ExportableReport
 
     public function getOverallTotals(): array;
 
+    /**
+     * @return Column[]
+     */
     public function getColumns(): array;
 
     public function getPdfView(): string;
+
+    public function getAlignmentClass(string $columnName): string;
 }

app/Contracts/HasSummaryReport.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Contracts;
+
+use App\DTO\ReportCategoryDTO;
+use App\Support\Column;
+
+interface HasSummaryReport
+{
+    /**
+     * @return Column[]
+     */
+    public function getSummaryColumns(): array;
+
+    public function getSummaryHeaders(): array;
+
+    /**
+     * @return ReportCategoryDTO[]
+     */
+    public function getSummaryCategories(): array;
+
+    public function getSummaryOverallTotals(): array;
+}

app/Services/ExportService.php

@@ -4,10 +4,13 @@ namespace App\Services;
 
 use App\Contracts\ExportableReport;
 use App\Models\Company;
-use App\Support\Column;
 use Barryvdh\Snappy\Facades\SnappyPdf;
 use Carbon\Exceptions\InvalidFormatException;
 use Illuminate\Support\Carbon;
+use League\Csv\Bom;
+use League\Csv\CannotInsertRecord;
+use League\Csv\Exception;
+use League\Csv\Writer;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class ExportService
@@ -33,7 +36,8 @@ class ExportService
         ];
 
         $callback = function () use ($startDate, $endDate, $report, $company) {
-            $file = fopen('php://output', 'wb');
+            $csv = Writer::createFromStream(fopen('php://output', 'wb'));
+            $csv->setOutputBOM(Bom::Utf8);
 
             if ($startDate && $endDate) {
                 $defaultStartDateFormat = Carbon::parse($startDate)->toDefaultDateFormat();
@@ -43,61 +47,34 @@ class ExportService
                 $dateLabel = 'As of ' . Carbon::parse($endDate)->toDefaultDateFormat();
             }
 
-            fputcsv($file, [$report->getTitle()]);
-            fputcsv($file, [$company->name]);
-            fputcsv($file, [$dateLabel]);
-            fputcsv($file, []);
+            $csv->insertOne([$report->getTitle()]);
+            $csv->insertOne([$company->name]);
+            $csv->insertOne([$dateLabel]);
+            $csv->insertOne([]);
 
-            fputcsv($file, $report->getHeaders());
+            $csv->insertOne($report->getHeaders());
 
             foreach ($report->getCategories() as $category) {
-                if (isset($category->header[0]) && is_array($category->header[0])) {
-                    foreach ($category->header as $headerRow) {
-                        fputcsv($file, $headerRow);
-                    }
-                } else {
-                    fputcsv($file, $category->header);
-                }
+                $this->writeDataRowsToCsv($csv, $category->header, $category->data, $report->getColumns());
 
-                foreach ($category->data as $accountRow) {
-                    $row = [];
-                    $columns = $report->getColumns();
-
-                    /**
-                     * @var Column $column
-                     */
-                    foreach ($columns as $index => $column) {
-                        $cell = $accountRow[$index] ?? '';
-
-                        if ($column->isDate()) {
-                            try {
-                                $row[] = Carbon::parse($cell)->toDateString();
-                            } catch (InvalidFormatException) {
-                                $row[] = $cell;
-                            }
-                        } elseif (is_array($cell)) {
-                            // Handle array cells by extracting 'name' or 'description'
-                            $row[] = $cell['name'] ?? $cell['description'] ?? '';
-                        } else {
-                            $row[] = $cell;
-                        }
-                    }
+                foreach ($category->types ?? [] as $type) {
+                    $this->writeDataRowsToCsv($csv, $type->header, $type->data, $report->getColumns());
 
-                    fputcsv($file, $row);
+                    if (filled($type->summary)) {
+                        $csv->insertOne($type->summary);
+                    }
                 }
 
                 if (filled($category->summary)) {
-                    fputcsv($file, $category->summary);
+                    $csv->insertOne($category->summary);
                 }
 
-                fputcsv($file, []); // Empty row for spacing
+                $csv->insertOne([]);
             }
 
             if (filled($report->getOverallTotals())) {
-                fputcsv($file, $report->getOverallTotals());
+                $csv->insertOne($report->getOverallTotals());
             }
-
-            fclose($file);
         };
 
         return response()->streamDownload($callback, $filename, $headers);
@@ -129,4 +106,43 @@ class ExportService
             echo $pdf->inline();
         }, $filename);
     }
+
+    /**
+     * @throws CannotInsertRecord
+     * @throws Exception
+     */
+    protected function writeDataRowsToCsv(Writer $csv, array $header, array $data, array $columns): void
+    {
+        if (isset($header[0]) && is_array($header[0])) {
+            foreach ($header as $headerRow) {
+                $csv->insertOne($headerRow);
+            }
+        } else {
+            $csv->insertOne($header);
+        }
+
+        // Output data rows
+        foreach ($data as $rowData) {
+            $row = [];
+
+            foreach ($columns as $column) {
+                $columnName = $column->getName();
+                $cell = $rowData[$columnName] ?? '';
+
+                if ($column->isDate()) {
+                    try {
+                        $row[] = Carbon::parse($cell)->toDateString();
+                    } catch (InvalidFormatException) {
+                        $row[] = $cell;
+                    }
+                } elseif (is_array($cell)) {
+                    $row[] = $cell['name'] ?? $cell['description'] ?? '';
+                } else {
+                    $row[] = $cell;
+                }
+            }
+
+            $csv->insertOne($row);
+        }
+    }
 }

app/Transformers/AccountBalanceReportTransformer.php

@@ -4,7 +4,6 @@ namespace App\Transformers;
 
 use App\DTO\AccountDTO;
 use App\DTO\ReportCategoryDTO;
-use App\Support\Column;
 
 class AccountBalanceReportTransformer extends BaseReportTransformer
 {
@@ -13,11 +12,6 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
         return 'Account Balances';
     }
 
-    public function getHeaders(): array
-    {
-        return array_map(fn (Column $column) => $column->getLabel(), $this->getColumns());
-    }
-
     /**
      * @return ReportCategoryDTO[]
      */
@@ -26,22 +20,17 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
         $categories = [];
 
         foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
-            // Initialize header with empty strings
             $header = [];
 
-            foreach ($this->getColumns() as $index => $column) {
-                if ($column->getName() === 'account_name') {
-                    $header[$index] = $accountCategoryName;
-                } else {
-                    $header[$index] = '';
-                }
+            foreach ($this->getColumns() as $column) {
+                $header[$column->getName()] = $column->getName() === 'account_name' ? $accountCategoryName : '';
             }
 
             $data = array_map(function (AccountDTO $account) {
                 $row = [];
 
                 foreach ($this->getColumns() as $column) {
-                    $row[] = match ($column->getName()) {
+                    $row[$column->getName()] = match ($column->getName()) {
                         'account_code' => $account->accountCode,
                         'account_name' => [
                             'name' => $account->accountName,
@@ -64,7 +53,7 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
             $summary = [];
 
             foreach ($this->getColumns() as $column) {
-                $summary[] = match ($column->getName()) {
+                $summary[$column->getName()] = match ($column->getName()) {
                     'account_name' => 'Total ' . $accountCategoryName,
                     'starting_balance' => $accountCategory->summary->startingBalance ?? '',
                     'debit_balance' => $accountCategory->summary->debitBalance,
@@ -90,7 +79,7 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
         $totals = [];
 
         foreach ($this->getColumns() as $column) {
-            $totals[] = match ($column->getName()) {
+            $totals[$column->getName()] = match ($column->getName()) {
                 'account_name' => 'Total for all accounts',
                 'debit_balance' => $this->report->overallTotal->debitBalance,
                 'credit_balance' => $this->report->overallTotal->creditBalance,

app/Transformers/AccountTransactionReportTransformer.php

@@ -4,7 +4,6 @@ namespace App\Transformers;
 
 use App\DTO\AccountTransactionDTO;
 use App\DTO\ReportCategoryDTO;
-use App\Support\Column;
 
 class AccountTransactionReportTransformer extends BaseReportTransformer
 {
@@ -18,11 +17,6 @@ class AccountTransactionReportTransformer extends BaseReportTransformer
         return 'Account Transactions';
     }
 
-    public function getHeaders(): array
-    {
-        return array_map(fn (Column $column) => $column->getLabel(), $this->getColumns());
-    }
-
     /**
      * @return ReportCategoryDTO[]
      */
@@ -31,17 +25,12 @@ class AccountTransactionReportTransformer extends BaseReportTransformer
         $categories = [];
 
         foreach ($this->report->categories as $categoryData) {
-            // Initialize header with account and category information
-
-            $header = [
-                array_fill(0, count($this->getColumns()), ''),
-                array_fill(0, count($this->getColumns()), ''),
-            ];
+            $header = [];
 
-            foreach ($this->getColumns() as $index => $column) {
+            foreach ($this->getColumns() as $column) {
                 if ($column->getName() === 'date') {
-                    $header[0][$index] = $categoryData['category'];
-                    $header[1][$index] = $categoryData['under'];
+                    $header[0][$column->getName()] = $categoryData['category'];
+                    $header[1][$column->getName()] = $categoryData['under'];
                 }
             }
 
@@ -50,7 +39,7 @@ class AccountTransactionReportTransformer extends BaseReportTransformer
                 $row = [];
 
                 foreach ($this->getColumns() as $column) {
-                    $row[] = match ($column->getName()) {
+                    $row[$column->getName()] = match ($column->getName()) {
                         'date' => $transaction->date,
                         'description' => [
                             'id' => $transaction->id,

app/Transformers/BalanceSheetReportTransformer.php

@@ -4,26 +4,28 @@ namespace App\Transformers;
 
 use App\DTO\AccountDTO;
 use App\DTO\ReportCategoryDTO;
+use App\DTO\ReportDTO;
 use App\DTO\ReportTypeDTO;
-use App\Support\Column;
 use App\Utilities\Currency\CurrencyAccessor;
 
-class BalanceSheetReportTransformer extends BaseReportTransformer
+class BalanceSheetReportTransformer extends SummaryReportTransformer
 {
-    protected string $totalAssets = '$0.00';
+    protected string $totalAssets;
 
-    protected string $totalLiabilities = '$0.00';
+    protected string $totalLiabilities;
 
-    protected string $totalEquity = '$0.00';
+    protected string $totalEquity;
 
-    public function getTitle(): string
+    public function __construct(ReportDTO $report)
     {
-        return 'Balance Sheet';
+        parent::__construct($report);
+
+        $this->calculateTotals();
     }
 
-    public function getHeaders(): array
+    public function getTitle(): string
     {
-        return array_map(fn (Column $column) => $column->getLabel(), $this->getColumns());
+        return 'Balance Sheet';
     }
 
     public function calculateTotals(): void
@@ -44,18 +46,15 @@ class BalanceSheetReportTransformer extends BaseReportTransformer
         foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
             // Header for the main category
             $header = [];
-            foreach ($this->getColumns() as $index => $column) {
-                if ($column->getName() === 'account_name') {
-                    $header[$index] = $accountCategoryName;
-                } else {
-                    $header[$index] = '';
-                }
+
+            foreach ($this->getColumns() as $column) {
+                $header[$column->getName()] = $column->getName() === 'account_name' ? $accountCategoryName : '';
             }
 
             // Category-level summary
             $categorySummary = [];
             foreach ($this->getColumns() as $column) {
-                $categorySummary[] = match ($column->getName()) {
+                $categorySummary[$column->getName()] = match ($column->getName()) {
                     'account_name' => 'Total ' . $accountCategoryName,
                     'ending_balance' => $accountCategory->summary->endingBalance ?? '',
                     default => '',
@@ -65,8 +64,9 @@ class BalanceSheetReportTransformer extends BaseReportTransformer
             // Accounts directly under the main category
             $data = array_map(function (AccountDTO $account) {
                 $row = [];
+
                 foreach ($this->getColumns() as $column) {
-                    $row[] = match ($column->getName()) {
+                    $row[$column->getName()] = match ($column->getName()) {
                         'account_code' => $account->accountCode,
                         'account_name' => [
                             'name' => $account->accountName,
@@ -87,15 +87,16 @@ class BalanceSheetReportTransformer extends BaseReportTransformer
             foreach ($accountCategory->types as $typeName => $type) {
                 // Header for subcategory (type)
                 $typeHeader = [];
-                foreach ($this->getColumns() as $index => $column) {
-                    $typeHeader[$index] = $column->getName() === 'account_name' ? $typeName : '';
+                foreach ($this->getColumns() as $column) {
+                    $typeHeader[$column->getName()] = $column->getName() === 'account_name' ? $typeName : '';
                 }
 
                 // Account data for the subcategory
                 $typeData = array_map(function (AccountDTO $account) {
                     $row = [];
+
                     foreach ($this->getColumns() as $column) {
-                        $row[] = match ($column->getName()) {
+                        $row[$column->getName()] = match ($column->getName()) {
                             'account_code' => $account->accountCode,
                             'account_name' => [
                                 'name' => $account->accountName,
@@ -114,7 +115,7 @@ class BalanceSheetReportTransformer extends BaseReportTransformer
                 // Subcategory (type) summary
                 $typeSummary = [];
                 foreach ($this->getColumns() as $column) {
-                    $typeSummary[] = match ($column->getName()) {
+                    $typeSummary[$column->getName()] = match ($column->getName()) {
                         'account_name' => 'Total ' . $typeName,
                         'ending_balance' => $type->summary->endingBalance ?? '',
                         default => '',
@@ -145,21 +146,18 @@ class BalanceSheetReportTransformer extends BaseReportTransformer
     {
         $summaryCategories = [];
 
-        $columns = [
-            'account_name',
-            'ending_balance',
-        ];
+        $columns = $this->getSummaryColumns();
 
         foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
             $categoryHeader = [];
 
-            foreach ($columns as $index => $column) {
-                $categoryHeader[$index] = $column === 'account_name' ? $accountCategoryName : '';
+            foreach ($columns as $column) {
+                $categoryHeader[$column->getName()] = $column->getName() === 'account_name' ? $accountCategoryName : '';
             }
 
             $categorySummary = [];
             foreach ($columns as $column) {
-                $categorySummary[] = match ($column) {
+                $categorySummary[$column->getName()] = match ($column->getName()) {
                     'account_name' => 'Total ' . $accountCategoryName,
                     'ending_balance' => $accountCategory->summary->endingBalance ?? '',
                     default => '',
@@ -175,13 +173,13 @@ class BalanceSheetReportTransformer extends BaseReportTransformer
                 $typeEndingBalance = 0;
 
                 foreach ($columns as $column) {
-                    $typeSummary[] = match ($column) {
+                    $typeSummary[$column->getName()] = match ($column->getName()) {
                         'account_name' => 'Total ' . $typeName,
                         'ending_balance' => $type->summary->endingBalance ?? '',
                         default => '',
                     };
 
-                    if ($column === 'ending_balance') {
+                    if ($column->getName() === 'ending_balance') {
                         $typeEndingBalance = $type->summary->endingBalance ?? 0;
                     }
                 }
@@ -207,7 +205,7 @@ class BalanceSheetReportTransformer extends BaseReportTransformer
                 // Add "Total Other Equity" as a new "type"
                 $otherEquitySummary = [];
                 foreach ($columns as $column) {
-                    $otherEquitySummary[] = match ($column) {
+                    $otherEquitySummary[$column->getName()] = match ($column->getName()) {
                         'account_name' => 'Total Other Equity',
                         'ending_balance' => $totalOtherEquity,
                         default => '',
@@ -238,10 +236,13 @@ class BalanceSheetReportTransformer extends BaseReportTransformer
         return [];
     }
 
-    public function getSummary(): array
+    public function getSummaryOverallTotals(): array
     {
-        $this->calculateTotals();
+        return [];
+    }
 
+    public function getSummary(): array
+    {
         return [
             [
                 'label' => 'Total Assets',

app/Transformers/BaseReportTransformer.php

@@ -4,6 +4,7 @@ namespace App\Transformers;
 
 use App\Contracts\ExportableReport;
 use App\DTO\ReportDTO;
+use App\Support\Column;
 use Filament\Support\Enums\Alignment;
 
 abstract class BaseReportTransformer implements ExportableReport
@@ -15,9 +16,27 @@ abstract class BaseReportTransformer implements ExportableReport
         $this->report = $report;
     }
 
+    /**
+     * @return Column[]
+     */
     public function getColumns(): array
     {
-        return $this->report->fields;
+        return once(function (): array {
+            return $this->report->fields;
+        });
+    }
+
+    public function getHeaders(): array
+    {
+        return once(function (): array {
+            $headers = [];
+
+            foreach ($this->getColumns() as $column) {
+                $headers[$column->getName()] = $column->getLabel();
+            }
+
+            return $headers;
+        });
     }
 
     public function getPdfView(): string
@@ -40,18 +59,21 @@ abstract class BaseReportTransformer implements ExportableReport
         return 'left';
     }
 
-    public function getAlignmentClass(int $index): string
+    public function getAlignmentClass(string $columnName): string
     {
-        $column = $this->getColumns()[$index];
+        return once(function () use ($columnName): string {
+            /** @var Column|null $column */
+            $column = collect($this->getColumns())->first(fn (Column $column) => $column->getName() === $columnName);
 
-        if ($column->getAlignment() === Alignment::Right) {
-            return 'text-right';
-        }
+            if ($column?->getAlignment() === Alignment::Right) {
+                return 'text-right';
+            }
 
-        if ($column->getAlignment() === Alignment::Center) {
-            return 'text-center';
-        }
+            if ($column?->getAlignment() === Alignment::Center) {
+                return 'text-center';
+            }
 
-        return 'text-left';
+            return 'text-left';
+        });
     }
 }

app/Transformers/IncomeStatementReportTransformer.php

@@ -4,25 +4,27 @@ namespace App\Transformers;
 
 use App\DTO\AccountDTO;
 use App\DTO\ReportCategoryDTO;
-use App\Support\Column;
+use App\DTO\ReportDTO;
 use App\Utilities\Currency\CurrencyAccessor;
 
-class IncomeStatementReportTransformer extends BaseReportTransformer
+class IncomeStatementReportTransformer extends SummaryReportTransformer
 {
-    protected string $totalRevenue = '0';
+    protected string $totalRevenue;
 
-    protected string $totalCogs = '0';
+    protected string $totalCogs;
 
-    protected string $totalExpenses = '0';
+    protected string $totalExpenses;
 
-    public function getTitle(): string
+    public function __construct(ReportDTO $report)
     {
-        return 'Income Statement';
+        parent::__construct($report);
+
+        $this->calculateTotals();
     }
 
-    public function getHeaders(): array
+    public function getTitle(): string
     {
-        return array_map(fn (Column $column) => $column->getLabel(), $this->getColumns());
+        return 'Income Statement';
     }
 
     public function calculateTotals(): void
@@ -41,22 +43,17 @@ class IncomeStatementReportTransformer extends BaseReportTransformer
         $categories = [];
 
         foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
-            // Initialize header with empty strings
             $header = [];
 
-            foreach ($this->getColumns() as $index => $column) {
-                if ($column->getName() === 'account_name') {
-                    $header[$index] = $accountCategoryName;
-                } else {
-                    $header[$index] = '';
-                }
+            foreach ($this->getColumns() as $column) {
+                $header[$column->getName()] = $column->getName() === 'account_name' ? $accountCategoryName : '';
             }
 
             $data = array_map(function (AccountDTO $account) {
                 $row = [];
 
                 foreach ($this->getColumns() as $column) {
-                    $row[] = match ($column->getName()) {
+                    $row[$column->getName()] = match ($column->getName()) {
                         'account_code' => $account->accountCode,
                         'account_name' => [
                             'name' => $account->accountName,
@@ -75,7 +72,7 @@ class IncomeStatementReportTransformer extends BaseReportTransformer
             $summary = [];
 
             foreach ($this->getColumns() as $column) {
-                $summary[] = match ($column->getName()) {
+                $summary[$column->getName()] = match ($column->getName()) {
                     'account_name' => 'Total ' . $accountCategoryName,
                     'net_movement' => $accountCategory->summary->netMovement ?? '',
                     default => '',
@@ -96,23 +93,20 @@ class IncomeStatementReportTransformer extends BaseReportTransformer
     {
         $summaryCategories = [];
 
-        $columns = [
-            'account_name',
-            'net_movement',
-        ];
+        $columns = $this->getSummaryColumns();
 
         foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
             // Header for the main category
             $categoryHeader = [];
 
-            foreach ($columns as $index => $column) {
-                $categoryHeader[$index] = $column === 'account_name' ? $accountCategoryName : '';
+            foreach ($columns as $column) {
+                $categoryHeader[$column->getName()] = $column->getName() === 'account_name' ? $accountCategoryName : '';
             }
 
             // Category-level summary
             $categorySummary = [];
             foreach ($columns as $column) {
-                $categorySummary[] = match ($column) {
+                $categorySummary[$column->getName()] = match ($column->getName()) {
                     'account_name' => $accountCategoryName,
                     'net_movement' => $accountCategory->summary->netMovement ?? '',
                     default => '',
@@ -133,14 +127,9 @@ class IncomeStatementReportTransformer extends BaseReportTransformer
 
     public function getGrossProfit(): array
     {
-        $this->calculateTotals();
-
         $grossProfit = [];
 
-        $columns = [
-            'account_name',
-            'net_movement',
-        ];
+        $columns = $this->getSummaryColumns();
 
         $revenue = money($this->totalRevenue, CurrencyAccessor::getDefaultCurrency())->getAmount();
         $cogs = money($this->totalCogs, CurrencyAccessor::getDefaultCurrency())->getAmount();
@@ -149,7 +138,7 @@ class IncomeStatementReportTransformer extends BaseReportTransformer
         $grossProfitFormatted = money($grossProfitAmount, CurrencyAccessor::getDefaultCurrency(), true)->format();
 
         foreach ($columns as $column) {
-            $grossProfit[] = match ($column) {
+            $grossProfit[$column->getName()] = match ($column->getName()) {
                 'account_name' => 'Gross Profit',
                 'net_movement' => $grossProfitFormatted,
                 default => '',
@@ -159,16 +148,12 @@ class IncomeStatementReportTransformer extends BaseReportTransformer
         return $grossProfit;
     }
 
-    public function getSummaryTotals(): array
+    public function getOverallTotals(): array
     {
         $totals = [];
-        $columns = [
-            'account_name',
-            'net_movement',
-        ];
 
-        foreach ($columns as $column) {
-            $totals[] = match ($column) {
+        foreach ($this->getColumns() as $column) {
+            $totals[$column->getName()] = match ($column->getName()) {
                 'account_name' => 'Net Earnings',
                 'net_movement' => $this->report->overallTotal->netMovement ?? '',
                 default => '',
@@ -178,12 +163,13 @@ class IncomeStatementReportTransformer extends BaseReportTransformer
         return $totals;
     }
 
-    public function getOverallTotals(): array
+    public function getSummaryOverallTotals(): array
     {
         $totals = [];
+        $columns = $this->getSummaryColumns();
 
-        foreach ($this->getColumns() as $column) {
-            $totals[] = match ($column->getName()) {
+        foreach ($columns as $column) {
+            $totals[$column->getName()] = match ($column->getName()) {
                 'account_name' => 'Net Earnings',
                 'net_movement' => $this->report->overallTotal->netMovement ?? '',
                 default => '',
@@ -195,8 +181,6 @@ class IncomeStatementReportTransformer extends BaseReportTransformer
 
     public function getSummary(): array
     {
-        $this->calculateTotals();
-
         return [
             [
                 'label' => 'Revenue',

app/Transformers/SummaryReportTransformer.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Transformers;
+
+use App\Contracts\HasSummaryReport;
+use App\Support\Column;
+
+abstract class SummaryReportTransformer extends BaseReportTransformer implements HasSummaryReport
+{
+    /**
+     * @return Column[]
+     */
+    public function getSummaryColumns(): array
+    {
+        return once(function (): array {
+            return collect($this->getColumns())
+                ->reject(fn (Column $column) => $column->getName() === 'account_code')
+                ->toArray();
+        });
+    }
+
+    public function getSummaryHeaders(): array
+    {
+        return once(function (): array {
+            $headers = [];
+
+            foreach ($this->getSummaryColumns() as $column) {
+                $headers[$column->getName()] = $column->getLabel();
+            }
+
+            return $headers;
+        });
+    }
+}

app/Transformers/TrialBalanceReportTransformer.php

@@ -4,7 +4,6 @@ namespace App\Transformers;
 
 use App\DTO\AccountDTO;
 use App\DTO\ReportCategoryDTO;
-use App\Support\Column;
 
 class TrialBalanceReportTransformer extends BaseReportTransformer
 {
@@ -16,11 +15,6 @@ class TrialBalanceReportTransformer extends BaseReportTransformer
         };
     }
 
-    public function getHeaders(): array
-    {
-        return array_map(fn (Column $column) => $column->getLabel(), $this->getColumns());
-    }
-
     /**
      * @return ReportCategoryDTO[]
      */
@@ -32,19 +26,15 @@ class TrialBalanceReportTransformer extends BaseReportTransformer
             // Initialize header with empty strings
             $header = [];
 
-            foreach ($this->getColumns() as $index => $column) {
-                if ($column->getName() === 'account_name') {
-                    $header[$index] = $accountCategoryName;
-                } else {
-                    $header[$index] = '';
-                }
+            foreach ($this->getColumns() as $column) {
+                $header[$column->getName()] = $column->getName() === 'account_name' ? $accountCategoryName : '';
             }
 
             $data = array_map(function (AccountDTO $account) {
                 $row = [];
 
                 foreach ($this->getColumns() as $column) {
-                    $row[] = match ($column->getName()) {
+                    $row[$column->getName()] = match ($column->getName()) {
                         'account_code' => $account->accountCode,
                         'account_name' => [
                             'name' => $account->accountName,
@@ -64,7 +54,7 @@ class TrialBalanceReportTransformer extends BaseReportTransformer
             $summary = [];
 
             foreach ($this->getColumns() as $column) {
-                $summary[] = match ($column->getName()) {
+                $summary[$column->getName()] = match ($column->getName()) {
                     'account_name' => 'Total ' . $accountCategoryName,
                     'debit_balance' => $accountCategory->summary->debitBalance,
                     'credit_balance' => $accountCategory->summary->creditBalance,
@@ -87,7 +77,7 @@ class TrialBalanceReportTransformer extends BaseReportTransformer
         $totals = [];
 
         foreach ($this->getColumns() as $column) {
-            $totals[] = match ($column->getName()) {
+            $totals[$column->getName()] = match ($column->getName()) {
                 'account_name' => 'Total for all accounts',
                 'debit_balance' => $this->report->overallTotal->debitBalance,
                 'credit_balance' => $this->report->overallTotal->creditBalance,

composer.lock

@@ -9925,16 +9925,16 @@
         },
         {
             "name": "pestphp/pest",
-            "version": "v3.4.1",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pestphp/pest.git",
-                "reference": "67f217852ce153134fbea8857487a3829904c086"
+                "reference": "2903a7e62100171d5faf4e50cda755ffeadedc57"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pestphp/pest/zipball/67f217852ce153134fbea8857487a3829904c086",
-                "reference": "67f217852ce153134fbea8857487a3829904c086",
+                "url": "https://api.github.com/repos/pestphp/pest/zipball/2903a7e62100171d5faf4e50cda755ffeadedc57",
+                "reference": "2903a7e62100171d5faf4e50cda755ffeadedc57",
                 "shasum": ""
             },
             "require": {
@@ -9945,11 +9945,11 @@
                 "pestphp/pest-plugin-arch": "^3.0.0",
                 "pestphp/pest-plugin-mutate": "^3.0.5",
                 "php": "^8.2.0",
-                "phpunit/phpunit": "^11.4.1"
+                "phpunit/phpunit": "^11.4.2"
             },
             "conflict": {
                 "filp/whoops": "<2.16.0",
-                "phpunit/phpunit": ">11.4.1",
+                "phpunit/phpunit": ">11.4.2",
                 "sebastian/exporter": "<6.0.0",
                 "webmozart/assert": "<1.11.0"
             },
@@ -10021,7 +10021,7 @@
             ],
             "support": {
                 "issues": "https://github.com/pestphp/pest/issues",
-                "source": "https://github.com/pestphp/pest/tree/v3.4.1"
+                "source": "https://github.com/pestphp/pest/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -10033,7 +10033,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-10-15T16:17:09+00:00"
+            "time": "2024-10-20T11:47:25+00:00"
         },
         {
             "name": "pestphp/pest-plugin",
@@ -11164,16 +11164,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.4.1",
+            "version": "11.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "7875627f15f4da7e7f0823d1f323f7295a77334e"
+                "reference": "1863643c3f04ad03dcb9c6996c294784cdda4805"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7875627f15f4da7e7f0823d1f323f7295a77334e",
-                "reference": "7875627f15f4da7e7f0823d1f323f7295a77334e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1863643c3f04ad03dcb9c6996c294784cdda4805",
+                "reference": "1863643c3f04ad03dcb9c6996c294784cdda4805",
                 "shasum": ""
             },
             "require": {
@@ -11187,21 +11187,21 @@
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.2",
-                "phpunit/php-code-coverage": "^11.0.6",
+                "phpunit/php-code-coverage": "^11.0.7",
                 "phpunit/php-file-iterator": "^5.1.0",
                 "phpunit/php-invoker": "^5.0.1",
                 "phpunit/php-text-template": "^4.0.1",
                 "phpunit/php-timer": "^7.0.1",
                 "sebastian/cli-parser": "^3.0.2",
                 "sebastian/code-unit": "^3.0.1",
-                "sebastian/comparator": "^6.1.0",
+                "sebastian/comparator": "^6.1.1",
                 "sebastian/diff": "^6.0.2",
                 "sebastian/environment": "^7.2.0",
                 "sebastian/exporter": "^6.1.3",
                 "sebastian/global-state": "^7.0.2",
                 "sebastian/object-enumerator": "^6.0.1",
                 "sebastian/type": "^5.1.0",
-                "sebastian/version": "^5.0.1"
+                "sebastian/version": "^5.0.2"
             },
             "suggest": {
                 "ext-soap": "To be able to generate mocks based on WSDL files"
@@ -11244,7 +11244,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.4.1"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.4.2"
             },
             "funding": [
                 {
@@ -11260,7 +11260,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-10-08T15:38:37+00:00"
+            "time": "2024-10-19T13:05:19+00:00"
         },
         {
             "name": "rector/rector",

resources/css/filament/company/theme.css

@@ -107,11 +107,7 @@
 }
 
 .es-table__header-ctn, .es-table__footer-ctn {
-    @apply divide-y divide-gray-200 dark:divide-white/10 h-12;
-}
-
-.es-table__row {
-    @apply [@media(hover:hover)]:transition [@media(hover:hover)]:duration-75 hover:bg-gray-50 dark:hover:bg-white/5;
+    @apply divide-y divide-gray-200 dark:divide-white/10 min-h-12;
 }
 
 .es-table .es-table__rowgroup td:first-child {

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

@@ -4,11 +4,11 @@
         <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
         <!-- Category Header -->
         <tr class="bg-gray-50 dark:bg-white/5">
-            <x-filament-tables::cell colspan="{{ count($report->getHeaders()) }}" class="text-left">
+            <x-filament-tables::cell tag="th" colspan="{{ count($report->getHeaders()) }}" class="text-left">
                 <div class="px-3 py-3.5">
                     @foreach ($category->header as $headerRow)
                         <div
-                            class="text-sm {{ $loop->first ? 'font-semibold text-gray-950 dark:text-white' : 'text-gray-500 dark:text-white/50' }}">
+                            class="text-sm {{ $loop->first ? 'font-semibold text-gray-950 dark:text-white' : 'font-normal text-gray-500 dark:text-white/50' }}">
                             @foreach ($headerRow as $headerValue)
                                 @if (!empty($headerValue))
                                     {{ $headerValue }}

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

@@ -1,52 +1,28 @@
 <table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
-    <thead class="divide-y divide-gray-200 dark:divide-white/5">
-    <tr class="bg-gray-50 dark:bg-white/5">
-        <th class="px-3 py-3.5 sm:first-of-type:ps-6 sm:last-of-type:pe-6 text-left">
-            <span class="text-sm font-semibold leading-6 text-gray-950 dark:text-white">
-                Accounts
-            </span>
-        </th>
-        <th class="px-3 py-3.5 sm:first-of-type:ps-6 sm:last-of-type:pe-6 text-right">
-            <span class="text-sm font-semibold leading-6 text-gray-950 dark:text-white">
-                Amount
-            </span>
-        </th>
-    </tr>
-    </thead>
+    <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">
-        <tr class="bg-gray-50 dark:bg-white/5">
-            @foreach($accountCategory->header as $accountCategoryHeaderIndex => $accountCategoryHeaderCell)
-                <th class="px-3 py-3.5 sm:first-of-type:ps-6 sm:last-of-type:pe-6 {{ $accountCategoryHeaderIndex === 0 ? 'text-left' : 'text-right' }}">
-                    <span class="text-sm font-semibold leading-6 text-gray-950 dark:text-white">
-                        {{ $accountCategoryHeaderCell }}
-                    </span>
-                </th>
-            @endforeach
-        </tr>
+        <x-company.tables.category-header :category-headers="$accountCategory->header"
+                                          :alignment-class="[$report, 'getAlignmentClass']"/>
         @foreach($accountCategory->types as $accountType)
             <tr>
                 @foreach($accountType->summary as $accountTypeSummaryIndex => $accountTypeSummaryCell)
-                    <x-filament-tables::cell
-                        class="{{ $accountTypeSummaryIndex === 0 ? 'text-left' : 'text-right' }} ps-8">
-                        <div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">
-                            {{ $accountTypeSummaryCell }}
-                        </div>
-                    </x-filament-tables::cell>
+                    <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountTypeSummaryIndex)">
+                        {{ $accountTypeSummaryCell }}
+                    </x-company.tables.cell>
                 @endforeach
             </tr>
         @endforeach
         <tr>
             @foreach($accountCategory->summary as $accountCategorySummaryIndex => $accountCategorySummaryCell)
-                <x-filament-tables::cell class="{{ $accountCategorySummaryIndex === 0 ? 'text-left' : 'text-right' }}">
-                    <div class="px-3 py-4 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
-                        {{ $accountCategorySummaryCell }}
-                    </div>
-                </x-filament-tables::cell>
+                <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountCategorySummaryIndex)"
+                                       bold="true">
+                    {{ $accountCategorySummaryCell }}
+                </x-company.tables.cell>
             @endforeach
         </tr>
         <tr>
-            <td colspan="2">
+            <td colspan="{{ count($report->getSummaryHeaders()) }}">
                 <div class="min-h-12"></div>
             </td>
         </tr>

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

@@ -1,34 +1,19 @@
 <table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
-    <thead class="divide-y divide-gray-200 dark:divide-white/5">
-    <tr class="bg-gray-50 dark:bg-white/5">
-        <th class="px-3 py-3.5 sm:first-of-type:ps-6 sm:last-of-type:pe-6 text-left">
-            <span class="text-sm font-semibold leading-6 text-gray-950 dark:text-white">
-                Accounts
-            </span>
-        </th>
-        <th class="px-3 py-3.5 sm:first-of-type:ps-6 sm:last-of-type:pe-6 text-right">
-            <span class="text-sm font-semibold leading-6 text-gray-950 dark:text-white">
-                Amount
-            </span>
-        </th>
-    </tr>
-    </thead>
+    <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">
         <tr>
             @foreach($accountCategory->summary as $accountCategorySummaryIndex => $accountCategorySummaryCell)
-                <x-filament-tables::cell class="{{ $accountCategorySummaryIndex === 0 ? 'text-left' : 'text-right' }}">
-                    <div class="px-3 py-4 text-sm leading-6 font-normal text-gray-950 dark:text-white">
-                        {{ $accountCategorySummaryCell }}
-                    </div>
-                </x-filament-tables::cell>
+                <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountCategorySummaryIndex)">
+                    {{ $accountCategorySummaryCell }}
+                </x-company.tables.cell>
             @endforeach
         </tr>
 
-        @if($accountCategory->header[0] === 'Cost of Goods Sold')
+        @if($accountCategory->header['account_name'] === 'Cost of Goods Sold')
             <tr class="bg-gray-50 dark:bg-white/5">
                 @foreach($report->getGrossProfit() as $grossProfitIndex => $grossProfitCell)
-                    <x-filament-tables::cell class="{{ $grossProfitIndex === 0 ? 'text-left' : 'text-right' }}">
+                    <x-filament-tables::cell class="{{ $report->getAlignmentClass($grossProfitIndex) }}">
                         <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
                             {{ $grossProfitCell }}
                         </div>
@@ -38,17 +23,6 @@
         @endif
         </tbody>
     @endforeach
-    @if(! empty($report->getSummaryTotals()))
-        <tfoot>
-        <tr class="bg-gray-50 dark:bg-white/5">
-            @foreach($report->getSummaryTotals() as $index => $total)
-                <x-filament-tables::cell class="{{ $index === 0 ? 'text-left' : 'text-right' }}">
-                    <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>
-    @endif
+    <x-company.tables.footer :totals="$report->getSummaryOverallTotals()"
+                             :alignment-class="[$report, 'getAlignmentClass']"/>
 </table>