wip

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

@@ -17,7 +17,6 @@ use Filament\Forms\Components\Actions;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
 use Filament\Support\Enums\Alignment;
-use Filament\Support\Enums\MaxWidth;
 use Filament\Tables\Actions\Action;
 use Guava\FilamentClusters\Forms\Cluster;
 use Illuminate\Contracts\Support\Htmlable;
@@ -39,17 +38,16 @@ class AccountTransactions extends BaseReportPage
         $this->exportService = $exportService;
     }
 
-    public function getMaxContentWidth(): MaxWidth | string | null
-    {
-        return 'max-w-[90rem]';
-    }
-
     protected function initializeDefaultFilters(): void
     {
         if (empty($this->getFilterState('selectedAccount'))) {
             $this->setFilterState('selectedAccount', 'all');
         }
 
+        if (empty($this->getFilterState('basis'))) {
+            $this->setFilterState('basis', 'accrual');
+        }
+
         if (empty($this->getFilterState('selectedEntity'))) {
             $this->setFilterState('selectedEntity', 'all');
         }
@@ -83,7 +81,7 @@ class AccountTransactions extends BaseReportPage
     public function filtersForm(Form $form): Form
     {
         return $form
-            ->columns(4)
+            ->columns(3)
             ->schema([
                 Select::make('selectedAccount')
                     ->label('Account')
@@ -97,10 +95,18 @@ class AccountTransactions extends BaseReportPage
                 ])->extraFieldWrapperAttributes([
                     'class' => 'report-hidden-label',
                 ]),
+                Select::make('basis')
+                    ->label('Accounting Basis')
+                    ->options([
+                        'accrual' => 'Accrual (Paid & Unpaid)',
+                        'cash' => 'Cash Basis (Paid)',
+                    ])
+                    ->selectablePlaceholder(false),
                 Select::make('selectedEntity')
                     ->label('Entity')
                     ->options($this->getEntityOptions())
-                    ->searchable(),
+                    ->searchable()
+                    ->selectablePlaceholder(false),
                 Actions::make([
                     Actions\Action::make('applyFilters')
                         ->label('Update Report')
@@ -151,7 +157,14 @@ class AccountTransactions extends BaseReportPage
 
     protected function buildReport(array $columns): ReportDTO
     {
-        return $this->reportService->buildAccountTransactionsReport($this->getFormattedStartDate(), $this->getFormattedEndDate(), $columns, $this->getFilterState('selectedAccount'), $this->getFilterState('selectedEntity'));
+        return $this->reportService->buildAccountTransactionsReport(
+            startDate: $this->getFormattedStartDate(),
+            endDate: $this->getFormattedEndDate(),
+            columns: $columns,
+            accountId: $this->getFilterState('selectedAccount'),
+            basis: $this->getFilterState('basis'),
+            entityId: $this->getFilterState('selectedEntity'),
+        );
     }
 
     protected function getTransformer(ReportDTO $reportDTO): ExportableReport

app/Filament/Company/Resources/Purchases/BillResource.php

@@ -175,7 +175,11 @@ class BillResource extends Resource
 
                                 $bill->refresh();
 
-                                $bill->createInitialTransaction();
+                                if (! $bill->initialTransaction) {
+                                    $bill->createInitialTransaction();
+                                } else {
+                                    $bill->updateInitialTransaction();
+                                }
                             })
                             ->headers([
                                 Header::make('Items')->width('15%'),

app/Filament/Company/Resources/Sales/InvoiceResource.php

@@ -232,6 +232,10 @@ class InvoiceResource extends Resource
                                     'discount_total' => $discountTotal,
                                     'total' => $grandTotal,
                                 ]);
+
+                                if ($invoice->approved_at && $invoice->approvalTransaction) {
+                                    $invoice->updateApprovalTransaction();
+                                }
                             })
                             ->headers([
                                 Header::make('Items')->width('15%'),

app/Models/Accounting/Bill.php

@@ -190,7 +190,7 @@ class Bill extends Model
 
     public function createInitialTransaction(?Carbon $postedAt = null): void
     {
-        $postedAt ??= now();
+        $postedAt ??= $this->date;
 
         $transaction = $this->transactions()->create([
             'company_id' => $this->company_id,
@@ -243,6 +243,17 @@ class Bill extends Model
         }
     }
 
+    public function updateInitialTransaction(): void
+    {
+        $transaction = $this->initialTransaction;
+
+        if ($transaction) {
+            $transaction->delete();
+        }
+
+        $this->createInitialTransaction();
+    }
+
     public static function getReplicateAction(string $action = ReplicateAction::class): MountableAction
     {
         return $action::make()

app/Models/Accounting/Invoice.php

@@ -198,10 +198,10 @@ class Invoice extends Model
 
         if ($isRefund) {
             $transactionType = TransactionType::Withdrawal;
-            $transactionDescription = 'Refund for Overpayment on Invoice #' . $this->invoice_number;
+            $transactionDescription = "Invoice #{$this->invoice_number}: Refund to {$this->client->name}";
         } else {
             $transactionType = TransactionType::Deposit;
-            $transactionDescription = 'Payment for Invoice #' . $this->invoice_number;
+            $transactionDescription = "Invoice #{$this->invoice_number}: Payment from {$this->client->name}";
         }
 
         // Create transaction
@@ -225,31 +225,45 @@ class Invoice extends Model
             throw new \RuntimeException('Invoice is not in draft status.');
         }
 
+        $this->createApprovalTransaction();
+
         $approvedAt ??= now();
 
+        $this->update([
+            'approved_at' => $approvedAt,
+            'status' => InvoiceStatus::Unsent,
+        ]);
+    }
+
+    public function createApprovalTransaction(): void
+    {
         $transaction = $this->transactions()->create([
             'company_id' => $this->company_id,
             'type' => TransactionType::Journal,
-            'posted_at' => $approvedAt,
+            'posted_at' => $this->date,
             'amount' => $this->total,
             'description' => 'Invoice Approval for Invoice #' . $this->invoice_number,
         ]);
 
+        $baseDescription = "{$this->client->name}: Invoice #{$this->invoice_number}";
+
         $transaction->journalEntries()->create([
             'company_id' => $this->company_id,
             'type' => JournalEntryType::Debit,
             'account_id' => Account::getAccountsReceivableAccount()->id,
             'amount' => $this->total,
-            'description' => $transaction->description,
+            'description' => $baseDescription,
         ]);
 
         foreach ($this->lineItems as $lineItem) {
+            $lineItemDescription = "{$baseDescription} › {$lineItem->offering->name}";
+
             $transaction->journalEntries()->create([
                 'company_id' => $this->company_id,
                 'type' => JournalEntryType::Credit,
                 'account_id' => $lineItem->offering->income_account_id,
                 'amount' => $lineItem->subtotal,
-                'description' => $transaction->description,
+                'description' => $lineItemDescription,
             ]);
 
             foreach ($lineItem->adjustments as $adjustment) {
@@ -258,15 +272,21 @@ class Invoice extends Model
                     'type' => $adjustment->category->isDiscount() ? JournalEntryType::Debit : JournalEntryType::Credit,
                     'account_id' => $adjustment->account_id,
                     'amount' => $lineItem->calculateAdjustmentTotal($adjustment)->getAmount(),
-                    'description' => $transaction->description,
+                    'description' => $lineItemDescription,
                 ]);
             }
         }
+    }
 
-        $this->update([
-            'approved_at' => $approvedAt,
-            'status' => InvoiceStatus::Unsent,
-        ]);
+    public function updateApprovalTransaction(): void
+    {
+        $transaction = $this->approvalTransaction;
+
+        if ($transaction) {
+            $transaction->delete();
+        }
+
+        $this->createApprovalTransaction();
     }
 
     public static function getApproveDraftAction(string $action = Action::class): MountableAction

app/Services/AccountService.php

@@ -113,9 +113,9 @@ class AccountService
         return array_filter($balances, static fn ($value) => $value !== null);
     }
 
-    public function getTransactionDetailsSubquery(string $startDate, string $endDate, ?string $entityId = null): Closure
+    public function getTransactionDetailsSubquery(string $startDate, string $endDate, string $basis = 'accrual', ?string $entityId = null): Closure
     {
-        return static function ($query) use ($startDate, $endDate, $entityId) {
+        return static function ($query) use ($startDate, $endDate, $basis, $entityId) {
             $query->select(
                 'journal_entries.id',
                 'journal_entries.account_id',
@@ -130,6 +130,13 @@ class AccountService
                 ->orderBy('transactions.posted_at')
                 ->with('transaction:id,type,description,posted_at');
 
+            if ($basis === 'cash') {
+                $query->where(function ($query) {
+                    $query->whereNull('transactions.transactionable_id')
+                        ->orWhere('transactions.is_payment', true);
+                });
+            }
+
             if ($entityId) {
                 $entityId = (int) $entityId;
                 if ($entityId < 0) {

app/Services/ReportService.php

@@ -152,7 +152,7 @@ class ReportService
         return new Money($retainedEarnings, CurrencyAccessor::getDefaultCurrency());
     }
 
-    public function buildAccountTransactionsReport(string $startDate, string $endDate, ?array $columns = null, ?string $accountId = 'all', ?string $entityId = 'all'): ReportDTO
+    public function buildAccountTransactionsReport(string $startDate, string $endDate, ?array $columns = null, ?string $accountId = 'all', ?string $basis = 'accrual', ?string $entityId = 'all'): ReportDTO
     {
         $columns ??= [];
         $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
@@ -164,11 +164,16 @@ class ReportService
         $query = $this->accountService->getAccountBalances($startDate, $endDate, $accountIds)
             ->orderByRaw('LENGTH(code), code');
 
-        $accounts = $query->with(['journalEntries' => $this->accountService->getTransactionDetailsSubquery($startDate, $endDate, $entityId)])->get();
+        $accounts = $query->with(['journalEntries' => $this->accountService->getTransactionDetailsSubquery($startDate, $endDate, $basis, $entityId)])->get();
 
         $reportCategories = [];
 
         foreach ($accounts as $account) {
+            /** @var Account $account */
+            if ($account->journalEntries->isEmpty()) {
+                continue;
+            }
+
             $accountTransactions = [];
             $currentBalance = $account->starting_balance;
 
@@ -183,7 +188,6 @@ class ReportService
                 tableAction: null
             );
 
-            /** @var Account $account */
             foreach ($account->journalEntries as $journalEntry) {
                 $transaction = $journalEntry->transaction;
                 $signedAmount = $journalEntry->signed_amount;

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

@@ -1,7 +1,7 @@
 <table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
     <x-company.tables.header :headers="$report->getHeaders()" :alignmentClass="[$report, 'getAlignmentClass']"/>
     @foreach($report->getCategories() as $categoryIndex => $category)
-        <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
+        <tbody class="divide-y divide-gray-200 dark:divide-white/5">
         <!-- Category Header -->
         <tr class="bg-gray-50 dark:bg-white/5">
             <x-filament-tables::cell tag="th" colspan="{{ count($report->getHeaders()) }}" class="text-left">