refactor Export logic and resource redirect url

app/Contracts/ExportableReport.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Contracts;
+
+interface ExportableReport
+{
+    public function getTitle(): string;
+
+    public function getHeaders(): array;
+
+    public function getData(): array;
+
+    public function getOverallTotals(): array;
+}

app/Filament/Company/Clusters/Settings/Resources/CurrencyResource/Pages/CreateCurrency.php

@@ -18,7 +18,7 @@ class CreateCurrency extends CreateRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeCreate(array $data): array

app/Filament/Company/Clusters/Settings/Resources/CurrencyResource/Pages/EditCurrency.php

@@ -24,9 +24,9 @@ class EditCurrency extends EditRecord
         ];
     }
 
-    protected function getRedirectUrl(): ?string
+    protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeSave(array $data): array

app/Filament/Company/Clusters/Settings/Resources/DiscountResource/Pages/CreateDiscount.php

@@ -18,7 +18,7 @@ class CreateDiscount extends CreateRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeCreate(array $data): array

app/Filament/Company/Clusters/Settings/Resources/DiscountResource/Pages/EditDiscount.php

@@ -25,7 +25,7 @@ class EditDiscount extends EditRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeSave(array $data): array

app/Filament/Company/Clusters/Settings/Resources/TaxResource/Pages/CreateTax.php

@@ -18,7 +18,7 @@ class CreateTax extends CreateRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeCreate(array $data): array

app/Filament/Company/Clusters/Settings/Resources/TaxResource/Pages/EditTax.php

@@ -25,7 +25,7 @@ class EditTax extends EditRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeSave(array $data): array

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

@@ -3,14 +3,11 @@
 namespace App\Filament\Company\Pages\Reports;
 
 use App\DTO\ReportDTO;
-use App\Services\AccountBalancesExportService;
+use App\Services\ExportService;
 use App\Services\ReportService;
-use Barryvdh\DomPDF\Facade\Pdf;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
-use Filament\Support\Enums\IconPosition;
-use Filament\Support\Enums\IconSize;
-use Illuminate\Support\Carbon;
+use App\Transformers\AccountBalanceReportTransformer;
+use Filament\Forms\Components\Split;
+use Filament\Forms\Form;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class AccountBalances extends BaseReportPage
@@ -25,12 +22,12 @@ class AccountBalances extends BaseReportPage
 
     public ReportDTO $accountBalanceReport;
 
-    protected AccountBalancesExportService $accountBalancesExportService;
+    protected ExportService $exportService;
 
-    public function boot(ReportService $reportService, AccountBalancesExportService $accountBalancesExportService): void
+    public function boot(ReportService $reportService, ExportService $exportService): void
     {
         $this->reportService = $reportService;
-        $this->accountBalancesExportService = $accountBalancesExportService;
+        $this->exportService = $exportService;
     }
 
     public function loadReportData(): void
@@ -38,43 +35,29 @@ class AccountBalances extends BaseReportPage
         $this->accountBalanceReport = $this->reportService->buildAccountBalanceReport($this->startDate, $this->endDate);
     }
 
-    protected function getHeaderActions(): array
+    public function form(Form $form): Form
     {
-        return [
-            ActionGroup::make([
-                Action::make('exportCSV')
-                    ->label('CSV')
-                    ->action(fn () => $this->exportCSV()),
-                Action::make('exportPDF')
-                    ->label('PDF')
-                    ->action(fn () => $this->exportPDF()),
-            ])
-                ->label('Export')
-                ->button()
-                ->outlined()
-                ->dropdownWidth('max-w-[7rem]')
-                ->dropdownPlacement('bottom-end')
-                ->icon('heroicon-c-chevron-down')
-                ->iconSize(IconSize::Small)
-                ->iconPosition(IconPosition::After),
-        ];
+        return $form
+            ->schema([
+                Split::make([
+                    $this->getDateRangeFormComponent(),
+                    $this->getStartDateFormComponent(),
+                    $this->getEndDateFormComponent(),
+                ])->live(),
+            ]);
     }
 
     public function exportCSV(): StreamedResponse
     {
-        return $this->accountBalancesExportService->exportToCsv($this->company, $this->accountBalanceReport, $this->startDate, $this->endDate);
+        $transformer = new AccountBalanceReportTransformer($this->accountBalanceReport);
+
+        return $this->exportService->exportToCsv($this->company, $transformer, $this->startDate, $this->endDate);
     }
 
     public function exportPDF(): StreamedResponse
     {
-        $pdf = Pdf::loadView('components.company.reports.account-balances', [
-            'accountBalanceReport' => $this->accountBalanceReport,
-            'startDate' => Carbon::parse($this->startDate)->format('M d, Y'),
-            'endDate' => Carbon::parse($this->endDate)->format('M d, Y'),
-        ])->setPaper('a4');
+        $transformer = new AccountBalanceReportTransformer($this->accountBalanceReport);
 
-        return response()->streamDownload(function () use ($pdf) {
-            echo $pdf->stream();
-        }, 'account-balances.pdf');
+        return $this->exportService->exportToPdf($this->company, $transformer, $this->startDate, $this->endDate);
     }
 }

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

@@ -4,12 +4,16 @@ namespace App\Filament\Company\Pages\Reports;
 
 use App\Filament\Forms\Components\DateRangeSelect;
 use App\Models\Company;
+use Filament\Actions\Action;
+use Filament\Actions\ActionGroup;
+use Filament\Forms\Components\Component;
 use Filament\Forms\Components\DatePicker;
-use Filament\Forms\Components\Split;
-use Filament\Forms\Form;
 use Filament\Forms\Set;
 use Filament\Pages\Page;
+use Filament\Support\Enums\IconPosition;
+use Filament\Support\Enums\IconSize;
 use Illuminate\Support\Carbon;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 abstract class BaseReportPage extends Page
 {
@@ -36,42 +40,71 @@ abstract class BaseReportPage extends Page
         $this->loadReportData();
     }
 
-    abstract protected function loadReportData(): void;
+    abstract public function loadReportData(): void;
+
+    abstract public function exportCSV(): StreamedResponse;
+
+    abstract public function exportPDF(): StreamedResponse;
 
     public function getDefaultDateRange(): string
     {
         return 'FY-' . now()->year;
     }
 
-    public function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                Split::make([
-                    DateRangeSelect::make('dateRange')
-                        ->label('Date Range')
-                        ->selectablePlaceholder(false)
-                        ->startDateField('startDate')
-                        ->endDateField('endDate'),
-                    DatePicker::make('startDate')
-                        ->label('Start Date')
-                        ->displayFormat('Y-m-d')
-                        ->afterStateUpdated(static function (Set $set) {
-                            $set('dateRange', 'Custom');
-                        }),
-                    DatePicker::make('endDate')
-                        ->label('End Date')
-                        ->displayFormat('Y-m-d')
-                        ->afterStateUpdated(static function (Set $set) {
-                            $set('dateRange', 'Custom');
-                        }),
-                ])->live(),
-            ]);
-    }
-
     public function setDateRange(Carbon $start, Carbon $end): void
     {
         $this->startDate = $start->format('Y-m-d');
         $this->endDate = $end->isFuture() ? now()->format('Y-m-d') : $end->format('Y-m-d');
     }
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            ActionGroup::make([
+                Action::make('exportCSV')
+                    ->label('CSV')
+                    ->action(fn () => $this->exportCSV()),
+                Action::make('exportPDF')
+                    ->label('PDF')
+                    ->action(fn () => $this->exportPDF()),
+            ])
+                ->label('Export')
+                ->button()
+                ->outlined()
+                ->dropdownWidth('max-w-[7rem]')
+                ->dropdownPlacement('bottom-end')
+                ->icon('heroicon-c-chevron-down')
+                ->iconSize(IconSize::Small)
+                ->iconPosition(IconPosition::After),
+        ];
+    }
+
+    protected function getDateRangeFormComponent(): Component
+    {
+        return DateRangeSelect::make('dateRange')
+            ->label('Date Range')
+            ->selectablePlaceholder(false)
+            ->startDateField('startDate')
+            ->endDateField('endDate');
+    }
+
+    protected function getStartDateFormComponent(): Component
+    {
+        return DatePicker::make('startDate')
+            ->label('Start Date')
+            ->displayFormat('Y-m-d')
+            ->afterStateUpdated(static function (Set $set) {
+                $set('dateRange', 'Custom');
+            });
+    }
+
+    protected function getEndDateFormComponent(): Component
+    {
+        return DatePicker::make('endDate')
+            ->label('End Date')
+            ->displayFormat('Y-m-d')
+            ->afterStateUpdated(static function (Set $set) {
+                $set('dateRange', 'Custom');
+            });
+    }
 }

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

@@ -3,7 +3,12 @@
 namespace App\Filament\Company\Pages\Reports;
 
 use App\DTO\ReportDTO;
+use App\Services\ExportService;
 use App\Services\ReportService;
+use App\Transformers\TrialBalanceReportTransformer;
+use Filament\Forms\Components\Split;
+use Filament\Forms\Form;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class TrialBalance extends BaseReportPage
 {
@@ -17,18 +22,42 @@ class TrialBalance extends BaseReportPage
 
     public ReportDTO $trialBalanceReport;
 
-    public function boot(ReportService $reportService): void
+    protected ExportService $exportService;
+
+    public function boot(ReportService $reportService, ExportService $exportService): void
     {
         $this->reportService = $reportService;
+        $this->exportService = $exportService;
     }
 
-    public function getDefaultDateRange(): string
+    public function loadReportData(): void
     {
-        return 'FY-' . now()->year;
+        $this->trialBalanceReport = $this->reportService->buildTrialBalanceReport($this->startDate, $this->endDate);
     }
 
-    public function loadReportData(): void
+    public function form(Form $form): Form
     {
-        $this->trialBalanceReport = $this->reportService->buildTrialBalanceReport($this->startDate, $this->endDate);
+        return $form
+            ->schema([
+                Split::make([
+                    $this->getDateRangeFormComponent(),
+                    $this->getStartDateFormComponent(),
+                    $this->getEndDateFormComponent(),
+                ])->live(),
+            ]);
+    }
+
+    public function exportCSV(): StreamedResponse
+    {
+        $transformer = new TrialBalanceReportTransformer($this->trialBalanceReport);
+
+        return $this->exportService->exportToCsv($this->company, $transformer, $this->startDate, $this->endDate);
+    }
+
+    public function exportPDF(): StreamedResponse
+    {
+        $transformer = new TrialBalanceReportTransformer($this->trialBalanceReport);
+
+        return $this->exportService->exportToPdf($this->company, $transformer, $this->startDate, $this->endDate);
     }
 }

app/Filament/Company/Resources/Banking/AccountResource/Pages/CreateAccount.php

@@ -11,7 +11,7 @@ class CreateAccount extends CreateRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeCreate(array $data): array

app/Filament/Company/Resources/Banking/AccountResource/Pages/EditAccount.php

@@ -19,9 +19,9 @@ class EditAccount extends EditRecord
         ];
     }
 
-    protected function getRedirectUrl(): ?string
+    protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeSave(array $data): array

app/Filament/Company/Resources/Core/DepartmentResource/Pages/CreateDepartment.php

@@ -11,6 +11,6 @@ class CreateDepartment extends CreateRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 }

app/Filament/Company/Resources/Core/DepartmentResource/Pages/EditDepartment.php

@@ -17,8 +17,8 @@ class EditDepartment extends EditRecord
         ];
     }
 
-    protected function getRedirectUrl(): ?string
+    protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 }

app/Services/AccountBalancesExportService.php

@@ -1,76 +0,0 @@
-<?php
-
-namespace App\Services;
-
-use App\DTO\ReportDTO;
-use App\Models\Company;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-
-class AccountBalancesExportService
-{
-    public function exportToCsv(Company $company, ReportDTO $accountBalanceReport, string $startDate, string $endDate): StreamedResponse
-    {
-        // Construct the filename
-        $filename = $company->name . ' Account Balances ' . $startDate . ' to ' . $endDate . '.csv';
-
-        $headers = [
-            'Content-Type' => 'text/csv',
-            'Content-Disposition' => 'attachment; filename="' . $filename . '"',
-        ];
-
-        $callback = static function () use ($company, $startDate, $endDate, $accountBalanceReport) {
-            $file = fopen('php://output', 'wb');
-
-            fputcsv($file, ['Account Balances']);
-            fputcsv($file, [$company->name]);
-            fputcsv($file, ['Date Range: ' . $startDate . ' to ' . $endDate]);
-            fputcsv($file, []);
-
-            fputcsv($file, ['ACCOUNT CODE', 'ACCOUNT', 'STARTING BALANCE', 'DEBIT', 'CREDIT', 'NET MOVEMENT', 'ENDING BALANCE']);
-
-            foreach ($accountBalanceReport->categories as $accountCategoryName => $accountCategory) {
-                fputcsv($file, ['', $accountCategoryName]);
-
-                foreach ($accountCategory->accounts as $account) {
-                    fputcsv($file, [
-                        $account->accountCode,
-                        $account->accountName,
-                        $account->balance->startingBalance ?? '',
-                        $account->balance->debitBalance,
-                        $account->balance->creditBalance,
-                        $account->balance->netMovement,
-                        $account->balance->endingBalance ?? '',
-                    ]);
-                }
-
-                // Category Summary row
-                fputcsv($file, [
-                    '',
-                    'Total ' . $accountCategoryName,
-                    $accountCategory->summary->startingBalance ?? '',
-                    $accountCategory->summary->debitBalance,
-                    $accountCategory->summary->creditBalance,
-                    $accountCategory->summary->netMovement,
-                    $accountCategory->summary->endingBalance ?? '',
-                ]);
-
-                fputcsv($file, []);
-            }
-
-            // Final Row for overall totals
-            fputcsv($file, [
-                '',
-                'Total for all accounts',
-                '',
-                $accountBalanceReport->overallTotal->debitBalance,
-                $accountBalanceReport->overallTotal->creditBalance,
-                '',
-                '',
-            ]);
-
-            fclose($file);
-        };
-
-        return response()->streamDownload($callback, $filename, $headers);
-    }
-}

app/Services/ExportService.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Services;
+
+use App\Contracts\ExportableReport;
+use App\Models\Company;
+use Barryvdh\DomPDF\Facade\Pdf;
+use Illuminate\Support\Carbon;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class ExportService
+{
+    public function exportToCsv(Company $company, ExportableReport $report, string $startDate, string $endDate): StreamedResponse
+    {
+        $filename = $company->name . ' ' . $report->getTitle() . ' ' . $startDate . ' to ' . $endDate . '.csv';
+
+        $headers = [
+            'Content-Type' => 'text/csv',
+            'Content-Disposition' => 'attachment; filename="' . $filename . '"',
+        ];
+
+        $callback = function () use ($report, $company, $startDate, $endDate) {
+            $file = fopen('php://output', 'wb');
+
+            fputcsv($file, [$report->getTitle()]);
+            fputcsv($file, [$company->name]);
+            fputcsv($file, ['Date Range: ' . $startDate . ' to ' . $endDate]);
+            fputcsv($file, []);
+
+            fputcsv($file, $report->getHeaders());
+
+            foreach ($report->getData() as $row) {
+                fputcsv($file, $row);
+            }
+
+            fputcsv($file, $report->getOverallTotals());
+
+            fclose($file);
+        };
+
+        return response()->streamDownload($callback, $filename, $headers);
+    }
+
+    public function exportToPdf(Company $company, ExportableReport $report, string $startDate, string $endDate): StreamedResponse
+    {
+        $pdf = Pdf::loadView('components.company.reports.report-pdf', [
+            'company' => $company,
+            'report' => $report,
+            'startDate' => Carbon::parse($startDate)->format('M d, Y'),
+            'endDate' => Carbon::parse($endDate)->format('M d, Y'),
+        ])->setPaper('a4');
+
+        return response()->streamDownload(function () use ($pdf) {
+            echo $pdf->stream();
+        }, strtolower(str_replace(' ', '-', $company->name . '-' . $report->getTitle())) . '.pdf');
+    }
+}

app/Transformers/AccountBalanceReportTransformer.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Transformers;
+
+use App\Contracts\ExportableReport;
+use App\DTO\ReportDTO;
+
+class AccountBalanceReportTransformer implements ExportableReport
+{
+    protected ReportDTO $report;
+
+    public function __construct(ReportDTO $report)
+    {
+        $this->report = $report;
+    }
+
+    public function getTitle(): string
+    {
+        return 'Account Balances';
+    }
+
+    public function getHeaders(): array
+    {
+        return ['ACCOUNT CODE', 'ACCOUNT', 'STARTING BALANCE', 'DEBIT', 'CREDIT', 'NET MOVEMENT', 'ENDING BALANCE'];
+    }
+
+    public function getData(): array
+    {
+        $data = [];
+
+        foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
+            // Category Header row
+            $data[] = ['', $accountCategoryName];
+
+            // 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 ?? '',
+                ];
+            }
+
+            // Category Summary row
+            $data[] = [
+                '',
+                'Total ' . $accountCategoryName,
+                $accountCategory->summary->startingBalance ?? '',
+                $accountCategory->summary->debitBalance,
+                $accountCategory->summary->creditBalance,
+                $accountCategory->summary->netMovement,
+                $accountCategory->summary->endingBalance ?? '',
+            ];
+
+            // Add an empty row after each category
+            $data[] = [''];
+        }
+
+        return $data;
+    }
+
+    public function getOverallTotals(): array
+    {
+        return [
+            '',
+            'Total for all accounts',
+            '',
+            $this->report->overallTotal->debitBalance,
+            $this->report->overallTotal->creditBalance,
+            '',
+            '',
+        ];
+    }
+}

app/Transformers/TrialBalanceReportTransformer.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Transformers;
+
+use App\Contracts\ExportableReport;
+use App\DTO\ReportDTO;
+
+class TrialBalanceReportTransformer implements ExportableReport
+{
+    protected ReportDTO $report;
+
+    public function __construct(ReportDTO $report)
+    {
+        $this->report = $report;
+    }
+
+    public function getTitle(): string
+    {
+        return 'Trial Balance';
+    }
+
+    public function getHeaders(): array
+    {
+        return ['ACCOUNT CODE', 'ACCOUNT', 'DEBIT', 'CREDIT'];
+    }
+
+    public function getData(): array
+    {
+        $data = [];
+
+        foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
+            // Category Header row
+            $data[] = ['', $accountCategoryName];
+
+            // Account rows
+            foreach ($accountCategory->accounts as $account) {
+                $data[] = [
+                    $account->accountCode,
+                    $account->accountName,
+                    $account->balance->debitBalance,
+                    $account->balance->creditBalance,
+                ];
+            }
+
+            // Category Summary row
+            $data[] = [
+                '',
+                'Total ' . $accountCategoryName,
+                $accountCategory->summary->debitBalance,
+                $accountCategory->summary->creditBalance,
+            ];
+
+            // Add an empty row after each category
+            $data[] = [''];
+        }
+
+        return $data;
+    }
+
+    public function getOverallTotals(): array
+    {
+        return [
+            '',
+            'Total for all accounts',
+            $this->report->overallTotal->debitBalance,
+            $this->report->overallTotal->creditBalance,
+        ];
+    }
+}

composer.lock

@@ -4833,16 +4833,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.3.1",
+            "version": "3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "8ff64b92c1b1ec84fcde9f8bb9ff2ca34cb8a77a"
+                "reference": "8eab8983c83c30e0bacbef8d311e3f3b8172727f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8ff64b92c1b1ec84fcde9f8bb9ff2ca34cb8a77a",
-                "reference": "8ff64b92c1b1ec84fcde9f8bb9ff2ca34cb8a77a",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8eab8983c83c30e0bacbef8d311e3f3b8172727f",
+                "reference": "8eab8983c83c30e0bacbef8d311e3f3b8172727f",
                 "shasum": ""
             },
             "require": {
@@ -4935,7 +4935,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-01T06:54:22+00:00"
+            "time": "2024-05-24T14:26:34+00:00"
         },
         {
             "name": "nette/schema",

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

@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Account Balances</title>
+    <title>{{ $report->getTitle() }}</title>
     <style>
         @page {
             size: A4;
@@ -21,7 +21,8 @@
         }
 
         /* Align the first column header and data to the left */
-        .table-class th:first-child, .table-class td:first-child {
+        .table-class th:first-child, .table-class td:first-child,
+        .table-class th:nth-child(2), .table-class td:nth-child(2) {
             text-align: left;
         }
 
@@ -29,6 +30,11 @@
             margin-bottom: 1rem; /* Space between header and table */
         }
 
+        /* Ensure category name is left-aligned */
+        .category-name-cell {
+            text-align: left;
+        }
+
         .header .title,
         .header .company-name,
         .header .date-range {
@@ -61,7 +67,6 @@
 
         .spacer-row > td { height: 0.75rem; }
 
-        .summary-row > td,
         .table-footer-row > td {
             font-weight: 600;
             background-color: #ffffff; /* White background for footer */
@@ -70,58 +75,48 @@
 </head>
 <body>
     <div class="header">
-        <div class="title">Account Balances</div>
-        <div class="company-name">{{ auth()->user()->currentCompany->name }}</div>
+        <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;">
             <tr>
-                <th>Account</th>
-                <th>Starting Balance</th>
-                <th>Debit</th>
-                <th>Credit</th>
-                <th>Net Movement</th>
-                <th>Ending Balance</th>
+                @foreach($report->getHeaders() as $header)
+                    <th>{{ $header }}</th>
+                @endforeach
             </tr>
         </thead>
-        @foreach($accountBalanceReport->categories as $accountCategoryName => $accountCategory)
-            <tbody>
-            <tr class="category-row">
-                <td colspan="6">{{ $accountCategoryName }}</td>
-            </tr>
-            @foreach($accountCategory->accounts as $account)
-                <tr>
-                    <td>{{ $account->accountName }}</td>
-                    <td>{{ $account->balance->startingBalance ?? '' }}</td>
-                    <td>{{ $account->balance->debitBalance }}</td>
-                    <td>{{ $account->balance->creditBalance }}</td>
-                    <td>{{ $account->balance->netMovement }}</td>
-                    <td>{{ $account->balance->endingBalance ?? '' }}</td>
-                </tr>
+        <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="summary-row">
-                <td>Total {{ $accountCategoryName }}</td>
-                <td>{{ $accountCategory->summary->startingBalance ?? '' }}</td>
-                <td>{{ $accountCategory->summary->debitBalance }}</td>
-                <td>{{ $accountCategory->summary->creditBalance }}</td>
-                <td>{{ $accountCategory->summary->netMovement }}</td>
-                <td>{{ $accountCategory->summary->endingBalance ?? '' }}</td>
-            </tr>
-            <tr class="spacer-row">
-                <td colspan="6"></td>
-            </tr>
-            </tbody>
-        @endforeach
+        </tbody>
         <tfoot>
             <tr class="table-footer-row">
-                <td>Total for all accounts</td>
-                <td></td>
-                <td>{{ $accountBalanceReport->overallTotal->debitBalance }}</td>
-                <td>{{ $accountBalanceReport->overallTotal->creditBalance }}</td>
-                <td></td>
-                <td></td>
+                @foreach ($report->getOverallTotals() as $total)
+                    <td>{{ $total }}</td>
+                @endforeach
             </tr>
         </tfoot>
     </table>
 </body>
+</html>