wip

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

@@ -11,6 +11,7 @@ use App\Transformers\IncomeStatementReportTransformer;
 use Filament\Forms\Form;
 use Filament\Support\Enums\Alignment;
 use Guava\FilamentClusters\Forms\Cluster;
+use Livewire\Attributes\Url;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class IncomeStatement extends BaseReportPage
@@ -25,6 +26,9 @@ class IncomeStatement extends BaseReportPage
 
     protected ExportService $exportService;
 
+    #[Url]
+    public ?string $activeTab = 'summary';
+
     public function boot(ReportService $reportService, ExportService $exportService): void
     {
         $this->reportService = $reportService;

app/Transformers/IncomeStatementReportTransformer.php

@@ -5,14 +5,15 @@ namespace App\Transformers;
 use App\DTO\AccountDTO;
 use App\DTO\ReportCategoryDTO;
 use App\Support\Column;
+use App\Utilities\Currency\CurrencyAccessor;
 
 class IncomeStatementReportTransformer extends BaseReportTransformer
 {
-    protected string $totalRevenue = '$0.00';
+    protected string $totalRevenue = '0';
 
-    protected string $totalCogs = '$0.00';
+    protected string $totalCogs = '0';
 
-    protected string $totalExpenses = '$0.00';
+    protected string $totalExpenses = '0';
 
     public function getTitle(): string
     {
@@ -91,6 +92,92 @@ class IncomeStatementReportTransformer extends BaseReportTransformer
         return $categories;
     }
 
+    public function getSummaryCategories(): array
+    {
+        $summaryCategories = [];
+
+        $columns = [
+            'account_name',
+            'net_movement',
+        ];
+
+        foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
+            // Header for the main category
+            $categoryHeader = [];
+
+            foreach ($columns as $index => $column) {
+                $categoryHeader[$index] = $column === 'account_name' ? $accountCategoryName : '';
+            }
+
+            // Category-level summary
+            $categorySummary = [];
+            foreach ($columns as $column) {
+                $categorySummary[] = match ($column) {
+                    'account_name' => $accountCategoryName,
+                    'net_movement' => $accountCategory->summary->netMovement ?? '',
+                    default => '',
+                };
+            }
+
+            // Add the category summary to the final array
+            $summaryCategories[$accountCategoryName] = new ReportCategoryDTO(
+                header: $categoryHeader,
+                data: [], // No direct accounts are needed here, only summaries
+                summary: $categorySummary,
+                types: [] // No types for the income statement
+            );
+        }
+
+        return $summaryCategories;
+    }
+
+    public function getGrossProfit(): array
+    {
+        $this->calculateTotals();
+
+        $grossProfit = [];
+
+        $columns = [
+            'account_name',
+            'net_movement',
+        ];
+
+        $revenue = money($this->totalRevenue, CurrencyAccessor::getDefaultCurrency())->getAmount();
+        $cogs = money($this->totalCogs, CurrencyAccessor::getDefaultCurrency())->getAmount();
+
+        $grossProfitAmount = $revenue - $cogs;
+        $grossProfitFormatted = money($grossProfitAmount, CurrencyAccessor::getDefaultCurrency(), true)->format();
+
+        foreach ($columns as $column) {
+            $grossProfit[] = match ($column) {
+                'account_name' => 'Gross Profit',
+                'net_movement' => $grossProfitFormatted,
+                default => '',
+            };
+        }
+
+        return $grossProfit;
+    }
+
+    public function getSummaryTotals(): array
+    {
+        $totals = [];
+        $columns = [
+            'account_name',
+            'net_movement',
+        ];
+
+        foreach ($columns as $column) {
+            $totals[] = match ($column) {
+                'account_name' => 'Net Earnings',
+                'net_movement' => $this->report->overallTotal->netMovement ?? '',
+                default => '',
+            };
+        }
+
+        return $totals;
+    }
+
     public function getOverallTotals(): array
     {
         $totals = [];

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.324.5",
+            "version": "3.324.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "052c5d429ccd8775f7eed2855c2ca8cae2be52cb"
+                "reference": "7412a44da62fd607efbaac4084e69d6621f29de1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/052c5d429ccd8775f7eed2855c2ca8cae2be52cb",
-                "reference": "052c5d429ccd8775f7eed2855c2ca8cae2be52cb",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7412a44da62fd607efbaac4084e69d6621f29de1",
+                "reference": "7412a44da62fd607efbaac4084e69d6621f29de1",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.324.5"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.324.6"
             },
-            "time": "2024-10-17T18:12:04+00:00"
+            "time": "2024-10-18T18:06:33+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -3627,16 +3627,16 @@
         },
         {
             "name": "league/csv",
-            "version": "9.17.0",
+            "version": "9.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/csv.git",
-                "reference": "8cab815fb11ec93aa2f7b8a57b3daa1f1a364011"
+                "reference": "b02d010e4055ae992247f6ffd1e7b103ef2a0790"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/csv/zipball/8cab815fb11ec93aa2f7b8a57b3daa1f1a364011",
-                "reference": "8cab815fb11ec93aa2f7b8a57b3daa1f1a364011",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/b02d010e4055ae992247f6ffd1e7b103ef2a0790",
+                "reference": "b02d010e4055ae992247f6ffd1e7b103ef2a0790",
                 "shasum": ""
             },
             "require": {
@@ -3648,11 +3648,11 @@
                 "ext-xdebug": "*",
                 "friendsofphp/php-cs-fixer": "^3.64.0",
                 "phpbench/phpbench": "^1.3.1",
-                "phpstan/phpstan": "^1.12.5",
+                "phpstan/phpstan": "^1.12.6",
                 "phpstan/phpstan-deprecation-rules": "^1.2.1",
                 "phpstan/phpstan-phpunit": "^1.4.0",
                 "phpstan/phpstan-strict-rules": "^1.6.1",
-                "phpunit/phpunit": "^10.5.16 || ^11.4.0",
+                "phpunit/phpunit": "^10.5.16 || ^11.4.1",
                 "symfony/var-dumper": "^6.4.8 || ^7.1.5"
             },
             "suggest": {
@@ -3710,7 +3710,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-10-10T10:30:28+00:00"
+            "time": "2024-10-18T08:14:48+00:00"
         },
         {
             "name": "league/flysystem",
@@ -10783,16 +10783,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.6",
+            "version": "1.12.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae"
+                "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc4d2f145a88ea7141ae698effd64d9df46527ae",
-                "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc2b9976bd8b0f84ec9b0e50cc35378551de7af0",
+                "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0",
                 "shasum": ""
             },
             "require": {
@@ -10837,7 +10837,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-10-06T15:03:59+00:00"
+            "time": "2024-10-18T11:12:07+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -11264,16 +11264,16 @@
         },
         {
             "name": "rector/rector",
-            "version": "1.2.7",
+            "version": "1.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "5b33bdd871895276e2c18e5410a4a57df9233ee0"
+                "reference": "05755bf43617449c08ee8e50fb840c85ad3b1240"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/5b33bdd871895276e2c18e5410a4a57df9233ee0",
-                "reference": "5b33bdd871895276e2c18e5410a4a57df9233ee0",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/05755bf43617449c08ee8e50fb840c85ad3b1240",
+                "reference": "05755bf43617449c08ee8e50fb840c85ad3b1240",
                 "shasum": ""
             },
             "require": {
@@ -11311,7 +11311,7 @@
             ],
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/1.2.7"
+                "source": "https://github.com/rectorphp/rector/tree/1.2.8"
             },
             "funding": [
                 {
@@ -11319,7 +11319,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-10-12T11:12:46+00:00"
+            "time": "2024-10-18T11:54:27+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -11493,16 +11493,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "6.1.0",
+            "version": "6.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "fa37b9e2ca618cb051d71b60120952ee8ca8b03d"
+                "reference": "5ef523a49ae7a302b87b2102b72b1eda8918d686"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa37b9e2ca618cb051d71b60120952ee8ca8b03d",
-                "reference": "fa37b9e2ca618cb051d71b60120952ee8ca8b03d",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5ef523a49ae7a302b87b2102b72b1eda8918d686",
+                "reference": "5ef523a49ae7a302b87b2102b72b1eda8918d686",
                 "shasum": ""
             },
             "require": {
@@ -11558,7 +11558,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
                 "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/6.1.0"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/6.1.1"
             },
             "funding": [
                 {
@@ -11566,7 +11566,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-11T15:42:56+00:00"
+            "time": "2024-10-18T15:00:48+00:00"
         },
         {
             "name": "sebastian/complexity",

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

@@ -18,7 +18,7 @@
         <tr class="bg-gray-50 dark:bg-white/5">
             @foreach($accountCategory->header as $accountCategoryHeaderIndex => $accountCategoryHeaderCell)
                 <x-filament-tables::cell class="{{ $accountCategoryHeaderIndex === 0 ? 'text-left' : 'text-right' }}">
-                    <div class="px-3 py-2 text-sm font-semibold text-gray-950 dark:text-white">
+                    <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
                         {{ $accountCategoryHeaderCell }}
                     </div>
                 </x-filament-tables::cell>

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

@@ -5,7 +5,7 @@
         <tr class="bg-gray-50 dark:bg-white/5">
             @foreach($accountCategory->header as $accountCategoryHeaderIndex => $accountCategoryHeaderCell)
                 <x-filament-tables::cell class="{{ $report->getAlignmentClass($accountCategoryHeaderIndex) }}">
-                    <div class="px-3 py-3 leading-6 text-sm font-semibold text-gray-950 dark:text-white">
+                    <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
                         {{ $accountCategoryHeaderCell }}
                     </div>
                 </x-filament-tables::cell>
@@ -63,7 +63,7 @@
                 @foreach($accountType->header as $accountTypeHeaderIndex => $accountTypeHeaderCell)
                     <x-filament-tables::cell class="{{ $report->getAlignmentClass($accountTypeHeaderIndex) }}"
                                              style="padding-left: 1.5rem;">
-                        <div class="px-3 py-3 leading-6 text-sm font-semibold text-gray-950 dark:text-white">
+                        <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
                             {{ $accountTypeHeaderCell }}
                         </div>
                     </x-filament-tables::cell>

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

@@ -15,7 +15,7 @@
         <tr class="bg-gray-50 dark:bg-white/5">
             @foreach($category->header as $headerIndex => $header)
                 <x-filament-tables::cell class="{{ $report->getAlignmentClass($headerIndex) }}">
-                    <div class="px-3 py-2 text-sm font-semibold text-gray-950 dark:text-white">
+                    <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
                         {{ $header }}
                     </div>
                 </x-filament-tables::cell>

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

@@ -0,0 +1,54 @@
+<table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
+    <thead class="divide-y divide-gray-200 dark:divide-white/5">
+    <tr class="bg-gray-50 dark:bg-white/5">
+        <th class="px-3 py-3.5 sm:first-of-type:ps-6 sm:last-of-type:pe-6 text-left">
+            <span class="text-sm font-semibold text-gray-950 dark:text-white">
+                Accounts
+            </span>
+        </th>
+        <th class="px-3 py-3.5 sm:first-of-type:ps-6 sm:last-of-type:pe-6 text-right">
+            <span class="text-sm font-semibold text-gray-950 dark:text-white">
+                Amount
+            </span>
+        </th>
+    </tr>
+    </thead>
+    @foreach($report->getSummaryCategories() as $accountCategory)
+        <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
+        <tr>
+            @foreach($accountCategory->summary as $accountCategorySummaryIndex => $accountCategorySummaryCell)
+                <x-filament-tables::cell class="{{ $accountCategorySummaryIndex === 0 ? 'text-left' : 'text-right' }}">
+                    <div class="px-3 py-2 text-sm leading-6 font-normal text-gray-950 dark:text-white">
+                        {{ $accountCategorySummaryCell }}
+                    </div>
+                </x-filament-tables::cell>
+            @endforeach
+        </tr>
+
+        @if($accountCategory->header[0] === 'Cost of Goods Sold')
+            <tr class="bg-gray-50 dark:bg-white/5">
+                @foreach($report->getGrossProfit() as $grossProfitIndex => $grossProfitCell)
+                    <x-filament-tables::cell class="{{ $grossProfitIndex === 0 ? 'text-left' : 'text-right' }}">
+                        <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
+                            {{ $grossProfitCell }}
+                        </div>
+                    </x-filament-tables::cell>
+                @endforeach
+            </tr>
+        @endif
+        </tbody>
+    @endforeach
+    @if(! empty($report->getOverallTotals()))
+        <tfoot>
+        <tr class="bg-gray-50 dark:bg-white/5">
+            @foreach($report->getSummaryTotals() as $index => $total)
+                <x-filament-tables::cell class="{{ $index === 0 ? 'text-left' : 'text-right' }}">
+                    <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
+                        {{ $total }}
+                    </div>
+                </x-filament-tables::cell>
+            @endforeach
+        </tr>
+        </tfoot>
+    @endif
+</table>

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

@@ -58,9 +58,29 @@
         @endif
     </x-filament::section>
 
+    <x-filament::tabs>
+        <x-filament::tabs.item
+            :active="$activeTab === 'summary'"
+            wire:click="$set('activeTab', 'summary')"
+        >
+            Summary
+        </x-filament::tabs.item>
+
+        <x-filament::tabs.item
+            :active="$activeTab === 'details'"
+            wire:click="$set('activeTab', 'details')"
+        >
+            Details
+        </x-filament::tabs.item>
+    </x-filament::tabs>
+
     <x-company.tables.container :report-loaded="$this->reportLoaded">
         @if($this->report)
-            <x-company.tables.reports.detailed-report :report="$this->report"/>
+            @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"/>
+            @endif
         @endif
     </x-company.tables.container>
 </x-filament-panels::page>