wip

app/Filament/Company/Pages/Accounting/Transactions.php

@@ -630,14 +630,12 @@ class Transactions extends Page implements HasTable
                             ->endDateField("{$fieldPrefix}_end_date"),
                         DatePicker::make("{$fieldPrefix}_start_date")
                             ->label("{$label} From")
-                            ->displayFormat('Y-m-d')
                             ->columnStart(1)
                             ->afterStateUpdated(static function (Set $set) use ($fieldPrefix) {
                                 $set("{$fieldPrefix}_date_range", 'Custom');
                             }),
                         DatePicker::make("{$fieldPrefix}_end_date")
                             ->label("{$label} To")
-                            ->displayFormat('Y-m-d')
                             ->afterStateUpdated(static function (Set $set) use ($fieldPrefix) {
                                 $set("{$fieldPrefix}_date_range", 'Custom');
                             }),

app/Filament/Company/Pages/Reports.php

@@ -4,6 +4,7 @@ namespace App\Filament\Company\Pages;
 
 use App\Filament\Company\Pages\Reports\AccountBalances;
 use App\Filament\Company\Pages\Reports\AccountTransactions;
+use App\Filament\Company\Pages\Reports\IncomeStatement;
 use App\Filament\Company\Pages\Reports\TrialBalance;
 use App\Infolists\Components\ReportEntry;
 use Filament\Infolists\Components\Section;
@@ -22,9 +23,36 @@ class Reports extends Page
         return $infolist
             ->state([])
             ->schema([
+                Section::make('Financial Statements')
+                    ->aside()
+                    ->description('Key financial statements that provide a snapshot of your company’s financial health.')
+                    ->extraAttributes(['class' => 'es-report-card'])
+                    ->schema([
+                        ReportEntry::make('income_statement')
+                            ->hiddenLabel()
+                            ->heading('Income Statement')
+                            ->description('Tracks revenue and expenses to show profit or loss over a specific period of time.')
+                            ->icon('heroicon-o-chart-bar')
+                            ->iconColor(Color::Indigo)
+                            ->url(IncomeStatement::getUrl()),
+                        ReportEntry::make('balance_sheet')
+                            ->hiddenLabel()
+                            ->heading('Balance Sheet')
+                            ->description('Snapshot of assets, liabilities, and equity at a specific point in time.')
+                            ->icon('heroicon-o-clipboard-document-list')
+                            ->iconColor(Color::Emerald)
+                            ->url('#'),
+                        ReportEntry::make('cash_flow_statement')
+                            ->hiddenLabel()
+                            ->heading('Cash Flow Statement')
+                            ->description('Shows cash inflows and outflows over a specific period of time.')
+                            ->icon('heroicon-o-document-currency-dollar')
+                            ->iconColor(Color::Cyan)
+                            ->url('#'),
+                    ]),
                 Section::make('Detailed Reports')
                     ->aside()
-                    ->description('Dig into the details of your business’s transactions, balances, and accounts.')
+                    ->description('Dig into the details of your company’s transactions, balances, and accounts.')
                     ->extraAttributes(['class' => 'es-report-card'])
                     ->schema([
                         ReportEntry::make('account_balances')

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

@@ -50,6 +50,7 @@ class AccountTransactions extends BaseReportPage
         return [
             Column::make('date')
                 ->label('Date')
+                ->markAsDate()
                 ->alignment(Alignment::Left),
             Column::make('description')
                 ->label('Description')

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

@@ -154,8 +154,8 @@ abstract class BaseReportPage extends Page
 
     public function setDateRange(Carbon $start, Carbon $end): void
     {
-        $this->startDate = $start->toDateString();
-        $this->endDate = $end->isFuture() ? now()->toDateString() : $end->toDateString();
+        $this->startDate = $start->startOfDay()->toDateTimeString();
+        $this->endDate = $end->isFuture() ? now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString();
     }
 
     public function toggleColumnsAction(): Action
@@ -238,7 +238,6 @@ abstract class BaseReportPage extends Page
     {
         return DatePicker::make('startDate')
             ->label('Start Date')
-            ->defaultDateFormat()
             ->afterStateUpdated(static function (Set $set) {
                 $set('dateRange', 'Custom');
             });
@@ -248,7 +247,6 @@ abstract class BaseReportPage extends Page
     {
         return DatePicker::make('endDate')
             ->label('End Date')
-            ->defaultDateFormat()
             ->afterStateUpdated(static function (Set $set) {
                 $set('dateRange', 'Custom');
             });

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

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Filament\Company\Pages\Reports;
+
+use App\Contracts\ExportableReport;
+use App\DTO\ReportDTO;
+use App\Services\ExportService;
+use App\Services\ReportService;
+use App\Support\Column;
+use App\Transformers\IncomeStatementReportTransformer;
+use Filament\Forms\Form;
+use Filament\Support\Enums\Alignment;
+use Guava\FilamentClusters\Forms\Cluster;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class IncomeStatement extends BaseReportPage
+{
+    protected static string $view = 'filament.company.pages.reports.income-statement';
+
+    protected static ?string $slug = 'reports/income-statement';
+
+    protected static bool $shouldRegisterNavigation = false;
+
+    protected ReportService $reportService;
+
+    protected ExportService $exportService;
+
+    public function boot(ReportService $reportService, ExportService $exportService): void
+    {
+        $this->reportService = $reportService;
+        $this->exportService = $exportService;
+    }
+
+    public function getTable(): array
+    {
+        return [
+            Column::make('account_code')
+                ->label('Account Code')
+                ->toggleable()
+                ->alignment(Alignment::Center),
+            Column::make('account_name')
+                ->label('Account')
+                ->alignment(Alignment::Left),
+            Column::make('net_movement')
+                ->label('Amount')
+                ->alignment(Alignment::Right),
+        ];
+    }
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->inlineLabel()
+            ->columns()
+            ->live()
+            ->schema([
+                $this->getDateRangeFormComponent(),
+                Cluster::make([
+                    $this->getStartDateFormComponent(),
+                    $this->getEndDateFormComponent(),
+                ])->hiddenLabel(),
+            ]);
+    }
+
+    protected function buildReport(array $columns): ReportDTO
+    {
+        return $this->reportService->buildIncomeStatementReport($this->startDate, $this->endDate, $columns);
+    }
+
+    protected function getTransformer(ReportDTO $reportDTO): ExportableReport
+    {
+        return new IncomeStatementReportTransformer($reportDTO);
+    }
+
+    public function exportCSV(): StreamedResponse
+    {
+        return $this->exportService->exportToCsv($this->company, $this->report, $this->startDate, $this->endDate);
+    }
+
+    public function exportPDF(): StreamedResponse
+    {
+        return $this->exportService->exportToPdf($this->company, $this->report, $this->startDate, $this->endDate);
+    }
+}

app/Filament/Forms/Components/DateRangeSelect.php

@@ -165,7 +165,7 @@ class DateRangeSelect extends Select
 
     public function setDateRange(Carbon $start, Carbon $end, Set $set): void
     {
-        $set($this->startDateField, $start->format('Y-m-d'));
-        $set($this->endDateField, $end->isFuture() ? now()->format('Y-m-d') : $end->format('Y-m-d'));
+        $set($this->startDateField, $start->startOfDay()->toDateTimeString());
+        $set($this->endDateField, $end->isFuture() ? now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
     }
 }

app/Repositories/Accounting/JournalEntryRepository.php

@@ -4,7 +4,6 @@ namespace App\Repositories\Accounting;
 
 use App\Models\Accounting\Account;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Carbon;
 
 class JournalEntryRepository
 {
@@ -13,9 +12,8 @@ class JournalEntryRepository
         $query = $account->journalEntries()->where('type', $type);
 
         if ($startDate && $endDate) {
-            $endOfDay = Carbon::parse($endDate)->endOfDay();
-            $query->whereHas('transaction', static function (Builder $query) use ($startDate, $endOfDay) {
-                $query->whereBetween('posted_at', [$startDate, $endOfDay]);
+            $query->whereHas('transaction', static function (Builder $query) use ($startDate, $endDate) {
+                $query->whereBetween('posted_at', [$startDate, $endDate]);
             });
         } elseif ($startDate) {
             $query->whereHas('transaction', static function (Builder $query) use ($startDate) {

app/Services/AccountService.php

@@ -13,7 +13,6 @@ use App\ValueObjects\Money;
 use Closure;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\JoinClause;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 
 class AccountService implements AccountHandler
@@ -56,9 +55,7 @@ class AccountService implements AccountHandler
 
     public function getTransactionDetailsSubquery(string $startDate, string $endDate): Closure
     {
-        $endOfDay = Carbon::parse($endDate)->endOfDay()->toDateTimeString();
-
-        return static function ($query) use ($startDate, $endOfDay) {
+        return static function ($query) use ($startDate, $endDate) {
             $query->select(
                 'journal_entries.id',
                 'journal_entries.account_id',
@@ -67,7 +64,7 @@ class AccountService implements AccountHandler
                 'journal_entries.amount',
                 DB::raw('journal_entries.amount * IF(journal_entries.type = "debit", 1, -1) AS signed_amount')
             )
-                ->whereBetween('transactions.posted_at', [$startDate, $endOfDay])
+                ->whereBetween('transactions.posted_at', [$startDate, $endDate])
                 ->join('transactions', 'transactions.id', '=', 'journal_entries.transaction_id')
                 ->orderBy('transactions.posted_at')
                 ->with('transaction:id,type,description,posted_at');
@@ -76,8 +73,6 @@ class AccountService implements AccountHandler
 
     public function getAccountBalances(string $startDate, string $endDate, array $accountIds = []): Builder
     {
-        $endOfDay = Carbon::parse($endDate)->endOfDay()->toDateTimeString();
-
         $query = Account::query()
             ->select([
                 'accounts.id',
@@ -110,9 +105,9 @@ class AccountService implements AccountHandler
                 "),
             ])
             ->join('journal_entries', 'journal_entries.account_id', '=', 'accounts.id')
-            ->join('transactions', function (JoinClause $join) use ($endOfDay) {
+            ->join('transactions', function (JoinClause $join) use ($endDate) {
                 $join->on('transactions.id', '=', 'journal_entries.transaction_id')
-                    ->where('transactions.posted_at', '<=', $endOfDay);
+                    ->where('transactions.posted_at', '<=', $endDate);
             })
             ->groupBy('accounts.id')
             ->with(['subtype:id,name']);
@@ -121,15 +116,13 @@ class AccountService implements AccountHandler
             $query->whereIn('accounts.id', $accountIds);
         }
 
-        $query->addBinding([$startDate, $startDate, $startDate, $startDate, $startDate, $endOfDay, $startDate, $endOfDay], 'select');
+        $query->addBinding([$startDate, $startDate, $startDate, $startDate, $startDate, $endDate, $startDate, $endDate], 'select');
 
         return $query;
     }
 
     public function getTotalBalanceForAllBankAccounts(string $startDate, string $endDate): Money
     {
-        $endOfDay = Carbon::parse($endDate)->endOfDay()->toDateTimeString();
-
         $accountIds = Account::whereHas('bankAccount')
             ->pluck('id')
             ->toArray();
@@ -139,9 +132,9 @@ class AccountService implements AccountHandler
         }
 
         $result = DB::table('journal_entries')
-            ->join('transactions', function (JoinClause $join) use ($endOfDay) {
+            ->join('transactions', function (JoinClause $join) use ($endDate) {
                 $join->on('transactions.id', '=', 'journal_entries.transaction_id')
-                    ->where('transactions.posted_at', '<=', $endOfDay);
+                    ->where('transactions.posted_at', '<=', $endDate);
             })
             ->whereIn('journal_entries.account_id', $accountIds)
             ->selectRaw('
@@ -159,9 +152,9 @@ class AccountService implements AccountHandler
                 $startDate,
                 $startDate,
                 $startDate,
-                $endOfDay,
+                $endDate,
                 $startDate,
-                $endOfDay,
+                $endDate,
             ])
             ->first();
 

app/Services/ExportService.php

@@ -4,18 +4,20 @@ 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 Symfony\Component\HttpFoundation\StreamedResponse;
 
 class ExportService
 {
-    public function exportToCsv(Company $company, ExportableReport $report, string $startDate, string $endDate, bool $separateCategoryHeaders = false): StreamedResponse
+    public function exportToCsv(Company $company, ExportableReport $report, string $startDate, string $endDate): StreamedResponse
     {
-        $formattedStartDate = Carbon::parse($startDate)->format('Y-m-d');
-        $formattedEndDate = Carbon::parse($endDate)->format('Y-m-d');
+        $formattedStartDate = Carbon::parse($startDate)->toDateString();
+        $formattedEndDate = Carbon::parse($endDate)->toDateString();
 
-        $timestamp = Carbon::now()->format('Y-m-d-H_i');
+        $timestamp = Carbon::now()->format('Y-m-d_H-i-s');
 
         $filename = $company->name . ' ' . $report->getTitle() . ' ' . $formattedStartDate . ' to ' . $formattedEndDate . ' ' . $timestamp . '.csv';
 
@@ -24,12 +26,15 @@ class ExportService
             'Content-Disposition' => 'attachment; filename="' . $filename . '"',
         ];
 
-        $callback = function () use ($report, $company, $formattedStartDate, $formattedEndDate) {
+        $callback = function () use ($startDate, $endDate, $report, $company) {
             $file = fopen('php://output', 'wb');
 
+            $defaultStartDateFormat = Carbon::parse($startDate)->toDefaultDateFormat();
+            $defaultEndDateFormat = Carbon::parse($endDate)->toDefaultDateFormat();
+
             fputcsv($file, [$report->getTitle()]);
             fputcsv($file, [$company->name]);
-            fputcsv($file, ['Date Range: ' . $formattedStartDate . ' to ' . $formattedEndDate]);
+            fputcsv($file, ['Date Range: ' . $defaultStartDateFormat . ' to ' . $defaultEndDateFormat]);
             fputcsv($file, []);
 
             fputcsv($file, $report->getHeaders());
@@ -44,7 +49,30 @@ class ExportService
                 }
 
                 foreach ($category->data as $accountRow) {
-                    fputcsv($file, $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;
+                        }
+                    }
+
+                    fputcsv($file, $row);
                 }
 
                 if (filled($category->summary)) {
@@ -66,18 +94,18 @@ class ExportService
 
     public function exportToPdf(Company $company, ExportableReport $report, string $startDate, string $endDate): StreamedResponse
     {
-        $formattedStartDate = Carbon::parse($startDate)->format('Y-m-d');
-        $formattedEndDate = Carbon::parse($endDate)->format('Y-m-d');
+        $formattedStartDate = Carbon::parse($startDate)->toDateString();
+        $formattedEndDate = Carbon::parse($endDate)->toDateString();
 
-        $timestamp = Carbon::now()->format('Y-m-d-H_i');
+        $timestamp = Carbon::now()->format('Y-m-d_H-i-s');
 
         $filename = $company->name . ' ' . $report->getTitle() . ' ' . $formattedStartDate . ' to ' . $formattedEndDate . ' ' . $timestamp . '.pdf';
 
         $pdf = SnappyPdf::loadView($report->getPdfView(), [
             'company' => $company,
             'report' => $report,
-            'startDate' => Carbon::parse($startDate)->format('M d, Y'),
-            'endDate' => Carbon::parse($endDate)->format('M d, Y'),
+            'startDate' => Carbon::parse($startDate)->toDefaultDateFormat(),
+            'endDate' => Carbon::parse($endDate)->toDefaultDateFormat(),
         ]);
 
         return response()->streamDownload(function () use ($pdf) {

app/Services/ReportService.php

@@ -121,9 +121,7 @@ class ReportService
 
         $query = $this->accountService->getAccountBalances($startDate, $endDate, $accountIds);
 
-        $query->with(['journalEntries' => $this->accountService->getTransactionDetailsSubquery($startDate, $endDate)]);
-
-        $accounts = $query->get();
+        $accounts = $query->with(['journalEntries' => $this->accountService->getTransactionDetailsSubquery($startDate, $endDate)])->get();
 
         $reportCategories = [];
 
@@ -292,4 +290,72 @@ class ReportService
 
         return ['debit_balance' => abs($endingBalance), 'credit_balance' => 0];
     }
+
+    public function buildIncomeStatementReport(string $startDate, string $endDate, array $columns = []): ReportDTO
+    {
+        $accounts = $this->accountService->getAccountBalances($startDate, $endDate)->get();
+
+        $accountCategories = [];
+        $totalRevenue = 0;
+        $cogs = 0;
+        $totalExpenses = 0;
+
+        $categoryGroups = [
+            'Revenue' => [
+                'accounts' => $accounts->where('category', AccountCategory::Revenue),
+                'total' => &$totalRevenue,
+            ],
+            'Cost of Goods Sold' => [
+                'accounts' => $accounts->where('subtype.name', 'Cost of Goods Sold'),
+                'total' => &$cogs,
+            ],
+            'Expenses' => [
+                'accounts' => $accounts->where('category', AccountCategory::Expense)->where('subtype.name', '!=', 'Cost of Goods Sold'),
+                'total' => &$totalExpenses,
+            ],
+        ];
+
+        foreach ($categoryGroups as $label => $group) {
+            $categoryAccounts = [];
+            $netMovement = 0;
+
+            foreach ($group['accounts']->sortBy('code', SORT_NATURAL) as $account) {
+                $category = null;
+
+                if ($label === 'Revenue') {
+                    $category = AccountCategory::Revenue;
+                } elseif ($label === 'Expenses') {
+                    $category = AccountCategory::Expense;
+                } elseif ($label === 'Cost of Goods Sold') {
+                    // COGS is treated as part of Expenses, so we use AccountCategory::Expense
+                    $category = AccountCategory::Expense;
+                }
+
+                if ($category !== null) {
+                    $accountBalances = $this->calculateAccountBalances($account, $category);
+                    $movement = $accountBalances['net_movement'];
+                    $netMovement += $movement;
+                    $group['total'] += $movement;
+
+                    $categoryAccounts[] = new AccountDTO(
+                        $account->name,
+                        $account->code,
+                        $account->id,
+                        $this->formatBalances(['net_movement' => $movement]),
+                    );
+                }
+            }
+
+            $accountCategories[$label] = new AccountCategoryDTO(
+                $categoryAccounts,
+                $this->formatBalances(['net_movement' => $netMovement]),
+            );
+        }
+
+        $grossProfit = $totalRevenue - $cogs;
+        $netProfit = $grossProfit - $totalExpenses;
+        $formattedReportTotalBalances = $this->formatBalances(['net_movement' => $netProfit]);
+
+        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
+    }
 }

app/Support/Column.php

@@ -18,6 +18,8 @@ class Column extends Component
     use HasLabel;
     use HasName;
 
+    protected bool $isDate = false;
+
     final public function __construct(string $name)
     {
         $this->name($name);
@@ -40,4 +42,16 @@ class Column extends Component
             default => '',
         };
     }
+
+    public function markAsDate(): static
+    {
+        $this->isDate = true;
+
+        return $this;
+    }
+
+    public function isDate(): bool
+    {
+        return $this->isDate;
+    }
 }

app/Transformers/IncomeStatementReportTransformer.php

@@ -0,0 +1,130 @@
+<?php
+
+namespace App\Transformers;
+
+use App\DTO\AccountDTO;
+use App\DTO\ReportCategoryDTO;
+use App\Support\Column;
+
+class IncomeStatementReportTransformer extends BaseReportTransformer
+{
+    protected string $totalRevenue = '$0.00';
+
+    protected string $totalCogs = '$0.00';
+
+    protected string $totalExpenses = '$0.00';
+
+    public function getTitle(): string
+    {
+        return 'Income Statement';
+    }
+
+    public function getHeaders(): array
+    {
+        return array_map(fn (Column $column) => $column->getLabel(), $this->getColumns());
+    }
+
+    public function calculateTotals(): void
+    {
+        foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
+            match ($accountCategoryName) {
+                'Revenue' => $this->totalRevenue = $accountCategory->summary->netMovement ?? '',
+                'Cost of Goods Sold' => $this->totalCogs = $accountCategory->summary->netMovement ?? '',
+                'Expenses' => $this->totalExpenses = $accountCategory->summary->netMovement ?? '',
+            };
+        }
+    }
+
+    public function getCategories(): array
+    {
+        $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] = '';
+                }
+            }
+
+            $data = array_map(function (AccountDTO $account) {
+                $row = [];
+
+                foreach ($this->getColumns() as $column) {
+                    $row[] = match ($column->getName()) {
+                        'account_code' => $account->accountCode,
+                        'account_name' => [
+                            'name' => $account->accountName,
+                            'id' => $account->accountId ?? null,
+                        ],
+                        'net_movement' => $account->balance->netMovement ?? '',
+                        default => '',
+                    };
+                }
+
+                return $row;
+            }, $accountCategory->accounts);
+
+            $summary = [];
+
+            foreach ($this->getColumns() as $column) {
+                $summary[] = match ($column->getName()) {
+                    'account_name' => 'Total ' . $accountCategoryName,
+                    'net_movement' => $accountCategory->summary->netMovement ?? '',
+                    default => '',
+                };
+            }
+
+            $categories[] = new ReportCategoryDTO(
+                header: $header,
+                data: $data,
+                summary: $summary,
+            );
+        }
+
+        return $categories;
+    }
+
+    public function getOverallTotals(): array
+    {
+        $totals = [];
+
+        foreach ($this->getColumns() as $column) {
+            $totals[] = match ($column->getName()) {
+                'account_name' => 'Net Earnings',
+                'net_movement' => $this->report->overallTotal->netMovement ?? '',
+                default => '',
+            };
+        }
+
+        return $totals;
+    }
+
+    public function getSummary(): array
+    {
+        $this->calculateTotals();
+
+        return [
+            [
+                'label' => 'Revenue',
+                'value' => $this->totalRevenue,
+            ],
+            [
+                'label' => 'Cost of Goods Sold',
+                'value' => $this->totalCogs,
+            ],
+            [
+                'label' => 'Expenses',
+                'value' => $this->totalExpenses,
+            ],
+            [
+                'label' => 'Net Earnings',
+                'value' => $this->report->overallTotal->netMovement ?? '',
+            ],
+        ];
+    }
+}

package-lock.json

@@ -541,9 +541,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.20.0.tgz",
-            "integrity": "sha512-TSpWzflCc4VGAUJZlPpgAJE1+V60MePDQnBd7PPkpuEmOy8i87aL6tinFGKBFKuEDikYpig72QzdT3QPYIi+oA==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.0.tgz",
+            "integrity": "sha512-WTWD8PfoSAJ+qL87lE7votj3syLavxunWhzCnx3XFxFiI/BA/r3X7MUM8dVrH8rb2r4AiO8jJsr3ZjdaftmnfA==",
             "cpu": [
                 "arm"
             ],
@@ -555,9 +555,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.20.0.tgz",
-            "integrity": "sha512-u00Ro/nok7oGzVuh/FMYfNoGqxU5CPWz1mxV85S2w9LxHR8OoMQBuSk+3BKVIDYgkpeOET5yXkx90OYFc+ytpQ==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.0.tgz",
+            "integrity": "sha512-a1sR2zSK1B4eYkiZu17ZUZhmUQcKjk2/j9Me2IDjk1GHW7LB5Z35LEzj9iJch6gtUfsnvZs1ZNyDW2oZSThrkA==",
             "cpu": [
                 "arm64"
             ],
@@ -569,9 +569,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.20.0.tgz",
-            "integrity": "sha512-uFVfvzvsdGtlSLuL0ZlvPJvl6ZmrH4CBwLGEFPe7hUmf7htGAN+aXo43R/V6LATyxlKVC/m6UsLb7jbG+LG39Q==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.0.tgz",
+            "integrity": "sha512-zOnKWLgDld/svhKO5PD9ozmL6roy5OQ5T4ThvdYZLpiOhEGY+dp2NwUmxK0Ld91LrbjrvtNAE0ERBwjqhZTRAA==",
             "cpu": [
                 "arm64"
             ],
@@ -583,9 +583,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.20.0.tgz",
-            "integrity": "sha512-xbrMDdlev53vNXexEa6l0LffojxhqDTBeL+VUxuuIXys4x6xyvbKq5XqTXBCEUA8ty8iEJblHvFaWRJTk/icAQ==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.0.tgz",
+            "integrity": "sha512-7doS8br0xAkg48SKE2QNtMSFPFUlRdw9+votl27MvT46vo44ATBmdZdGysOevNELmZlfd+NEa0UYOA8f01WSrg==",
             "cpu": [
                 "x64"
             ],
@@ -597,9 +597,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.20.0.tgz",
-            "integrity": "sha512-jMYvxZwGmoHFBTbr12Xc6wOdc2xA5tF5F2q6t7Rcfab68TT0n+r7dgawD4qhPEvasDsVpQi+MgDzj2faOLsZjA==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.0.tgz",
+            "integrity": "sha512-pWJsfQjNWNGsoCq53KjMtwdJDmh/6NubwQcz52aEwLEuvx08bzcy6tOUuawAOncPnxz/3siRtd8hiQ32G1y8VA==",
             "cpu": [
                 "arm"
             ],
@@ -611,9 +611,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.20.0.tgz",
-            "integrity": "sha512-1asSTl4HKuIHIB1GcdFHNNZhxAYEdqML/MW4QmPS4G0ivbEcBr1JKlFLKsIRqjSwOBkdItn3/ZDlyvZ/N6KPlw==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.0.tgz",
+            "integrity": "sha512-efRIANsz3UHZrnZXuEvxS9LoCOWMGD1rweciD6uJQIx2myN3a8Im1FafZBzh7zk1RJ6oKcR16dU3UPldaKd83w==",
             "cpu": [
                 "arm"
             ],
@@ -625,9 +625,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.20.0.tgz",
-            "integrity": "sha512-COBb8Bkx56KldOYJfMf6wKeYJrtJ9vEgBRAOkfw6Ens0tnmzPqvlpjZiLgkhg6cA3DGzCmLmmd319pmHvKWWlQ==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.0.tgz",
+            "integrity": "sha512-ZrPhydkTVhyeGTW94WJ8pnl1uroqVHM3j3hjdquwAcWnmivjAwOYjTEAuEDeJvGX7xv3Z9GAvrBkEzCgHq9U1w==",
             "cpu": [
                 "arm64"
             ],
@@ -639,9 +639,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.20.0.tgz",
-            "integrity": "sha512-+it+mBSyMslVQa8wSPvBx53fYuZK/oLTu5RJoXogjk6x7Q7sz1GNRsXWjn6SwyJm8E/oMjNVwPhmNdIjwP135Q==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.0.tgz",
+            "integrity": "sha512-cfaupqd+UEFeURmqNP2eEvXqgbSox/LHOyN9/d2pSdV8xTrjdg3NgOFJCtc1vQ/jEke1qD0IejbBfxleBPHnPw==",
             "cpu": [
                 "arm64"
             ],
@@ -653,9 +653,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.20.0.tgz",
-            "integrity": "sha512-yAMvqhPfGKsAxHN8I4+jE0CpLWD8cv4z7CK7BMmhjDuz606Q2tFKkWRY8bHR9JQXYcoLfopo5TTqzxgPUjUMfw==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.0.tgz",
+            "integrity": "sha512-ZKPan1/RvAhrUylwBXC9t7B2hXdpb/ufeu22pG2psV7RN8roOfGurEghw1ySmX/CmDDHNTDDjY3lo9hRlgtaHg==",
             "cpu": [
                 "ppc64"
             ],
@@ -667,9 +667,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.20.0.tgz",
-            "integrity": "sha512-qmuxFpfmi/2SUkAw95TtNq/w/I7Gpjurx609OOOV7U4vhvUhBcftcmXwl3rqAek+ADBwSjIC4IVNLiszoj3dPA==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.0.tgz",
+            "integrity": "sha512-H1eRaCwd5E8eS8leiS+o/NqMdljkcb1d6r2h4fKSsCXQilLKArq6WS7XBLDu80Yz+nMqHVFDquwcVrQmGr28rg==",
             "cpu": [
                 "riscv64"
             ],
@@ -681,9 +681,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.20.0.tgz",
-            "integrity": "sha512-I0BtGXddHSHjV1mqTNkgUZLnS3WtsqebAXv11D5BZE/gfw5KoyXSAXVqyJximQXNvNzUo4GKlCK/dIwXlz+jlg==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.0.tgz",
+            "integrity": "sha512-zJ4hA+3b5tu8u7L58CCSI0A9N1vkfwPhWd/puGXwtZlsB5bTkwDNW/+JCU84+3QYmKpLi+XvHdmrlwUwDA6kqw==",
             "cpu": [
                 "s390x"
             ],
@@ -695,9 +695,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.20.0.tgz",
-            "integrity": "sha512-y+eoL2I3iphUg9tN9GB6ku1FA8kOfmF4oUEWhztDJ4KXJy1agk/9+pejOuZkNFhRwHAOxMsBPLbXPd6mJiCwew==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.0.tgz",
+            "integrity": "sha512-e2hrvElFIh6kW/UNBQK/kzqMNY5mO+67YtEh9OA65RM5IJXYTWiXjX6fjIiPaqOkBthYF1EqgiZ6OXKcQsM0hg==",
             "cpu": [
                 "x64"
             ],
@@ -709,9 +709,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.20.0.tgz",
-            "integrity": "sha512-hM3nhW40kBNYUkZb/r9k2FKK+/MnKglX7UYd4ZUy5DJs8/sMsIbqWK2piZtVGE3kcXVNj3B2IrUYROJMMCikNg==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.0.tgz",
+            "integrity": "sha512-1vvmgDdUSebVGXWX2lIcgRebqfQSff0hMEkLJyakQ9JQUbLDkEaMsPTLOmyccyC6IJ/l3FZuJbmrBw/u0A0uCQ==",
             "cpu": [
                 "x64"
             ],
@@ -723,9 +723,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.20.0.tgz",
-            "integrity": "sha512-psegMvP+Ik/Bg7QRJbv8w8PAytPA7Uo8fpFjXyCRHWm6Nt42L+JtoqH8eDQ5hRP7/XW2UiIriy1Z46jf0Oa1kA==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.0.tgz",
+            "integrity": "sha512-s5oFkZ/hFcrlAyBTONFY1TWndfyre1wOMwU+6KCpm/iatybvrRgmZVM+vCFwxmC5ZhdlgfE0N4XorsDpi7/4XQ==",
             "cpu": [
                 "arm64"
             ],
@@ -737,9 +737,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.20.0.tgz",
-            "integrity": "sha512-GabekH3w4lgAJpVxkk7hUzUf2hICSQO0a/BLFA11/RMxQT92MabKAqyubzDZmMOC/hcJNlc+rrypzNzYl4Dx7A==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.0.tgz",
+            "integrity": "sha512-G9+TEqRnAA6nbpqyUqgTiopmnfgnMkR3kMukFBDsiyy23LZvUCpiUwjTRx6ezYCjJODXrh52rBR9oXvm+Fp5wg==",
             "cpu": [
                 "ia32"
             ],
@@ -751,9 +751,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.20.0.tgz",
-            "integrity": "sha512-aJ1EJSuTdGnM6qbVC4B5DSmozPTqIag9fSzXRNNo+humQLG89XpPgdt16Ia56ORD7s+H8Pmyx44uczDQ0yDzpg==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.0.tgz",
+            "integrity": "sha512-2jsCDZwtQvRhejHLfZ1JY6w6kEuEtfF9nzYsZxzSlNVKDX+DpsDJ+Rbjkm74nvg2rdx0gwBS+IMdvwJuq3S9pQ==",
             "cpu": [
                 "x64"
             ],
@@ -1159,9 +1159,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.10",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.10.tgz",
-            "integrity": "sha512-C3RDERDjrNW262GCRvpoer3a0Ksd66CtgDLxMHhzShQ8fhL4kwnpVXsJPAKg9xJjIROXUbLBrvtOzVAjALMIWA==",
+            "version": "1.5.11",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.11.tgz",
+            "integrity": "sha512-R1CccCDYqndR25CaXFd6hp/u9RaaMcftMkphmvuepXr5b1vfLkRml6aWVeBhXJ7rbevHkKEMJtz8XqPf7ffmew==",
             "dev": true,
             "license": "ISC"
         },
@@ -2171,9 +2171,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.20.0.tgz",
-            "integrity": "sha512-6rbWBChcnSGzIlXeIdNIZTopKYad8ZG8ajhl78lGRLsI2rX8IkaotQhVas2Ma+GPxJav19wrSzvRvuiv0YKzWw==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.0.tgz",
+            "integrity": "sha512-vo+S/lfA2lMS7rZ2Qoubi6I5hwZwzXeUIctILZLbHI+laNtvhhOIon2S1JksA5UEDQ7l3vberd0fxK44lTYjbQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2187,22 +2187,22 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.20.0",
-                "@rollup/rollup-android-arm64": "4.20.0",
-                "@rollup/rollup-darwin-arm64": "4.20.0",
-                "@rollup/rollup-darwin-x64": "4.20.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.20.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.20.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.20.0",
-                "@rollup/rollup-linux-arm64-musl": "4.20.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.20.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.20.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.20.0",
-                "@rollup/rollup-linux-x64-gnu": "4.20.0",
-                "@rollup/rollup-linux-x64-musl": "4.20.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.20.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.20.0",
-                "@rollup/rollup-win32-x64-msvc": "4.20.0",
+                "@rollup/rollup-android-arm-eabi": "4.21.0",
+                "@rollup/rollup-android-arm64": "4.21.0",
+                "@rollup/rollup-darwin-arm64": "4.21.0",
+                "@rollup/rollup-darwin-x64": "4.21.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.21.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.21.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.21.0",
+                "@rollup/rollup-linux-arm64-musl": "4.21.0",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.21.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.21.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.21.0",
+                "@rollup/rollup-linux-x64-gnu": "4.21.0",
+                "@rollup/rollup-linux-x64-musl": "4.21.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.21.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.21.0",
+                "@rollup/rollup-win32-x64-msvc": "4.21.0",
                 "fsevents": "~2.3.2"
             }
         },

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

@@ -84,7 +84,7 @@
 
         .category-summary-row > td,
         .table-footer-row > td {
-            font-weight: 600;
+            font-weight: bold;
             background-color: #ffffff; /* White background for footer */
         }
     </style>
@@ -139,7 +139,7 @@
         </tr>
         </tbody>
     @endforeach
-    <tfoot>
+    <tbody>
     <tr class="table-footer-row">
         @foreach ($report->getOverallTotals() as $index => $total)
             <td class="{{ $report->getAlignmentClass($index) }}">
@@ -147,7 +147,7 @@
             </td>
         @endforeach
     </tr>
-    </tfoot>
+    </tbody>
 </table>
 </body>
 </html>

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

@@ -1,19 +1,24 @@
 <x-filament-panels::page>
-    <x-filament-tables::container>
-        <form wire:submit="loadReportData" class="p-6">
+    <x-filament::section>
+        <form wire:submit="loadReportData">
             {{ $this->form }}
         </form>
-        <div class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
+    </x-filament::section>
+    
+    <x-filament-tables::container>
+        <div class="es-table__header-ctn"></div>
+        <div
+            class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
             <div wire:init="loadReportData" class="flex items-center justify-center w-full h-full absolute">
                 <div wire:loading wire:target="loadReportData">
-                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300" />
+                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
                 </div>
             </div>
 
             @if($this->reportLoaded)
                 <div wire:loading.remove wire:target="loadReportData">
                     @if($this->report && !$this->tableHasEmptyState())
-                        <x-company.tables.reports.account-transactions :report="$this->report" />
+                        <x-company.tables.reports.account-transactions :report="$this->report"/>
                     @else
                         <x-filament-tables::empty-state
                             :actions="$this->getEmptyStateActions()"

resources/views/filament/company/pages/reports/detailed-report.blade.php

@@ -1,33 +1,42 @@
 <x-filament-panels::page>
-    <x-filament-tables::container>
-        <form wire:submit="loadReportData" class="p-6">
-            <div class="flex flex-col md:flex-row items-start md:items-center justify-center gap-4 md:gap-12">
-                {{ $this->form }}
-                @if($this->hasToggleableColumns())
-                    <x-filament-tables::column-toggle.dropdown
-                        :form="$this->toggleTableColumnForm"
-                        :trigger-action="$this->toggleColumnsAction"
-                    />
-                @endif
-                <x-filament::button type="submit" wire:target="loadReportData" class="flex-shrink-0">
-                    Update Report
-                </x-filament::button>
+    <x-filament::section>
+        <form wire:submit="loadReportData">
+            <div class="flex flex-col md:flex-row items-start md:items-center justify-between gap-4 md:gap-8">
+                <div class="flex-grow">
+                    {{ $this->form }}
+                </div>
+
+                <div class="flex flex-col md:flex-row items-start md:items-center gap-4 md:gap-8 flex-shrink-0">
+                    @if($this->hasToggleableColumns())
+                        <x-filament-tables::column-toggle.dropdown
+                            :form="$this->toggleTableColumnForm"
+                            :trigger-action="$this->toggleColumnsAction"
+                        />
+                    @endif
+                    <x-filament::button type="submit" wire:target="loadReportData" class="flex-shrink-0">
+                        Update Report
+                    </x-filament::button>
+                </div>
             </div>
         </form>
-        <div wire:init="loadReportData"
-             class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
+    </x-filament::section>
+
+    <x-filament-tables::container>
+        <div class="es-table__header-ctn"></div>
+        <div
+            class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
+            <div wire:init="loadReportData" class="flex items-center justify-center w-full h-full absolute">
+                <div wire:loading wire:target="loadReportData">
+                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
+                </div>
+            </div>
+
             @if($this->reportLoaded)
                 <div wire:loading.remove wire:target="loadReportData">
                     @if($this->report)
                         <x-company.tables.reports.detailed-report :report="$this->report"/>
                     @endif
                 </div>
-            @else
-                <div class="absolute inset-0 flex items-center justify-center">
-                    <div wire:loading wire:target="loadReportData">
-                        <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
-                    </div>
-                </div>
             @endif
         </div>
         <div class="es-table__footer-ctn border-t border-gray-200"></div>

resources/views/filament/company/pages/reports/income-statement.blade.php

@@ -0,0 +1,84 @@
+<x-filament-panels::page>
+    <x-filament::section>
+        <form wire:submit="loadReportData">
+            <div class="flex flex-col md:flex-row items-start md:items-center justify-between gap-4 md:gap-8">
+                <!-- Form Container -->
+                <div class="flex-grow">
+                    {{ $this->form }}
+                </div>
+
+                <!-- Grouping Button and Column Toggle -->
+                <div class="flex flex-col md:flex-row items-start md:items-center gap-4 md:gap-8 flex-shrink-0">
+                    @if($this->hasToggleableColumns())
+                        <x-filament-tables::column-toggle.dropdown
+                            :form="$this->toggleTableColumnForm"
+                            :trigger-action="$this->toggleColumnsAction"
+                        />
+                    @endif
+                    <x-filament::button type="submit" wire:target="loadReportData" class="flex-shrink-0">
+                        Update Report
+                    </x-filament::button>
+                </div>
+            </div>
+        </form>
+    </x-filament::section>
+
+
+    <x-filament::section>
+        <!-- Summary Section -->
+        @if($this->reportLoaded)
+            <div
+                class="flex flex-col md:flex-row items-center md:items-end text-center justify-center gap-4 md:gap-8">
+                @foreach($this->report->getSummary() as $summary)
+                    <div class="text-sm">
+                        <div class="text-gray-600 font-medium mb-2">{{ $summary['label'] }}</div>
+
+                        @php
+                            $isNetEarnings = $summary['label'] === 'Net Earnings';
+                            $isPositive = money($summary['value'], \App\Utilities\Currency\CurrencyAccessor::getDefaultCurrency())->isPositive();
+                        @endphp
+
+                        <strong
+                            @class([
+                                'text-lg',
+                                'text-green-700' => $isNetEarnings && $isPositive,
+                                'text-danger-700' => $isNetEarnings && ! $isPositive,
+                            ])
+                        >
+                            {{ $summary['value'] }}
+                        </strong>
+                    </div>
+
+                    @if(! $loop->last)
+                        <div class="flex items-center justify-center px-2">
+                            <strong class="text-lg">
+                                {{ $loop->remaining === 1 ? '=' : '-' }}
+                            </strong>
+                        </div>
+                    @endif
+                @endforeach
+            </div>
+        @endif
+    </x-filament::section>
+
+    <x-filament-tables::container>
+        <div class="es-table__header-ctn"></div>
+        <div wire:init="loadReportData"
+             class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
+            @if($this->reportLoaded)
+                <div wire:loading.remove wire:target="loadReportData">
+                    @if($this->report)
+                        <x-company.tables.reports.detailed-report :report="$this->report"/>
+                    @endif
+                </div>
+            @else
+                <div class="absolute inset-0 flex items-center justify-center">
+                    <div wire:loading wire:target="loadReportData">
+                        <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
+                    </div>
+                </div>
+            @endif
+        </div>
+        <div class="es-table__footer-ctn border-t border-gray-200"></div>
+    </x-filament-tables::container>
+</x-filament-panels::page>