wip

app/Models/Accounting/Bill.php

@@ -257,8 +257,8 @@ class Bill extends Document
             'description' => $transactionDescription,
             'notes' => $data['notes'] ?? null,
             'meta' => [
-                'original_bill_currency' => $billCurrency,
-                'amount_in_bill_currency_cents' => $amountInBillCurrencyCents,
+                'original_document_currency' => $billCurrency,
+                'amount_in_document_currency_cents' => $amountInBillCurrencyCents,
             ],
         ]);
     }

app/Models/Accounting/Invoice.php

@@ -311,8 +311,10 @@ class Invoice extends Document
         $invoiceCurrency = $this->currency_code;
         $requiresConversion = $invoiceCurrency !== $bankAccountCurrency;
 
+        // Store the original payment amount in invoice currency before any conversion
+        $amountInInvoiceCurrencyCents = CurrencyConverter::convertToCents($data['amount'], $invoiceCurrency);
+
         if ($requiresConversion) {
-            $amountInInvoiceCurrencyCents = CurrencyConverter::convertToCents($data['amount'], $invoiceCurrency);
             $amountInBankCurrencyCents = CurrencyConverter::convertBalance(
                 $amountInInvoiceCurrencyCents,
                 $invoiceCurrency,
@@ -338,6 +340,10 @@ class Invoice extends Document
             'account_id' => Account::getAccountsReceivableAccount()->id,
             'description' => $transactionDescription,
             'notes' => $data['notes'] ?? null,
+            'meta' => [
+                'original_document_currency' => $invoiceCurrency,
+                'amount_in_document_currency_cents' => $amountInInvoiceCurrencyCents,
+            ],
         ]);
     }
 

app/Observers/TransactionObserver.php

@@ -113,6 +113,16 @@ class TransactionObserver
             ->when($excludedTransaction, fn (Builder $query) => $query->whereKeyNot($excludedTransaction->getKey()))
             ->get()
             ->sum(function (Transaction $transaction) use ($invoiceCurrency) {
+                // If the transaction has stored the original invoice amount in metadata, use that
+                if (! empty($transaction->meta) &&
+                    isset($transaction->meta['original_document_currency']) &&
+                    $transaction->meta['original_document_currency'] === $invoiceCurrency &&
+                    isset($transaction->meta['amount_in_document_currency_cents'])) {
+
+                    return (int) $transaction->meta['amount_in_document_currency_cents'];
+                }
+
+                // Fall back to conversion if metadata is not available
                 $bankAccountCurrency = $transaction->bankAccount->account->currency_code;
                 $amountCents = (int) $transaction->getRawOriginal('amount');
 
@@ -123,6 +133,16 @@ class TransactionObserver
             ->when($excludedTransaction, fn (Builder $query) => $query->whereKeyNot($excludedTransaction->getKey()))
             ->get()
             ->sum(function (Transaction $transaction) use ($invoiceCurrency) {
+                // If the transaction has stored the original invoice amount in metadata, use that
+                if (! empty($transaction->meta) &&
+                    isset($transaction->meta['original_document_currency']) &&
+                    $transaction->meta['original_document_currency'] === $invoiceCurrency &&
+                    isset($transaction->meta['amount_in_document_currency_cents'])) {
+
+                    return (int) $transaction->meta['amount_in_document_currency_cents'];
+                }
+
+                // Fall back to conversion if metadata is not available
                 $bankAccountCurrency = $transaction->bankAccount->account->currency_code;
                 $amountCents = (int) $transaction->getRawOriginal('amount');
 
@@ -136,6 +156,7 @@ class TransactionObserver
         $newStatus = match (true) {
             $totalPaidInInvoiceCurrencyCents > $invoiceTotalInInvoiceCurrencyCents => InvoiceStatus::Overpaid,
             $totalPaidInInvoiceCurrencyCents === $invoiceTotalInInvoiceCurrencyCents => InvoiceStatus::Paid,
+            $totalPaidInInvoiceCurrencyCents === 0 => $invoice->last_sent_at ? InvoiceStatus::Sent : InvoiceStatus::Unsent,
             default => InvoiceStatus::Partial,
         };
 
@@ -168,11 +189,11 @@ class TransactionObserver
             ->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'])) {
+                    isset($transaction->meta['original_document_currency']) &&
+                    $transaction->meta['original_document_currency'] === $billCurrency &&
+                    isset($transaction->meta['amount_in_document_currency_cents'])) {
 
-                    return (int) $transaction->meta['amount_in_bill_currency_cents'];
+                    return (int) $transaction->meta['amount_in_document_currency_cents'];
                 }
 
                 // Fall back to conversion if metadata is not available
@@ -188,6 +209,7 @@ class TransactionObserver
 
         $newStatus = match (true) {
             $totalPaidInBillCurrencyCents >= $billTotalInBillCurrencyCents => BillStatus::Paid,
+            $totalPaidInBillCurrencyCents === 0 => BillStatus::Open,
             default => BillStatus::Partial,
         };