wip

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

@@ -6,6 +6,7 @@ use App\Contracts\ExportableReport;
 use App\DTO\ReportDTO;
 use App\Filament\Company\Pages\Accounting\Transactions;
 use App\Models\Accounting\Account;
+use App\Models\Accounting\JournalEntry;
 use App\Services\ExportService;
 use App\Services\ReportService;
 use App\Support\Column;
@@ -18,6 +19,7 @@ use Filament\Support\Enums\MaxWidth;
 use Filament\Tables\Actions\Action;
 use Guava\FilamentClusters\Forms\Cluster;
 use Illuminate\Contracts\Support\Htmlable;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
@@ -162,12 +164,26 @@ class AccountTransactions extends BaseReportPage
         ];
     }
 
-    public function tableHasEmptyState(): bool
+    public function hasNoTransactionsForSelectedAccount(): bool
     {
-        if ($this->report) {
-            return empty($this->report->getCategories());
-        } else {
-            return true;
+        $query = JournalEntry::query();
+        $selectedAccountId = $this->getFilterState('selectedAccount');
+
+        if ($selectedAccountId !== 'all') {
+            $query->where('account_id', $selectedAccountId);
         }
+
+        if ($this->getFilterState('startDate') && $this->getFilterState('endDate')) {
+            $query->whereHas('transaction', function (Builder $query) {
+                $query->whereBetween('posted_at', [$this->getFormattedStartDate(), $this->getFormattedEndDate()]);
+            });
+        }
+
+        return $query->doesntExist();
+    }
+
+    public function tableHasEmptyState(): bool
+    {
+        return $this->hasNoTransactionsForSelectedAccount();
     }
 }

app/Transformers/BalanceSheetReportTransformer.php

@@ -200,23 +200,26 @@ class BalanceSheetReportTransformer extends SummaryReportTransformer
                 $totalEquitySummary = $accountCategory->summary->endingBalance ?? 0;
                 $totalEquitySummary = money($totalEquitySummary, CurrencyAccessor::getDefaultCurrency())->getAmount();
                 $totalOtherEquity = $totalEquitySummary - $totalTypeSummaries;
-                $totalOtherEquity = money($totalOtherEquity, CurrencyAccessor::getDefaultCurrency(), true)->format();
 
-                // Add "Total Other Equity" as a new "type"
-                $otherEquitySummary = [];
-                foreach ($columns as $column) {
-                    $otherEquitySummary[$column->getName()] = match ($column->getName()) {
-                        'account_name' => 'Total Other Equity',
-                        'ending_balance' => $totalOtherEquity,
-                        default => '',
-                    };
-                }
+                if ($totalOtherEquity != 0) {
+                    $totalOtherEquityFormatted = money($totalOtherEquity, CurrencyAccessor::getDefaultCurrency(), true)->format();
 
-                $types['Total Other Equity'] = new ReportTypeDTO(
-                    header: [],
-                    data: [],
-                    summary: $otherEquitySummary,
-                );
+                    // Add "Total Other Equity" as a new "type"
+                    $otherEquitySummary = [];
+                    foreach ($columns as $column) {
+                        $otherEquitySummary[$column->getName()] = match ($column->getName()) {
+                            'account_name' => 'Total Other Equity',
+                            'ending_balance' => $totalOtherEquityFormatted,
+                            default => '',
+                        };
+                    }
+
+                    $types['Total Other Equity'] = new ReportTypeDTO(
+                        header: [],
+                        data: [],
+                        summary: $otherEquitySummary,
+                    );
+                }
             }
 
             // Add the category with its types and summary to the final array