wip

app/Contracts/ExportableReport.php

@@ -26,4 +26,8 @@ interface ExportableReport
     public function getPdfView(): string;
 
     public function getAlignmentClass(string $columnName): string;
+
+    public function getStartDate(): ?string;
+
+    public function getEndDate(): ?string;
 }

app/DTO/ReportDTO.php

@@ -2,6 +2,8 @@
 
 namespace App\DTO;
 
+use Illuminate\Support\Carbon;
+
 class ReportDTO
 {
     public function __construct(
@@ -13,5 +15,7 @@ class ReportDTO
         public array $fields = [],
         public ?string $reportType = null,
         public ?CashFlowOverviewDTO $overview = null,
+        public ?Carbon $startDate = null,
+        public ?Carbon $endDate = null,
     ) {}
 }

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

@@ -38,8 +38,8 @@ class BalanceSheet extends BaseReportPage
         return [
             Column::make('account_code')
                 ->label('Account Code')
-                ->toggleable()
-                ->alignment(Alignment::Center),
+                ->toggleable(isToggledHiddenByDefault: true)
+                ->alignment(Alignment::Left),
             Column::make('account_name')
                 ->label('Account')
                 ->alignment(Alignment::Left),

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

@@ -40,8 +40,8 @@ class CashFlowStatement extends BaseReportPage
         return [
             Column::make('account_code')
                 ->label('Account Code')
-                ->toggleable()
-                ->alignment(Alignment::Center),
+                ->toggleable(isToggledHiddenByDefault: true)
+                ->alignment(Alignment::Left),
             Column::make('account_name')
                 ->label('Account')
                 ->alignment(Alignment::Left),

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

@@ -40,8 +40,8 @@ class IncomeStatement extends BaseReportPage
         return [
             Column::make('account_code')
                 ->label('Account Code')
-                ->toggleable()
-                ->alignment(Alignment::Center),
+                ->toggleable(isToggledHiddenByDefault: true)
+                ->alignment(Alignment::Left),
             Column::make('account_name')
                 ->label('Account')
                 ->alignment(Alignment::Left),

app/Services/ReportService.php

@@ -46,7 +46,9 @@ class ReportService
     {
         $orderedCategories = AccountCategory::getOrderedCategories();
 
-        $accounts = $this->accountService->getAccountBalances($startDate, $endDate)->get();
+        $accounts = $this->accountService->getAccountBalances($startDate, $endDate)
+            ->orderByRaw('LENGTH(code), code')
+            ->get();
 
         $columnNameKeys = array_map(fn (Column $column) => $column->getName(), $columns);
 
@@ -54,8 +56,7 @@ class ReportService
         $reportTotalBalances = [];
 
         foreach ($orderedCategories as $category) {
-            $accountsInCategory = $accounts->where('category', $category)
-                ->sortBy('code', SORT_NATURAL);
+            $accountsInCategory = $accounts->where('category', $category);
 
             $relevantFields = array_intersect($category->getRelevantBalanceFields(), $columnNameKeys);
 
@@ -97,7 +98,11 @@ class ReportService
 
         $formattedReportTotalBalances = $this->formatBalances($reportTotalBalances);
 
-        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
+        return new ReportDTO(
+            categories: $accountCategories,
+            overallTotal: $formattedReportTotalBalances,
+            fields: $columns,
+        );
     }
 
     public function calculateAccountBalances(Account $account): array
@@ -154,7 +159,8 @@ class ReportService
 
         $accountIds = $accountId !== 'all' ? [$accountId] : [];
 
-        $query = $this->accountService->getAccountBalances($startDate, $endDate, $accountIds);
+        $query = $this->accountService->getAccountBalances($startDate, $endDate, $accountIds)
+            ->orderByRaw('LENGTH(code), code');
 
         $accounts = $query->with(['journalEntries' => $this->accountService->getTransactionDetailsSubquery($startDate, $endDate)])->get();
 
@@ -245,6 +251,7 @@ class ReportService
 
         $accounts = $this->accountService->getAccountBalances($startDateCarbon->toDateTimeString(), $asOfDateCarbon->toDateTimeString())
             ->when($isPostClosingTrialBalance, fn (Builder $query) => $query->whereNotIn('category', [AccountCategory::Revenue, AccountCategory::Expense]))
+            ->orderByRaw('LENGTH(code), code')
             ->get();
 
         $balanceFields = ['debit_balance', 'credit_balance'];
@@ -253,8 +260,7 @@ class ReportService
         $reportTotalBalances = array_fill_keys($balanceFields, 0);
 
         foreach ($orderedCategories as $category) {
-            $accountsInCategory = $accounts->where('category', $category)
-                ->sortBy('code', SORT_NATURAL);
+            $accountsInCategory = $accounts->where('category', $category);
 
             $categorySummaryBalances = array_fill_keys($balanceFields, 0);
 
@@ -432,7 +438,13 @@ class ReportService
         $netProfit = $grossProfit - $totalExpenses;
         $formattedReportTotalBalances = $this->formatBalances(['net_movement' => $netProfit]);
 
-        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
+        return new ReportDTO(
+            categories: $accountCategories,
+            overallTotal: $formattedReportTotalBalances,
+            fields: $columns,
+            startDate: Carbon::parse($startDate),
+            endDate: Carbon::parse($endDate),
+        );
     }
 
     public function buildCashFlowStatementReport(string $startDate, string $endDate, array $columns = []): ReportDTO
@@ -451,7 +463,9 @@ class ReportService
             categories: $sections,
             overallTotal: $totalCashFlows,
             fields: $columns,
-            overview: $overview
+            overview: $overview,
+            startDate: Carbon::parse($startDate),
+            endDate: Carbon::parse($endDate),
         );
     }
 
@@ -759,6 +773,12 @@ class ReportService
 
         $formattedReportTotalBalances = $this->formatBalances(['ending_balance' => $netAssets]);
 
-        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
+        return new ReportDTO(
+            categories: $accountCategories,
+            overallTotal: $formattedReportTotalBalances,
+            fields: $columns,
+            startDate: $startDateCarbon,
+            endDate: $asOfDateCarbon,
+        );
     }
 }

app/Transformers/BalanceSheetReportTransformer.php

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

app/Transformers/BaseReportTransformer.php

@@ -76,4 +76,14 @@ abstract class BaseReportTransformer implements ExportableReport
             return 'text-left';
         });
     }
+
+    public function getStartDate(): ?string
+    {
+        return $this->report->startDate?->toDefaultDateFormat();
+    }
+
+    public function getEndDate(): ?string
+    {
+        return $this->report->endDate?->toDefaultDateFormat();
+    }
 }

app/Transformers/CashFlowStatementReportTransformer.php

@@ -146,7 +146,7 @@ class CashFlowStatementReportTransformer extends SummaryReportTransformer
 
                 foreach ($columns as $column) {
                     $typeSummary[$column->getName()] = match ($column->getName()) {
-                        'account_name' => 'Total ' . $typeName,
+                        'account_name' => $typeName,
                         'net_movement' => $type->summary->netMovement ?? '',
                         default => '',
                     };
@@ -185,21 +185,21 @@ class CashFlowStatementReportTransformer extends SummaryReportTransformer
     {
         return [
             [
-                'label' => 'Gross Cash Inflow',
+                'label' => 'Total Cash Inflows',
                 'value' => $this->report->overallTotal->debitBalance ?? '',
             ],
             [
-                'label' => 'Gross Cash Outflow',
+                'label' => 'Total Cash Outflows',
                 'value' => $this->report->overallTotal->creditBalance ?? '',
             ],
             [
-                'label' => 'Net Cash Change',
+                'label' => 'Net Cash Flow',
                 'value' => $this->report->overallTotal->netMovement ?? '',
             ],
         ];
     }
 
-    public function getSummaryAlignedWithColumns(): array
+    public function getOverviewAlignedWithColumns(): array
     {
         $summary = [];
 
@@ -220,6 +220,72 @@ class CashFlowStatementReportTransformer extends SummaryReportTransformer
         return $summary;
     }
 
+    public function getSummaryOverviewAlignedWithColumns(): array
+    {
+        return array_map(static function ($row) {
+            unset($row['account_code']);
+
+            return $row;
+        }, $this->getOverviewAlignedWithColumns());
+    }
+
+    public function getCashInflowAndOutflowHeaders(): array
+    {
+        return once(function (): array {
+            $headers = [];
+
+            $dateRange = $this->getStartDate() && $this->getEndDate()
+                ? "{$this->getStartDate()} - {$this->getEndDate()}"
+                : '';
+
+            foreach ($this->getColumns() as $column) {
+                $headers[$column->getName()] = match ($column->getName()) {
+                    'account_name' => 'CASH INFLOWS AND OUTFLOWS',
+                    'net_movement' => $dateRange,
+                    default => '',
+                };
+            }
+
+            return $headers;
+        });
+    }
+
+    public function getSummaryCashInflowAndOutflowHeaders(): array
+    {
+        return once(function (): array {
+            $headers = $this->getCashInflowAndOutflowHeaders();
+
+            // Remove the account_code key if it exists
+            unset($headers['account_code']);
+
+            return $headers;
+        });
+    }
+
+    public function getOverviewHeaders(): array
+    {
+        return once(function (): array {
+            $headers = [];
+
+            foreach ($this->getColumns() as $column) {
+                $headers[$column->getName()] = $column->getName() === 'account_name' ? 'OVERVIEW' : '';
+            }
+
+            return $headers;
+        });
+    }
+
+    public function getSummaryOverviewHeaders(): array
+    {
+        return once(function (): array {
+            $headers = $this->getOverviewHeaders();
+
+            unset($headers['account_code']);
+
+            return $headers;
+        });
+    }
+
     public function getOverview(): array
     {
         $categories = [];
@@ -270,4 +336,31 @@ class CashFlowStatementReportTransformer extends SummaryReportTransformer
 
         return $categories;
     }
+
+    public function getSummaryOverview(): array
+    {
+        $summaryCategories = [];
+
+        $columns = $this->getSummaryColumns();
+
+        foreach ($this->report->overview->categories as $categoryName => $category) {
+            $categorySummary = [];
+
+            foreach ($columns as $column) {
+                $categorySummary[$column->getName()] = match ($column->getName()) {
+                    'account_name' => $categoryName,
+                    'net_movement' => $category->summary->startingBalance ?? $category->summary->endingBalance ?? '',
+                    default => '',
+                };
+            }
+
+            $summaryCategories[] = new ReportCategoryDTO(
+                header: [],
+                data: [],
+                summary: $categorySummary,
+            );
+        }
+
+        return $summaryCategories;
+    }
 }

app/Transformers/IncomeStatementReportTransformer.php

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

config/chart-of-accounts.php

@@ -454,49 +454,4 @@ return [
             ],
         ],
     ],
-
-    'cash_flow' => [
-        'operating_activities' => [
-            'directly_listed' => [
-                'operating_revenue',
-                'uncategorized_revenue',
-                'operating_expense',
-                'non_operating_expense', // e.g., interest expense
-                'uncategorized_expense',
-                'current_asset', // All current assets except for 'Cash and Cash Equivalents'
-            ],
-            'adjustments' => [
-                'types' => [
-                    'contra_asset', // Adjustments like accumulated depreciation
-                    'current_liability', // Changes in accounts like Accounts Payable, Accrued Expenses
-                ],
-            ],
-        ],
-        'investing_activities' => [
-            'directly_listed' => [
-                'non_current_asset', // Purchases or sales of long-term assets
-            ],
-            'adjustments' => [
-                'types' => [
-                    'non_operating_revenue', // Gains or losses on asset sales
-                ],
-            ],
-        ],
-        'financing_activities' => [
-            'directly_listed' => [
-                'equity', // Cash flows from issuing stock, dividends paid
-                'non_current_liability', // Cash flows related to long-term debt
-                'short_term_borrowings', // Proceeds or repayments of short-term loans
-            ],
-        ],
-        'missing_activities' => [
-            'types' => [
-                'contra_liability', // Adjustments, not direct cash flows
-                'contra_equity', // E.g., treasury stock adjustments
-                'contra_revenue', // Sales returns or allowances
-                'contra_expense', // Purchase discounts
-                'Cash and Cash Equivalents', // Only appears in beginning/ending balances
-            ],
-        ],
-    ],
 ];

resources/views/components/company/tables/cell.blade.php

@@ -10,7 +10,7 @@
     @class([
         $alignmentClass,
         'last-of-type:pe-1 sm:last-of-type:pe-3',
-        'ps-3 sm:ps-6' => $indent,
+        'ps-4 sm:first-of-type:ps-7' => $indent,
         'p-0 first-of-type:ps-1 sm:first-of-type:ps-3' => ! $indent,
     ])
 >

resources/views/components/company/tables/footer.blade.php

@@ -5,7 +5,7 @@
     <tr class="bg-gray-50 dark:bg-white/5">
         @foreach($totals as $totalIndex => $totalCell)
             <x-filament-tables::cell class="{{ $alignmentClass($totalIndex) }}">
-                <div class="px-3 py-3 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
+                <div class="px-3 py-3.5 text-sm font-semibold leading-6 text-gray-950 dark:text-white">
                     {{ $totalCell }}
                 </div>
             </x-filament-tables::cell>

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

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

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

@@ -1,5 +1,15 @@
-<table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
-    <x-company.tables.header :headers="$report->getHeaders()" :alignment-class="[$report, 'getAlignmentClass']"/>
+<table class="w-full table-fixed divide-y divide-gray-200 dark:divide-white/5">
+    <colgroup>
+        @if(array_key_exists('account_code', $report->getHeaders()))
+            <col span="1" style="width: 20%;">
+            <col span="1" style="width: 55%;">
+            <col span="1" style="width: 25%;">
+        @else
+            <col span="1" style="width: 65%;">
+            <col span="1" style="width: 35%;">
+        @endif
+    </colgroup>
+    <x-company.tables.header :headers="$report->getTitleHeaders()" :alignment-class="[$report, 'getAlignmentClass']"/>
     @foreach($report->getCategories() as $accountCategory)
         <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
         <x-company.tables.category-header :category-headers="$accountCategory->header"
@@ -7,8 +17,7 @@
         @foreach($accountCategory->data as $categoryAccount)
             <tr>
                 @foreach($categoryAccount as $accountIndex => $categoryAccountCell)
-                    <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountIndex)"
-                                           indent="true">
+                    <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountIndex)">
                         @if(is_array($categoryAccountCell) && isset($categoryAccountCell['name']))
                             @if($categoryAccountCell['name'] === 'Retained Earnings' && isset($categoryAccountCell['start_date']) && isset($categoryAccountCell['end_date']))
                                 <x-filament::link
@@ -53,7 +62,7 @@
             <tr class="bg-gray-50 dark:bg-white/5">
                 @foreach($accountType->header as $accountTypeHeaderIndex => $accountTypeHeaderCell)
                     <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountTypeHeaderIndex)"
-                                           indent="true" bold="true">
+                                           :indent="$accountTypeHeaderIndex === 'account_name'" bold="true">
                         {{ $accountTypeHeaderCell }}
                     </x-company.tables.cell>
                 @endforeach
@@ -62,7 +71,7 @@
                 <tr>
                     @foreach($typeAccount as $accountIndex => $typeAccountCell)
                         <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountIndex)"
-                                               indent="true">
+                                               :indent="$accountIndex === 'account_name'">
                             @if(is_array($typeAccountCell) && isset($typeAccountCell['name']))
                                 @if($typeAccountCell['name'] === 'Retained Earnings' && isset($typeAccountCell['start_date']) && isset($typeAccountCell['end_date']))
                                     <x-filament::link
@@ -106,7 +115,7 @@
             <tr>
                 @foreach($accountType->summary as $accountTypeSummaryIndex => $accountTypeSummaryCell)
                     <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountTypeSummaryIndex)"
-                                           indent="true" bold="true">
+                                           :indent="$accountTypeSummaryIndex === 'account_name'" bold="true">
                         {{ $accountTypeSummaryCell }}
                     </x-company.tables.cell>
                 @endforeach

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

@@ -0,0 +1,71 @@
+<table class="w-full table-fixed divide-y divide-gray-200 dark:divide-white/5">
+    <colgroup>
+        <col span="1" style="width: 65%;">
+        <col span="1" style="width: 35%;">
+    </colgroup>
+    <x-company.tables.header :headers="$report->getSummaryCashInflowAndOutflowHeaders()"
+                             :alignment-class="[$report, 'getAlignmentClass']"/>
+    @foreach($report->getSummaryCategories() as $accountCategory)
+        <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
+        <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-company.tables.cell :alignment-class="$report->getAlignmentClass($accountTypeSummaryIndex)">
+                        {{ $accountTypeSummaryCell }}
+                    </x-company.tables.cell>
+                @endforeach
+            </tr>
+        @endforeach
+        <tr>
+            @foreach($accountCategory->summary as $accountCategorySummaryIndex => $accountCategorySummaryCell)
+                <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountCategorySummaryIndex)"
+                                       bold="true" :underline-bold="$loop->last">
+                    {{ $accountCategorySummaryCell }}
+                </x-company.tables.cell>
+            @endforeach
+        </tr>
+        <tr>
+            <td colspan="{{ count($report->getSummaryHeaders()) }}">
+                <div class="min-h-12"></div>
+            </td>
+        </tr>
+        </tbody>
+    @endforeach
+</table>
+
+<table class="w-full table-fixed divide-y border-t divide-gray-200 dark:divide-white/5">
+    <colgroup>
+        <col span="1" style="width: 65%;">
+        <col span="1" style="width: 35%;">
+    </colgroup>
+    <x-company.tables.header :headers="$report->getSummaryOverviewHeaders()"
+                             :alignment-class="[$report, 'getAlignmentClass']"/>
+    @foreach($report->getSummaryOverview() as $overviewCategory)
+        <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
+        <tr class="bg-gray-50 dark:bg-white/5">
+            @foreach($overviewCategory->summary as $overviewSummaryIndex => $overviewSummaryCell)
+                <x-company.tables.cell :alignment-class="$report->getAlignmentClass($overviewSummaryIndex)" bold="true">
+                    {{ $overviewSummaryCell }}
+                </x-company.tables.cell>
+            @endforeach
+        </tr>
+        @if($overviewCategory->summary['account_name'] === 'Starting Balance')
+            @foreach($report->getSummaryOverviewAlignedWithColumns() as $summaryRow)
+                <tr>
+                    @foreach($summaryRow as $summaryIndex => $summaryCell)
+                        <x-company.tables.cell :alignment-class="$report->getAlignmentClass($summaryIndex)"
+                                               :bold="$loop->parent->last"
+                                               :underline-bold="$loop->parent->last && $summaryIndex === 'net_movement'"
+                                               :underline-thin="$loop->parent->remaining === 1 && $summaryIndex === 'net_movement'"
+                        >
+                            {{ $summaryCell }}
+                        </x-company.tables.cell>
+                    @endforeach
+                </tr>
+            @endforeach
+        @endif
+        </tbody>
+    @endforeach
+</table>

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

@@ -1,5 +1,16 @@
-<table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
-    <x-company.tables.header :headers="$report->getHeaders()" :alignment-class="[$report, 'getAlignmentClass']"/>
+<table class="w-full table-fixed divide-y divide-gray-200 dark:divide-white/5">
+    <colgroup>
+        @if(array_key_exists('account_code', $report->getHeaders()))
+            <col span="1" style="width: 20%;">
+            <col span="1" style="width: 55%;">
+            <col span="1" style="width: 25%;">
+        @else
+            <col span="1" style="width: 65%;">
+            <col span="1" style="width: 35%;">
+        @endif
+    </colgroup>
+    <x-company.tables.header :headers="$report->getCashInflowAndOutflowHeaders()"
+                             :alignment-class="[$report, 'getAlignmentClass']"/>
     @foreach($report->getCategories() as $accountCategory)
         <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
         <x-company.tables.category-header :category-headers="$accountCategory->header"
@@ -7,8 +18,7 @@
         @foreach($accountCategory->data as $categoryAccount)
             <tr>
                 @foreach($categoryAccount as $accountIndex => $categoryAccountCell)
-                    <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountIndex)"
-                                           indent="true">
+                    <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountIndex)">
                         @if(is_array($categoryAccountCell) && isset($categoryAccountCell['name']))
                             @if($categoryAccountCell['name'] === 'Retained Earnings' && isset($categoryAccountCell['start_date']) && isset($categoryAccountCell['end_date']))
                                 <x-filament::link
@@ -53,7 +63,7 @@
             <tr class="bg-gray-50 dark:bg-white/5">
                 @foreach($accountType->header as $accountTypeHeaderIndex => $accountTypeHeaderCell)
                     <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountTypeHeaderIndex)"
-                                           indent="true" bold="true">
+                                           :indent="$accountTypeHeaderIndex === 'account_name'" bold="true">
                         {{ $accountTypeHeaderCell }}
                     </x-company.tables.cell>
                 @endforeach
@@ -62,7 +72,7 @@
                 <tr>
                     @foreach($typeAccount as $accountIndex => $typeAccountCell)
                         <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountIndex)"
-                                               indent="true">
+                                               :indent="$accountIndex === 'account_name'">
                             @if(is_array($typeAccountCell) && isset($typeAccountCell['name']))
                                 @if($typeAccountCell['name'] === 'Retained Earnings' && isset($typeAccountCell['start_date']) && isset($typeAccountCell['end_date']))
                                     <x-filament::link
@@ -106,7 +116,7 @@
             <tr>
                 @foreach($accountType->summary as $accountTypeSummaryIndex => $accountTypeSummaryCell)
                     <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountTypeSummaryIndex)"
-                                           indent="true" bold="true">
+                                           :indent="$accountIndex === 'account_name'" bold="true">
                         {{ $accountTypeSummaryCell }}
                     </x-company.tables.cell>
                 @endforeach
@@ -127,6 +137,22 @@
         </tr>
         </tbody>
     @endforeach
+    <x-company.tables.footer :totals="$report->getOverallTotals()" :alignment-class="[$report, 'getAlignmentClass']"/>
+</table>
+
+<table class="w-full table-fixed divide-y border-t divide-gray-200 dark:divide-white/5">
+    <colgroup>
+        @if(array_key_exists('account_code', $report->getHeaders()))
+            <col span="1" style="width: 20%;">
+            <col span="1" style="width: 55%;">
+            <col span="1" style="width: 25%;">
+        @else
+            <col span="1" style="width: 65%;">
+            <col span="1" style="width: 35%;">
+        @endif
+    </colgroup>
+    <x-company.tables.header :headers="$report->getOverviewHeaders()"
+                             :alignment-class="[$report, 'getAlignmentClass']"/>
     @foreach($report->getOverview() as $overviewCategory)
         <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
         <x-company.tables.category-header :category-headers="$overviewCategory->header"
@@ -169,8 +195,7 @@
             @endforeach
         </tr>
         @if($overviewCategory->header['account_name'] === 'Starting Balance')
-            <!-- Insert Gross Cash Inflow, Gross Cash Outflow, and Net Cash Change here -->
-            @foreach($report->getSummaryAlignedWithColumns() as $summaryRow)
+            @foreach($report->getOverviewAlignedWithColumns() as $summaryRow)
                 <tr>
                     @foreach($summaryRow as $summaryIndex => $summaryCell)
                         <x-company.tables.cell :alignment-class="$report->getAlignmentClass($summaryIndex)"
@@ -186,5 +211,4 @@
         @endif
         </tbody>
     @endforeach
-    <x-company.tables.footer :totals="$report->getOverallTotals()" :alignment-class="[$report, 'getAlignmentClass']"/>
 </table>

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

@@ -1,5 +1,10 @@
-<table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
-    <x-company.tables.header :headers="$report->getSummaryHeaders()" :alignment-class="[$report, 'getAlignmentClass']"/>
+<table class="w-full table-fixed divide-y divide-gray-200 dark:divide-white/5">
+    <colgroup>
+        <col span="1" style="width: 65%;">
+        <col span="1" style="width: 35%;">
+    </colgroup>
+    <x-company.tables.header :headers="$report->getSummaryTitleHeaders()"
+                             :alignment-class="[$report, 'getAlignmentClass']"/>
     @foreach($report->getSummaryCategories() as $accountCategory)
         <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
         <tr>
@@ -13,11 +18,9 @@
         @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="{{ $report->getAlignmentClass($grossProfitIndex) }}">
-                        <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
-                            {{ $grossProfitCell }}
-                        </div>
-                    </x-filament-tables::cell>
+                    <x-company.tables.cell :alignment-class="$report->getAlignmentClass($grossProfitIndex)" bold="true">
+                        {{ $grossProfitCell }}
+                    </x-company.tables.cell>
                 @endforeach
             </tr>
         @endif

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

@@ -0,0 +1,77 @@
+<table class="w-full table-fixed divide-y divide-gray-200 dark:divide-white/5">
+    <colgroup>
+        @if(array_key_exists('account_code', $report->getHeaders()))
+            <col span="1" style="width: 20%;">
+            <col span="1" style="width: 55%;">
+            <col span="1" style="width: 25%;">
+        @else
+            <col span="1" style="width: 65%;">
+            <col span="1" style="width: 35%;">
+        @endif
+    </colgroup>
+    <x-company.tables.header :headers="$report->getTitleHeaders()" :alignment-class="[$report, 'getAlignmentClass']"/>
+    @foreach($report->getCategories() as $accountCategory)
+        <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
+        <x-company.tables.category-header :category-headers="$accountCategory->header"
+                                          :alignment-class="[$report, 'getAlignmentClass']"/>
+        @foreach($accountCategory->data as $categoryAccount)
+            <tr>
+                @foreach($categoryAccount as $accountIndex => $categoryAccountCell)
+                    <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountIndex)">
+                        @if(is_array($categoryAccountCell) && isset($categoryAccountCell['name']))
+                            @if($categoryAccountCell['name'] === 'Retained Earnings' && isset($categoryAccountCell['start_date']) && isset($categoryAccountCell['end_date']))
+                                <x-filament::link
+                                    color="primary"
+                                    target="_blank"
+                                    icon="heroicon-o-arrow-top-right-on-square"
+                                    :icon-position="\Filament\Support\Enums\IconPosition::After"
+                                    :icon-size="\Filament\Support\Enums\IconSize::Small"
+                                    href="{{ \App\Filament\Company\Pages\Reports\IncomeStatement::getUrl([
+                                            'startDate' => $categoryAccountCell['start_date'],
+                                            'endDate' => $categoryAccountCell['end_date']
+                                        ]) }}"
+                                >
+                                    {{ $categoryAccountCell['name'] }}
+                                </x-filament::link>
+                            @elseif(isset($categoryAccountCell['id']) && isset($categoryAccountCell['start_date']) && isset($categoryAccountCell['end_date']))
+                                <x-filament::link
+                                    color="primary"
+                                    target="_blank"
+                                    icon="heroicon-o-arrow-top-right-on-square"
+                                    :icon-position="\Filament\Support\Enums\IconPosition::After"
+                                    :icon-size="\Filament\Support\Enums\IconSize::Small"
+                                    href="{{ \App\Filament\Company\Pages\Reports\AccountTransactions::getUrl([
+                                            'startDate' => $categoryAccountCell['start_date'],
+                                            'endDate' => $categoryAccountCell['end_date'],
+                                            'selectedAccount' => $categoryAccountCell['id']
+                                        ]) }}"
+                                >
+                                    {{ $categoryAccountCell['name'] }}
+                                </x-filament::link>
+                            @else
+                                {{ $categoryAccountCell['name'] }}
+                            @endif
+                        @else
+                            {{ $categoryAccountCell }}
+                        @endif
+                    </x-company.tables.cell>
+                @endforeach
+            </tr>
+        @endforeach
+        <tr>
+            @foreach($accountCategory->summary as $accountCategorySummaryIndex => $accountCategorySummaryCell)
+                <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountCategorySummaryIndex)"
+                                       bold="true">
+                    {{ $accountCategorySummaryCell }}
+                </x-company.tables.cell>
+            @endforeach
+        </tr>
+        <tr>
+            <td colspan="{{ count($report->getHeaders()) }}">
+                <div class="min-h-12"></div>
+            </td>
+        </tr>
+        </tbody>
+    @endforeach
+    <x-company.tables.footer :totals="$report->getOverallTotals()" :alignment-class="[$report, 'getAlignmentClass']"/>
+</table>

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

@@ -31,15 +31,15 @@
                         <div class="text-gray-600 font-medium mb-2">{{ $summary['label'] }}</div>
 
                         @php
-                            $isNetEarnings = $summary['label'] === 'Net Earnings';
+                            $isNetCashFlow = $summary['label'] === 'Net Cash Flow';
                             $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,
+                                'text-green-700' => $isNetCashFlow && $isPositive,
+                                'text-danger-700' => $isNetCashFlow && ! $isPositive,
                             ])
                         >
                             {{ $summary['value'] }}
@@ -77,7 +77,7 @@
     <x-company.tables.container :report-loaded="$this->reportLoaded">
         @if($this->report)
             @if($activeTab === 'summary')
-                <x-company.tables.reports.income-statement-summary :report="$this->report"/>
+                <x-company.tables.reports.cash-flow-statement-summary :report="$this->report"/>
             @elseif($activeTab === 'details')
                 <x-company.tables.reports.cash-flow-statement :report="$this->report"/>
             @endif

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

@@ -79,7 +79,7 @@
             @if($activeTab === 'summary')
                 <x-company.tables.reports.income-statement-summary :report="$this->report"/>
             @elseif($activeTab === 'details')
-                <x-company.tables.reports.detailed-report :report="$this->report"/>
+                <x-company.tables.reports.income-statement :report="$this->report"/>
             @endif
         @endif
     </x-company.tables.container>