account transactions report wip

app/Contracts/ExportableReport.php

@@ -18,4 +18,6 @@ interface ExportableReport
     public function getOverallTotals(): array;
 
     public function getColumns(): array;
+
+    public function getPdfView(): string;
 }

app/DTO/ReportCategoryDTO.php

@@ -7,6 +7,6 @@ class ReportCategoryDTO
     public function __construct(
         public array $header,
         public array $data,
-        public array $summary,
+        public array $summary = [],
     ) {}
 }

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

@@ -178,6 +178,11 @@ abstract class BaseReportPage extends Page
             ->statePath('toggledTableColumns');
     }
 
+    protected function hasToggleableColumns(): bool
+    {
+        return ! empty($this->getTableColumnToggleFormSchema());
+    }
+
     /**
      * @return array<Checkbox>
      */

app/Services/ExportService.php

@@ -10,7 +10,7 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class ExportService
 {
-    public function exportToCsv(Company $company, ExportableReport $report, string $startDate, string $endDate): StreamedResponse
+    public function exportToCsv(Company $company, ExportableReport $report, string $startDate, string $endDate, bool $separateCategoryHeaders = false): StreamedResponse
     {
         $formattedStartDate = Carbon::parse($startDate)->format('Y-m-d');
         $formattedEndDate = Carbon::parse($endDate)->format('Y-m-d');
@@ -24,7 +24,7 @@ class ExportService
             'Content-Disposition' => 'attachment; filename="' . $filename . '"',
         ];
 
-        $callback = function () use ($report, $company, $formattedStartDate, $formattedEndDate) {
+        $callback = function () use ($report, $company, $formattedStartDate, $formattedEndDate, $separateCategoryHeaders) {
             $file = fopen('php://output', 'wb');
 
             fputcsv($file, [$report->getTitle()]);
@@ -35,17 +35,28 @@ class ExportService
             fputcsv($file, $report->getHeaders());
 
             foreach ($report->getCategories() as $category) {
-                fputcsv($file, $category->header);
+                if (isset($category->header[0]) && is_array($category->header[0])) {
+                    foreach ($category->header as $headerRow) {
+                        fputcsv($file, $headerRow);
+                    }
+                } else {
+                    fputcsv($file, $category->header);
+                }
 
                 foreach ($category->data as $accountRow) {
                     fputcsv($file, $accountRow);
                 }
 
-                fputcsv($file, $category->summary);
+                if (filled($category->summary)) {
+                    fputcsv($file, $category->summary);
+                }
+
                 fputcsv($file, []); // Empty row for spacing
             }
 
-            fputcsv($file, $report->getOverallTotals());
+            if (filled($report->getOverallTotals())) {
+                fputcsv($file, $report->getOverallTotals());
+            }
 
             fclose($file);
         };
@@ -62,7 +73,7 @@ class ExportService
 
         $filename = $company->name . ' ' . $report->getTitle() . ' ' . $formattedStartDate . ' to ' . $formattedEndDate . ' ' . $timestamp . '.pdf';
 
-        $pdf = Pdf::loadView('components.company.reports.report-pdf', [
+        $pdf = Pdf::loadView($report->getPdfView(), [
             'company' => $company,
             'report' => $report,
             'startDate' => Carbon::parse($startDate)->format('M d, Y'),

app/Services/ReportService.php

@@ -9,7 +9,6 @@ use App\DTO\AccountTransactionDTO;
 use App\DTO\ReportDTO;
 use App\Enums\Accounting\AccountCategory;
 use App\Models\Accounting\Account;
-use App\Models\Accounting\JournalEntry;
 use App\Support\Column;
 use App\Utilities\Currency\CurrencyAccessor;
 use Illuminate\Database\Eloquent\Builder;
@@ -173,7 +172,7 @@ class ReportService
 
             $reportCategories[] = [
                 'category' => $account->name,
-                'under' => 'Under: ' . $account->category->getLabel() . ' > ' . $account->subtype->name,
+                'under' => $account->category->getLabel() . ' > ' . $account->subtype->name,
                 'transactions' => $accountTransactions,
             ];
         }

app/Transformers/AccountTransactionReportTransformer.php

@@ -2,13 +2,17 @@
 
 namespace App\Transformers;
 
-use App\DTO\AccountDTO;
 use App\DTO\AccountTransactionDTO;
 use App\DTO\ReportCategoryDTO;
 use App\Support\Column;
 
 class AccountTransactionReportTransformer extends BaseReportTransformer
 {
+    public function getPdfView(): string
+    {
+        return 'components.company.reports.account-transactions-report-pdf';
+    }
+
     public function getTitle(): string
     {
         return 'Account Transactions';
@@ -28,17 +32,19 @@ class AccountTransactionReportTransformer extends BaseReportTransformer
 
         foreach ($this->report->categories as $categoryData) {
             // Initialize header with account and category information
+
             $header = [
-                [
-                    'column' => 'category',
-                    'value' => $categoryData['category'],
-                ],
-                [
-                    'column' => 'under',
-                    'value' => $categoryData['under'],
-                ],
+                array_fill(0, count($this->getColumns()), ''),
+                array_fill(0, count($this->getColumns()), ''),
             ];
 
+            foreach ($this->getColumns() as $index => $column) {
+                if ($column->getName() === 'date') {
+                    $header[0][$index] = $categoryData['category'];
+                    $header[1][$index] = $categoryData['under'];
+                }
+            }
+
             // Map transaction data
             $data = array_map(function (AccountTransactionDTO $transaction) {
                 $row = [];
@@ -57,17 +63,9 @@ class AccountTransactionReportTransformer extends BaseReportTransformer
                 return $row;
             }, $categoryData['transactions']);
 
-            // Extract summary from the last transaction if it's "Totals and Ending Balance"
-            $summary = [];
-            if (count($data) > 1) {
-                $summaryTransaction = end($data);
-                $summary = array_slice($summaryTransaction, 1); // Skip the first element, which is the date
-            }
-
             $categories[] = new ReportCategoryDTO(
                 header: $header,
                 data: $data,
-                summary: $summary
             );
         }
 

app/Transformers/BaseReportTransformer.php

@@ -21,6 +21,11 @@ abstract class BaseReportTransformer implements ExportableReport, Wireable
         return $this->report->fields;
     }
 
+    public function getPdfView(): string
+    {
+        return 'components.company.reports.report-pdf';
+    }
+
     public function getAlignmentClass(int $index): string
     {
         $column = $this->getColumns()[$index];

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.315.4",
+            "version": "3.315.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "8d2cf34e22262b983ce3d7e38d11667c5792b93f"
+                "reference": "3e6d619d45d8e1a8681dd58de61ddfe90e8341e6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8d2cf34e22262b983ce3d7e38d11667c5792b93f",
-                "reference": "8d2cf34e22262b983ce3d7e38d11667c5792b93f",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3e6d619d45d8e1a8681dd58de61ddfe90e8341e6",
+                "reference": "3e6d619d45d8e1a8681dd58de61ddfe90e8341e6",
                 "shasum": ""
             },
             "require": {
@@ -586,9 +586,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.315.4"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.315.5"
             },
-            "time": "2024-07-02T18:09:03+00:00"
+            "time": "2024-07-03T18:12:51+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -4401,16 +4401,16 @@
         },
         {
             "name": "livewire/livewire",
-            "version": "v3.5.1",
+            "version": "v3.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/livewire/livewire.git",
-                "reference": "da044261bb5c5449397f18fda3409f14acf47c0a"
+                "reference": "636725c1f87bc7844dd80277488268db27eec1aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/da044261bb5c5449397f18fda3409f14acf47c0a",
-                "reference": "da044261bb5c5449397f18fda3409f14acf47c0a",
+                "url": "https://api.github.com/repos/livewire/livewire/zipball/636725c1f87bc7844dd80277488268db27eec1aa",
+                "reference": "636725c1f87bc7844dd80277488268db27eec1aa",
                 "shasum": ""
             },
             "require": {
@@ -4465,7 +4465,7 @@
             "description": "A front-end framework for Laravel.",
             "support": {
                 "issues": "https://github.com/livewire/livewire/issues",
-                "source": "https://github.com/livewire/livewire/tree/v3.5.1"
+                "source": "https://github.com/livewire/livewire/tree/v3.5.2"
             },
             "funding": [
                 {
@@ -4473,7 +4473,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-06-18T11:10:42+00:00"
+            "time": "2024-07-03T17:22:45+00:00"
         },
         {
             "name": "masterminds/html5",
@@ -10816,16 +10816,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.24",
+            "version": "10.5.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "5f124e3e3e561006047b532fd0431bf5bb6b9015"
+                "reference": "831bf82312be6037e811833ddbea0b8de60ea314"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5f124e3e3e561006047b532fd0431bf5bb6b9015",
-                "reference": "5f124e3e3e561006047b532fd0431bf5bb6b9015",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/831bf82312be6037e811833ddbea0b8de60ea314",
+                "reference": "831bf82312be6037e811833ddbea0b8de60ea314",
                 "shasum": ""
             },
             "require": {
@@ -10897,7 +10897,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.24"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.25"
             },
             "funding": [
                 {
@@ -10913,7 +10913,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-20T13:09:54+00:00"
+            "time": "2024-07-03T05:49:17+00:00"
         },
         {
             "name": "rector/rector",
@@ -12272,16 +12272,16 @@
         },
         {
             "name": "spatie/laravel-ray",
-            "version": "1.36.3",
+            "version": "1.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-ray.git",
-                "reference": "9becea4bf279d9bc5e11f89ef36894239d2be60e"
+                "reference": "f57b294a3815be37effa9d13f54f2fbe5a2fff37"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-ray/zipball/9becea4bf279d9bc5e11f89ef36894239d2be60e",
-                "reference": "9becea4bf279d9bc5e11f89ef36894239d2be60e",
+                "url": "https://api.github.com/repos/spatie/laravel-ray/zipball/f57b294a3815be37effa9d13f54f2fbe5a2fff37",
+                "reference": "f57b294a3815be37effa9d13f54f2fbe5a2fff37",
                 "shasum": ""
             },
             "require": {
@@ -12343,7 +12343,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-ray/issues",
-                "source": "https://github.com/spatie/laravel-ray/tree/1.36.3"
+                "source": "https://github.com/spatie/laravel-ray/tree/1.37.0"
             },
             "funding": [
                 {
@@ -12355,7 +12355,7 @@
                     "type": "other"
                 }
             ],
-            "time": "2024-07-02T13:33:54+00:00"
+            "time": "2024-07-03T08:48:44+00:00"
         },
         {
             "name": "spatie/macroable",

package-lock.json

@@ -931,9 +931,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001639",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001639.tgz",
-            "integrity": "sha512-eFHflNTBIlFwP2AIKaYuBQN/apnUoKNhBdza8ZnW/h2di4LCZ4xFqYlxUxo+LQ76KFI1PGcC1QDxMbxTZpSCAg==",
+            "version": "1.0.30001640",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001640.tgz",
+            "integrity": "sha512-lA4VMpW0PSUrFnkmVuEKBUovSWKhj7puyCg8StBChgu298N1AtuF1sKWEvfDuimSEDbhlb/KqPKC3fs1HbuQUA==",
             "dev": true,
             "funding": [
                 {
@@ -2375,13 +2375,13 @@
             "dev": true
         },
         "node_modules/vite": {
-            "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.2.tgz",
-            "integrity": "sha512-6lA7OBHBlXUxiJxbO5aAY2fsHHzDr1q7DvXYnyZycRs2Dz+dXBWuhpWHvmljTRTpQC2uvGmUFFkSHF2vGo90MA==",
+            "version": "5.3.3",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.3.tgz",
+            "integrity": "sha512-NPQdeCU0Dv2z5fu+ULotpuq5yfCS1BzKUIPhNbP3YBfAMGJXbt2nS+sbTFu+qchaqWTD+H3JK++nRwr6XIcp6A==",
             "dev": true,
             "dependencies": {
                 "esbuild": "^0.21.3",
-                "postcss": "^8.4.38",
+                "postcss": "^8.4.39",
                 "rollup": "^4.13.0"
             },
             "bin": {

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

@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{{ $report->getTitle() }}</title>
+    <style>
+        @page {
+            size: auto;
+            margin: 10mm 7.5mm;
+        }
+
+        .header {
+            color: #374151;
+            margin-bottom: 1rem;
+        }
+
+        .header > * + * {
+            margin-top: 0.5rem;
+        }
+
+        .table-head {
+            display: table-row-group;
+        }
+
+        .text-left {
+            text-align: left;
+        }
+
+        .text-right {
+            text-align: right;
+        }
+
+        .text-center {
+            text-align: center;
+        }
+
+        .table-class th,
+        .table-class td {
+            color: #374151;
+        }
+
+        .title {
+            font-size: 1.5rem;
+        }
+
+        .company-name {
+            font-size: 1.125rem;
+            font-weight: 600;
+        }
+
+        .date-range {
+            font-size: 0.875rem;
+        }
+
+        .table-class {
+            width: 100%;
+            border-collapse: collapse;
+        }
+
+        .table-class th,
+        .table-class td {
+            padding: 0.75rem;
+            font-size: 0.75rem;
+            line-height: 1rem;
+            border-bottom: 1px solid #d1d5db; /* Gray border for all rows */
+        }
+
+        .category-header-row > td {
+            background-color: #f3f4f6; /* Gray background for category names */
+            font-weight: 600;
+        }
+
+        .table-body tr {
+            background-color: #ffffff; /* White background for other rows */
+        }
+
+        .spacer-row > td {
+            height: 0.75rem;
+        }
+
+        .category-summary-row > td,
+        .table-footer-row > td {
+            font-weight: 600;
+            background-color: #ffffff; /* White background for footer */
+        }
+    </style>
+</head>
+<body>
+<div class="header">
+    <div class="title">{{ $report->getTitle() }}</div>
+    <div class="company-name">{{ $company->name }}</div>
+    <div class="date-range">Date Range: {{ $startDate }} to {{ $endDate }}</div>
+</div>
+<table class="table-class">
+    <thead class="table-head">
+    <tr>
+        @foreach($report->getHeaders() as $index => $header)
+            <th class="{{ $report->getAlignmentClass($index) }}">
+                {{ $header }}
+            </th>
+        @endforeach
+    </tr>
+    </thead>
+    @foreach($report->getCategories() as $category)
+        <tbody>
+        <tr class="category-header-row">
+            <td colspan="{{ count($report->getHeaders()) }}">
+                <div>
+                    @foreach($category->header as $headerRow)
+                        <div>
+                            @foreach($headerRow as $headerValue)
+                                @if (!empty($headerValue))
+                                    {{ $headerValue }}
+                                @endif
+                            @endforeach
+                        </div>
+                    @endforeach
+                </div>
+            </td>
+        </tr>
+        @foreach($category->data as $dataIndex => $transaction)
+            <tr
+                @class([
+                    'category-header-row' => $loop->first || $loop->last || $loop->remaining === 1,
+                ])>
+                @foreach($transaction as $cellIndex => $cell)
+                    <td class="{{ $report->getAlignmentClass($cellIndex) }}">
+                        {{ $cell }}
+                    </td>
+                @endforeach
+            </tr>
+        @endforeach
+        @unless($loop->last)
+            <tr class="spacer-row">
+                <td colspan="{{ count($report->getHeaders()) }}"></td>
+            </tr>
+        @endunless
+        </tbody>
+    @endforeach
+</table>
+</body>
+</html>

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

@@ -16,12 +16,15 @@
             <tr class="bg-gray-50 dark:bg-white/5">
                 <x-filament-tables::cell colspan="{{ count($report->getHeaders()) }}" class="text-left">
                     <div class="px-3 py-2">
-                        <div class="text-sm font-semibold text-gray-950 dark:text-white">
-                            {{ $category->header[0]['value'] }}
-                        </div>
-                        <div class="text-sm text-gray-700 dark:text-gray-300">
-                            {{ $category->header[1]['value'] }}
-                        </div>
+                        @foreach ($category->header as $headerRow)
+                            <div class="text-sm {{ $loop->first ? 'font-semibold text-gray-950 dark:text-white' : 'text-gray-500 dark:text-white/50' }}">
+                                @foreach ($headerRow as $headerValue)
+                                    @if (!empty($headerValue))
+                                        {{ $headerValue }}
+                                    @endif
+                                @endforeach
+                            </div>
+                        @endforeach
                     </div>
                 </x-filament-tables::cell>
             </tr>
@@ -54,17 +57,4 @@
             @endunless
         </tbody>
     @endforeach
-    @if (filled($report->getOverallTotals()))
-        <tfoot>
-            <tr class="bg-gray-50 dark:bg-white/5">
-                @foreach($report->getOverallTotals() as $index => $total)
-                    <x-filament-tables::cell wire:key="footer-total-{{ $index }}" class="{{ $report->getAlignmentClass($index) }}">
-                        <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/account-transactions.blade.php

@@ -5,11 +5,13 @@
                 <form wire:submit.prevent="loadReportData">
                     <div class="flex flex-col lg:flex-row items-start lg:items-center justify-center gap-4 lg:gap-12">
                         {{ $this->form }}
-                        <x-filament-tables::column-toggle.dropdown
-                            class="my-auto"
-                            :form="$this->toggleTableColumnForm"
-                            :trigger-action="$this->toggleColumnsAction"
-                        />
+                        @if($this->hasToggleableColumns())
+                            <x-filament-tables::column-toggle.dropdown
+                                class="my-auto"
+                                :form="$this->toggleTableColumnForm"
+                                :trigger-action="$this->toggleColumnsAction"
+                            />
+                        @endif
                         <x-filament::button type="submit" class="flex-shrink-0">
                             Update Report
                         </x-filament::button>

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

@@ -5,11 +5,13 @@
                 <form wire:submit.prevent="loadReportData">
                     <div class="flex flex-col lg:flex-row items-start lg:items-center justify-center gap-4 lg:gap-12">
                         {{ $this->form }}
-                        <x-filament-tables::column-toggle.dropdown
-                            class="my-auto"
-                            :form="$this->toggleTableColumnForm"
-                            :trigger-action="$this->toggleColumnsAction"
-                        />
+                        @if($this->hasToggleableColumns())
+                            <x-filament-tables::column-toggle.dropdown
+                                class="my-auto"
+                                :form="$this->toggleTableColumnForm"
+                                :trigger-action="$this->toggleColumnsAction"
+                            />
+                        @endif
                         <x-filament::button type="submit" class="flex-shrink-0">
                             Update Report
                         </x-filament::button>