wip

app/DTO/ReportDTO.php

@@ -11,5 +11,6 @@ class ReportDTO
         public array $categories,
         public ?AccountBalanceDTO $overallTotal = null,
         public array $fields = [],
+        public ?string $reportType = null,
     ) {}
 }

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

@@ -90,11 +90,11 @@ class TrialBalance extends BaseReportPage
 
     public function exportCSV(): StreamedResponse
     {
-        return $this->exportService->exportToCsv($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
+        return $this->exportService->exportToCsv($this->company, $this->report, endDate: $this->getFilterState('asOfDate'));
     }
 
     public function exportPDF(): StreamedResponse
     {
-        return $this->exportService->exportToPdf($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
+        return $this->exportService->exportToPdf($this->company, $this->report, endDate: $this->getFilterState('asOfDate'));
     }
 }

app/Services/ExportService.php

@@ -12,14 +12,20 @@ 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 = null, ?string $endDate = null): StreamedResponse
     {
-        $formattedStartDate = Carbon::parse($startDate)->toDateString();
-        $formattedEndDate = Carbon::parse($endDate)->toDateString();
+        if ($startDate && $endDate) {
+            $formattedStartDate = Carbon::parse($startDate)->toDateString();
+            $formattedEndDate = Carbon::parse($endDate)->toDateString();
+            $dateLabel = $formattedStartDate . ' to ' . $formattedEndDate;
+        } else {
+            $formattedAsOfDate = Carbon::parse($endDate)->toDateString();
+            $dateLabel = $formattedAsOfDate;
+        }
 
         $timestamp = Carbon::now()->format('Y-m-d_H-i-s');
 
-        $filename = $company->name . ' ' . $report->getTitle() . ' ' . $formattedStartDate . ' to ' . $formattedEndDate . ' ' . $timestamp . '.csv';
+        $filename = $company->name . ' ' . $report->getTitle() . ' ' . $dateLabel . ' ' . $timestamp . '.csv';
 
         $headers = [
             'Content-Type' => 'text/csv',
@@ -29,12 +35,17 @@ class ExportService
         $callback = function () use ($startDate, $endDate, $report, $company) {
             $file = fopen('php://output', 'wb');
 
-            $defaultStartDateFormat = Carbon::parse($startDate)->toDefaultDateFormat();
-            $defaultEndDateFormat = Carbon::parse($endDate)->toDefaultDateFormat();
+            if ($startDate && $endDate) {
+                $defaultStartDateFormat = Carbon::parse($startDate)->toDefaultDateFormat();
+                $defaultEndDateFormat = Carbon::parse($endDate)->toDefaultDateFormat();
+                $dateLabel = 'Date Range: ' . $defaultStartDateFormat . ' to ' . $defaultEndDateFormat;
+            } else {
+                $dateLabel = 'As of ' . Carbon::parse($endDate)->toDefaultDateFormat();
+            }
 
             fputcsv($file, [$report->getTitle()]);
             fputcsv($file, [$company->name]);
-            fputcsv($file, ['Date Range: ' . $defaultStartDateFormat . ' to ' . $defaultEndDateFormat]);
+            fputcsv($file, [$dateLabel]);
             fputcsv($file, []);
 
             fputcsv($file, $report->getHeaders());
@@ -92,20 +103,26 @@ class ExportService
         return response()->streamDownload($callback, $filename, $headers);
     }
 
-    public function exportToPdf(Company $company, ExportableReport $report, string $startDate, string $endDate): StreamedResponse
+    public function exportToPdf(Company $company, ExportableReport $report, ?string $startDate = null, ?string $endDate = null): StreamedResponse
     {
-        $formattedStartDate = Carbon::parse($startDate)->toDateString();
-        $formattedEndDate = Carbon::parse($endDate)->toDateString();
+        if ($startDate && $endDate) {
+            $formattedStartDate = Carbon::parse($startDate)->toDateString();
+            $formattedEndDate = Carbon::parse($endDate)->toDateString();
+            $dateLabel = $formattedStartDate . ' to ' . $formattedEndDate;
+        } else {
+            $formattedAsOfDate = Carbon::parse($endDate)->toDateString();
+            $dateLabel = $formattedAsOfDate;
+        }
 
         $timestamp = Carbon::now()->format('Y-m-d_H-i-s');
 
-        $filename = $company->name . ' ' . $report->getTitle() . ' ' . $formattedStartDate . ' to ' . $formattedEndDate . ' ' . $timestamp . '.pdf';
+        $filename = $company->name . ' ' . $report->getTitle() . ' ' . $dateLabel . ' ' . $timestamp . '.pdf';
 
         $pdf = SnappyPdf::loadView($report->getPdfView(), [
             'company' => $company,
             'report' => $report,
-            'startDate' => Carbon::parse($startDate)->toDefaultDateFormat(),
-            'endDate' => Carbon::parse($endDate)->toDefaultDateFormat(),
+            'startDate' => $startDate ? Carbon::parse($startDate)->toDefaultDateFormat() : null,
+            'endDate' => $endDate ? Carbon::parse($endDate)->toDefaultDateFormat() : null,
         ]);
 
         return response()->streamDownload(function () use ($pdf) {

app/Services/ReportService.php

@@ -312,7 +312,7 @@ class ReportService
 
         $formattedReportTotalBalances = $this->formatBalances($reportTotalBalances);
 
-        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
+        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns, $trialBalanceType);
     }
 
     public function getRetainedEarningsBalances(string $startDate, string $endDate): AccountBalanceDTO

app/Transformers/TrialBalanceReportTransformer.php

@@ -10,7 +10,10 @@ class TrialBalanceReportTransformer extends BaseReportTransformer
 {
     public function getTitle(): string
     {
-        return 'Trial Balance';
+        return match ($this->report->reportType) {
+            'postClosing' => 'Post-Closing Trial Balance',
+            default => 'Standard Trial Balance',
+        };
     }
 
     public function getHeaders(): array

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.322.7",
+            "version": "3.322.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "ea3563a7f10fa562796f712fa306c1dca41a45d7"
+                "reference": "fb5099160e49b676277ae787ff721628e5e4dd5a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ea3563a7f10fa562796f712fa306c1dca41a45d7",
-                "reference": "ea3563a7f10fa562796f712fa306c1dca41a45d7",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fb5099160e49b676277ae787ff721628e5e4dd5a",
+                "reference": "fb5099160e49b676277ae787ff721628e5e4dd5a",
                 "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.322.7"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.322.8"
             },
-            "time": "2024-09-27T18:34:08+00:00"
+            "time": "2024-09-30T19:09:25+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -3709,16 +3709,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.28.0",
+            "version": "3.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c"
+                "reference": "0adc0d9a51852e170e0028a60bd271726626d3f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
-                "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0adc0d9a51852e170e0028a60bd271726626d3f0",
+                "reference": "0adc0d9a51852e170e0028a60bd271726626d3f0",
                 "shasum": ""
             },
             "require": {
@@ -3786,22 +3786,22 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.28.0"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.29.0"
             },
-            "time": "2024-05-22T10:09:12+00:00"
+            "time": "2024-09-29T11:59:11+00:00"
         },
         {
             "name": "league/flysystem-local",
-            "version": "3.28.0",
+            "version": "3.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40"
+                "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
-                "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27",
+                "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27",
                 "shasum": ""
             },
             "require": {
@@ -3835,9 +3835,9 @@
                 "local"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.28.0"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0"
             },
-            "time": "2024-05-06T20:05:52+00:00"
+            "time": "2024-08-09T21:24:39+00:00"
         },
         {
             "name": "league/mime-type-detection",
@@ -4834,16 +4834,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.2.0",
+            "version": "v5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb"
+                "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb",
-                "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3abf7425cd284141dc5d8d14a9ee444de3345d1a",
+                "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a",
                 "shasum": ""
             },
             "require": {
@@ -4886,9 +4886,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.2.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.0"
             },
-            "time": "2024-09-15T16:40:33+00:00"
+            "time": "2024-09-29T13:56:26+00:00"
         },
         {
             "name": "nunomaduro/termwind",

package-lock.json

@@ -1159,9 +1159,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.29",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz",
-            "integrity": "sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==",
+            "version": "1.5.30",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.30.tgz",
+            "integrity": "sha512-sXI35EBN4lYxzc/pIGorlymYNzDBOqkSlVRe6MkgBsW/hW1tpC/HDJ2fjG7XnjakzfLEuvdmux0Mjs6jHq4UOA==",
             "dev": true,
             "license": "ISC"
         },

resources/js/TopNavigation.js

@@ -1,6 +1,5 @@
 document.addEventListener('DOMContentLoaded', () => {
     handleTopbarAndSidebarHover();
-
     handleScroll();
 });
 
@@ -10,18 +9,25 @@ const handleTopbarAndSidebarHover = () => {
 
     const addHoveredClass = () => {
         topbarNav.classList.add('topbar-hovered');
-        sidebarHeader.classList.add('topbar-hovered');
+        if (sidebarHeader) {
+            sidebarHeader.classList.add('topbar-hovered');
+        }
     };
 
     const removeHoveredClass = () => {
         topbarNav.classList.remove('topbar-hovered');
-        sidebarHeader.classList.remove('topbar-hovered');
+        if (sidebarHeader) {
+            sidebarHeader.classList.remove('topbar-hovered');
+        }
     };
 
     topbarNav.addEventListener('mouseenter', addHoveredClass);
-    sidebarHeader.addEventListener('mouseenter', addHoveredClass);
     topbarNav.addEventListener('mouseleave', removeHoveredClass);
-    sidebarHeader.addEventListener('mouseleave', removeHoveredClass);
+
+    if (sidebarHeader) {
+        sidebarHeader.addEventListener('mouseenter', addHoveredClass);
+        sidebarHeader.addEventListener('mouseleave', removeHoveredClass);
+    }
 };
 
 const handleScroll = () => {
@@ -31,11 +37,16 @@ const handleScroll = () => {
     window.addEventListener('scroll', () => {
         if (window.scrollY > 0) {
             topbarNav.classList.add('topbar-scrolled');
-            sidebarHeader.classList.add('topbar-scrolled');
+            if (sidebarHeader) {
+                sidebarHeader.classList.add('topbar-scrolled');
+            }
         } else {
             topbarNav.classList.remove('topbar-scrolled');
-            sidebarHeader.classList.remove('topbar-scrolled');
+            if (sidebarHeader) {
+                sidebarHeader.classList.remove('topbar-scrolled');
+            }
         }
     });
-}
+};
+
 

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

@@ -93,7 +93,11 @@
 <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>
+    @if($startDate && $endDate)
+        <div class="date-range">Date Range: {{ $startDate }} to {{ $endDate }}</div>
+    @else
+        <div class="date-range">As of {{ $endDate }}</div>
+    @endif
 </div>
 <table class="table-class">
     <thead class="table-head">