wip

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

@@ -3,7 +3,7 @@
 namespace App\Filament\Company\Resources\Purchases\BillResource\Pages;
 
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToListPage;
+use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Purchases\BillResource;
 use App\Models\Accounting\Bill;
 use App\Models\Common\Vendor;
@@ -15,7 +15,7 @@ use Livewire\Attributes\Url;
 class CreateBill extends CreateRecord
 {
     use ManagesLineItems;
-    use RedirectToListPage;
+    use RedirectToViewPage;
 
     protected static string $resource = BillResource::class;
 

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

@@ -62,10 +62,10 @@ class ViewBill extends ViewRecord
                             ->url(static fn (Bill $record) => VendorResource::getUrl('edit', ['record' => $record->vendor_id])),
                         TextEntry::make('total')
                             ->label('Total')
-                            ->money(),
+                            ->currency(fn (Bill $record) => $record->currency_code),
                         TextEntry::make('amount_due')
                             ->label('Amount due')
-                            ->money(),
+                            ->currency(fn (Bill $record) => $record->currency_code),
                         TextEntry::make('date')
                             ->label('Date')
                             ->date(),

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

@@ -3,7 +3,7 @@
 namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToListPage;
+use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Models\Accounting\Invoice;
 use App\Models\Common\Client;
@@ -15,7 +15,7 @@ use Livewire\Attributes\Url;
 class CreateInvoice extends CreateRecord
 {
     use ManagesLineItems;
-    use RedirectToListPage;
+    use RedirectToViewPage;
 
     protected static string $resource = InvoiceResource::class;
 

app/Models/Accounting/Bill.php

@@ -164,7 +164,7 @@ class Bill extends Document
         return ! in_array($this->status, [
             BillStatus::Paid,
             BillStatus::Void,
-        ]) && $this->currency_code === CurrencyAccessor::getDefaultCurrency();
+        ]);
     }
 
     public function hasPayments(): bool
@@ -227,8 +227,10 @@ class Bill extends Document
         $billCurrency = $this->currency_code;
         $requiresConversion = $billCurrency !== $bankAccountCurrency;
 
+        // Store the original payment amount in bill currency before any conversion
+        $amountInBillCurrencyCents = CurrencyConverter::convertToCents($data['amount'], $billCurrency);
+
         if ($requiresConversion) {
-            $amountInBillCurrencyCents = CurrencyConverter::convertToCents($data['amount'], $billCurrency);
             $amountInBankCurrencyCents = CurrencyConverter::convertBalance(
                 $amountInBillCurrencyCents,
                 $billCurrency,
@@ -254,6 +256,10 @@ class Bill extends Document
             'account_id' => Account::getAccountsPayableAccount()->id,
             'description' => $transactionDescription,
             'notes' => $data['notes'] ?? null,
+            'meta' => [
+                'original_bill_currency' => $billCurrency,
+                'amount_in_bill_currency_cents' => $amountInBillCurrencyCents,
+            ],
         ]);
     }
 

app/Models/Accounting/Transaction.php

@@ -45,6 +45,7 @@ class Transaction extends Model
         'posted_at',
         'created_by',
         'updated_by',
+        'meta',
     ];
 
     protected $casts = [
@@ -54,6 +55,7 @@ class Transaction extends Model
         'pending' => 'boolean',
         'reviewed' => 'boolean',
         'posted_at' => 'date',
+        'meta' => 'array',
     ];
 
     public function account(): BelongsTo

app/Observers/TransactionObserver.php

@@ -166,6 +166,16 @@ class TransactionObserver
             ->when($excludedTransaction, fn (Builder $query) => $query->whereKeyNot($excludedTransaction->getKey()))
             ->get()
             ->sum(function (Transaction $transaction) use ($billCurrency) {
+                // If the transaction has stored the original bill amount in metadata, use that
+                if (! empty($transaction->meta) &&
+                    isset($transaction->meta['original_bill_currency']) &&
+                    $transaction->meta['original_bill_currency'] === $billCurrency &&
+                    isset($transaction->meta['amount_in_bill_currency_cents'])) {
+
+                    return (int) $transaction->meta['amount_in_bill_currency_cents'];
+                }
+
+                // Fall back to conversion if metadata is not available
                 $bankAccountCurrency = $transaction->bankAccount->account->currency_code;
                 $amountCents = (int) $transaction->getRawOriginal('amount');
 

app/Providers/Filament/CompanyPanelProvider.php

@@ -152,7 +152,7 @@ class CompanyPanelProvider extends PanelProvider
                             ->icon('heroicon-o-clipboard-document-list')
                             ->extraSidebarAttributes(['class' => 'es-sidebar-group'])
                             ->items([
-                                ...BudgetResource::getNavigationItems(),
+                                // ...BudgetResource::getNavigationItems(),
                                 ...AccountChart::getNavigationItems(),
                                 ...Transactions::getNavigationItems(),
                             ]),

database/migrations/2024_01_01_234943_create_transactions_table.php

@@ -27,6 +27,7 @@ return new class extends Migration
             $table->text('notes')->nullable();
             $table->string('reference')->nullable();
             $table->bigInteger('amount')->default(0);
+            $table->json('meta')->nullable();
             $table->boolean('pending')->default(false);
             $table->boolean('reviewed')->default(false);
             $table->dateTime('posted_at');