wip Bills

app/Filament/Company/Pages/Accounting/Transactions.php

@@ -12,7 +12,6 @@ use App\Filament\Forms\Components\DateRangeSelect;
 use App\Filament\Forms\Components\JournalEntryRepeater;
 use App\Filament\Tables\Actions\ReplicateBulkAction;
 use App\Models\Accounting\Account;
-use App\Models\Accounting\Invoice;
 use App\Models\Accounting\JournalEntry;
 use App\Models\Accounting\Transaction;
 use App\Models\Banking\BankAccount;
@@ -270,13 +269,8 @@ class Transactions extends Page implements HasTable
                     'journalEntries.account',
                 ])
                     ->where(function (Builder $query) {
-                        $query->whereDoesntHaveMorph(
-                            'transactionable',
-                            [Invoice::class],
-                            function (Builder $query) {
-                                $query->where('type', TransactionType::Journal);
-                            }
-                        );
+                        $query->whereNull('transactionable_id')
+                            ->orWhere('is_payment', true);
                     });
             })
             ->columns([

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

@@ -7,6 +7,8 @@ use App\DTO\ReportDTO;
 use App\Filament\Company\Pages\Accounting\Transactions;
 use App\Models\Accounting\Account;
 use App\Models\Accounting\JournalEntry;
+use App\Models\Common\Client;
+use App\Models\Common\Vendor;
 use App\Services\ExportService;
 use App\Services\ReportService;
 use App\Support\Column;
@@ -47,6 +49,10 @@ class AccountTransactions extends BaseReportPage
         if (empty($this->getFilterState('selectedAccount'))) {
             $this->setFilterState('selectedAccount', 'all');
         }
+
+        if (empty($this->getFilterState('selectedEntity'))) {
+            $this->setFilterState('selectedEntity', 'all');
+        }
     }
 
     /**
@@ -91,6 +97,10 @@ class AccountTransactions extends BaseReportPage
                 ])->extraFieldWrapperAttributes([
                     'class' => 'report-hidden-label',
                 ]),
+                Select::make('selectedEntity')
+                    ->label('Entity')
+                    ->options($this->getEntityOptions())
+                    ->searchable(),
                 Actions::make([
                     Actions\Action::make('applyFilters')
                         ->label('Update Report')
@@ -116,9 +126,32 @@ class AccountTransactions extends BaseReportPage
         return $allAccountsOption + $accounts;
     }
 
+    protected function getEntityOptions(): array
+    {
+        $clients = Client::query()
+            ->orderBy('name')
+            ->pluck('name', 'id')
+            ->toArray();
+
+        $vendors = Vendor::query()
+            ->orderBy('name')
+            ->pluck('name', 'id')
+            ->mapWithKeys(fn ($name, $id) => [-$id => $name])
+            ->toArray();
+
+        $allEntitiesOption = [
+            'All Entities' => ['all' => 'All Entities'],
+        ];
+
+        return $allEntitiesOption + [
+            'Clients' => $clients,
+            'Vendors' => $vendors,
+        ];
+    }
+
     protected function buildReport(array $columns): ReportDTO
     {
-        return $this->reportService->buildAccountTransactionsReport($this->getFormattedStartDate(), $this->getFormattedEndDate(), $columns, $this->getFilterState('selectedAccount'));
+        return $this->reportService->buildAccountTransactionsReport($this->getFormattedStartDate(), $this->getFormattedEndDate(), $columns, $this->getFilterState('selectedAccount'), $this->getFilterState('selectedEntity'));
     }
 
     protected function getTransformer(ReportDTO $reportDTO): ExportableReport

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

@@ -172,6 +172,10 @@ class BillResource extends Resource
                                     'discount_total' => $discountTotal,
                                     'total' => $grandTotal,
                                 ]);
+
+                                $bill->refresh();
+
+                                $bill->createInitialTransaction();
                             })
                             ->headers([
                                 Header::make('Items')->width('15%'),

app/Models/Accounting/Bill.php

@@ -171,7 +171,7 @@ class Bill extends Model
     public function recordPayment(array $data): void
     {
         $transactionType = TransactionType::Withdrawal;
-        $transactionDescription = 'Payment for Bill #' . $this->bill_number;
+        $transactionDescription = "Bill #{$this->bill_number}: Payment to {$this->vendor->name}";
 
         // Create transaction
         $this->transactions()->create([
@@ -200,21 +200,25 @@ class Bill extends Model
             'description' => 'Bill Creation for Bill #' . $this->bill_number,
         ]);
 
+        $baseDescription = "{$this->vendor->name}: Bill #{$this->bill_number}";
+
         $transaction->journalEntries()->create([
             'company_id' => $this->company_id,
             'type' => JournalEntryType::Credit,
             'account_id' => Account::getAccountsPayableAccount()->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::Debit,
                 'account_id' => $lineItem->offering->expense_account_id,
                 'amount' => $lineItem->subtotal,
-                'description' => $transaction->description,
+                'description' => $lineItemDescription,
             ]);
 
             foreach ($lineItem->adjustments as $adjustment) {
@@ -224,7 +228,7 @@ class Bill extends Model
                         'type' => JournalEntryType::Debit,
                         'account_id' => $lineItem->offering->expense_account_id,
                         'amount' => $lineItem->calculateAdjustmentTotal($adjustment)->getAmount(),
-                        'description' => $transaction->description . " ($adjustment->name)",
+                        'description' => "{$lineItemDescription} ({$adjustment->name})",
                     ]);
                 } elseif ($adjustment->account_id) {
                     $transaction->journalEntries()->create([
@@ -232,7 +236,7 @@ class Bill extends Model
                         'type' => $adjustment->category->isDiscount() ? JournalEntryType::Credit : JournalEntryType::Debit,
                         'account_id' => $adjustment->account_id,
                         'amount' => $lineItem->calculateAdjustmentTotal($adjustment)->getAmount(),
-                        'description' => $transaction->description,
+                        'description' => $lineItemDescription,
                     ]);
                 }
             }

app/Services/AccountService.php

@@ -4,6 +4,8 @@ namespace App\Services;
 
 use App\Enums\Accounting\AccountCategory;
 use App\Models\Accounting\Account;
+use App\Models\Accounting\Bill;
+use App\Models\Accounting\Invoice;
 use App\Models\Accounting\Transaction;
 use App\Repositories\Accounting\JournalEntryRepository;
 use App\Utilities\Currency\CurrencyAccessor;
@@ -111,21 +113,39 @@ class AccountService
         return array_filter($balances, static fn ($value) => $value !== null);
     }
 
-    public function getTransactionDetailsSubquery(string $startDate, string $endDate): Closure
+    public function getTransactionDetailsSubquery(string $startDate, string $endDate, ?string $entityId = null): Closure
     {
-        return static function ($query) use ($startDate, $endDate) {
+        return static function ($query) use ($startDate, $endDate, $entityId) {
             $query->select(
                 'journal_entries.id',
                 'journal_entries.account_id',
                 'journal_entries.transaction_id',
                 'journal_entries.type',
                 'journal_entries.amount',
+                'journal_entries.description',
                 DB::raw('journal_entries.amount * IF(journal_entries.type = "debit", 1, -1) AS signed_amount')
             )
                 ->whereBetween('transactions.posted_at', [$startDate, $endDate])
                 ->join('transactions', 'transactions.id', '=', 'journal_entries.transaction_id')
                 ->orderBy('transactions.posted_at')
                 ->with('transaction:id,type,description,posted_at');
+
+            if ($entityId) {
+                $entityId = (int) $entityId;
+                if ($entityId < 0) {
+                    $query->whereHas('transaction', function ($query) use ($entityId) {
+                        $query->whereHasMorph('transactionable', [Bill::class], function ($query) use ($entityId) {
+                            $query->where('vendor_id', abs($entityId));
+                        });
+                    });
+                } else {
+                    $query->whereHas('transaction', function ($query) use ($entityId) {
+                        $query->whereHasMorph('transactionable', [Invoice::class], function ($query) use ($entityId) {
+                            $query->where('client_id', $entityId);
+                        });
+                    });
+                }
+            }
         };
     }
 

app/Services/ReportService.php

@@ -152,17 +152,19 @@ class ReportService
         return new Money($retainedEarnings, CurrencyAccessor::getDefaultCurrency());
     }
 
-    public function buildAccountTransactionsReport(string $startDate, string $endDate, ?array $columns = null, ?string $accountId = 'all'): ReportDTO
+    public function buildAccountTransactionsReport(string $startDate, string $endDate, ?array $columns = null, ?string $accountId = 'all', ?string $entityId = 'all'): ReportDTO
     {
         $columns ??= [];
         $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
 
         $accountIds = $accountId !== 'all' ? [$accountId] : [];
 
+        $entityId = $entityId !== 'all' ? $entityId : null;
+
         $query = $this->accountService->getAccountBalances($startDate, $endDate, $accountIds)
             ->orderByRaw('LENGTH(code), code');
 
-        $accounts = $query->with(['journalEntries' => $this->accountService->getTransactionDetailsSubquery($startDate, $endDate)])->get();
+        $accounts = $query->with(['journalEntries' => $this->accountService->getTransactionDetailsSubquery($startDate, $endDate, $entityId)])->get();
 
         $reportCategories = [];
 
@@ -197,7 +199,7 @@ class ReportService
                 $accountTransactions[] = new AccountTransactionDTO(
                     id: $transaction->id,
                     date: $transaction->posted_at->toDefaultDateFormat(),
-                    description: $transaction->description ?? 'Add a description',
+                    description: $journalEntry->description ?: $transaction->description ?? 'Add a description',
                     debit: $journalEntry->type->isDebit() ? $formattedAmount : '',
                     credit: $journalEntry->type->isCredit() ? $formattedAmount : '',
                     balance: money($currentBalance, $defaultCurrency)->format(),

composer.lock

@@ -2778,16 +2778,16 @@
         },
         {
             "name": "jaocero/radio-deck",
-            "version": "v1.2.8",
+            "version": "v1.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/199ocero/radio-deck.git",
-                "reference": "23815595cfdb441794964f0729e0ea57eec48f5e"
+                "reference": "f99c40700d9ff1a8419cee44fcd4304908919f8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/199ocero/radio-deck/zipball/23815595cfdb441794964f0729e0ea57eec48f5e",
-                "reference": "23815595cfdb441794964f0729e0ea57eec48f5e",
+                "url": "https://api.github.com/repos/199ocero/radio-deck/zipball/f99c40700d9ff1a8419cee44fcd4304908919f8e",
+                "reference": "f99c40700d9ff1a8419cee44fcd4304908919f8e",
                 "shasum": ""
             },
             "require": {
@@ -2848,7 +2848,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-06-25T23:06:42+00:00"
+            "time": "2024-12-07T13:41:25+00:00"
         },
         {
             "name": "kirschbaum-development/eloquent-power-joins",
@@ -3517,16 +3517,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.5.3",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "b650144166dfa7703e62a22e493b853b58d874b0"
+                "reference": "d150f911e0079e90ae3c106734c93137c184f932"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0",
-                "reference": "b650144166dfa7703e62a22e493b853b58d874b0",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d150f911e0079e90ae3c106734c93137c184f932",
+                "reference": "d150f911e0079e90ae3c106734c93137c184f932",
                 "shasum": ""
             },
             "require": {
@@ -3551,8 +3551,9 @@
                 "phpstan/phpstan": "^1.8.2",
                 "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0",
                 "scrutinizer/ocular": "^1.8.1",
-                "symfony/finder": "^5.3 | ^6.0 || ^7.0",
-                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 || ^7.0",
+                "symfony/finder": "^5.3 | ^6.0 | ^7.0",
+                "symfony/process": "^5.4 | ^6.0 | ^7.0",
+                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0",
                 "unleashedtech/php-coding-standard": "^3.1.1",
                 "vimeo/psalm": "^4.24.0 || ^5.0.0"
             },
@@ -3562,7 +3563,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.6-dev"
+                    "dev-main": "2.7-dev"
                 }
             },
             "autoload": {
@@ -3619,7 +3620,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-16T11:46:16+00:00"
+            "time": "2024-12-07T15:34:16+00:00"
         },
         {
             "name": "league/config",
@@ -5920,16 +5921,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.5",
+            "version": "v0.12.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "36a03ff27986682c22985e56aabaf840dd173cb5"
+                "reference": "3b5ea0efaa791cd1c65ecc493aec3e2aa55ff57c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/36a03ff27986682c22985e56aabaf840dd173cb5",
-                "reference": "36a03ff27986682c22985e56aabaf840dd173cb5",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/3b5ea0efaa791cd1c65ecc493aec3e2aa55ff57c",
+                "reference": "3b5ea0efaa791cd1c65ecc493aec3e2aa55ff57c",
                 "shasum": ""
             },
             "require": {
@@ -5993,9 +5994,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.5"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.6"
             },
-            "time": "2024-11-29T06:14:30+00:00"
+            "time": "2024-12-07T20:08:52+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -10568,16 +10569,16 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "5.6.0",
+            "version": "5.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c"
+                "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/f3558a4c23426d12bffeaab463f8a8d8b681193c",
-                "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8",
+                "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8",
                 "shasum": ""
             },
             "require": {
@@ -10626,9 +10627,9 @@
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
             "support": {
                 "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.0"
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.1"
             },
-            "time": "2024-11-12T11:25:25+00:00"
+            "time": "2024-12-07T09:39:29+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",

database/factories/Accounting/DocumentLineItemFactory.php

@@ -37,8 +37,7 @@ class DocumentLineItemFactory extends Factory
     public function forInvoice(): static
     {
         return $this->state(function (array $attributes) {
-            $offering = Offering::with(['salesTaxes', 'salesDiscounts'])
-                ->where('sellable', true)
+            $offering = Offering::where('sellable', true)
                 ->inRandomOrder()
                 ->first();
 
@@ -50,8 +49,8 @@ class DocumentLineItemFactory extends Factory
             $offering = $lineItem->offering;
 
             if ($offering) {
-                $lineItem->adjustments()->syncWithoutDetaching($offering->salesTaxes->pluck('id')->toArray());
-                $lineItem->adjustments()->syncWithoutDetaching($offering->salesDiscounts->pluck('id')->toArray());
+                $lineItem->salesTaxes()->syncWithoutDetaching($offering->salesTaxes->pluck('id')->toArray());
+                $lineItem->salesDiscounts()->syncWithoutDetaching($offering->salesDiscounts->pluck('id')->toArray());
             }
 
             $lineItem->refresh();
@@ -69,8 +68,7 @@ class DocumentLineItemFactory extends Factory
     public function forBill(): static
     {
         return $this->state(function (array $attributes) {
-            $offering = Offering::with(['purchaseTaxes', 'purchaseDiscounts'])
-                ->where('purchasable', true)
+            $offering = Offering::where('purchasable', true)
                 ->inRandomOrder()
                 ->first();
 
@@ -82,8 +80,8 @@ class DocumentLineItemFactory extends Factory
             $offering = $lineItem->offering;
 
             if ($offering) {
-                $lineItem->adjustments()->syncWithoutDetaching($offering->purchaseTaxes->pluck('id')->toArray());
-                $lineItem->adjustments()->syncWithoutDetaching($offering->purchaseDiscounts->pluck('id')->toArray());
+                $lineItem->purchaseTaxes()->syncWithoutDetaching($offering->purchaseTaxes->pluck('id')->toArray());
+                $lineItem->purchaseDiscounts()->syncWithoutDetaching($offering->purchaseDiscounts->pluck('id')->toArray());
             }
 
             $lineItem->refresh();