wip

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

@@ -624,7 +624,7 @@ class BillResource extends Resource
                                 ->label('Notes'),
                         ])
                         ->before(function (Collection $records, Tables\Actions\BulkAction $action, array $data) {
-                            $totalPaymentAmount = CurrencyConverter::convertToCents($data['amount']);
+                            $totalPaymentAmount = $data['amount'] ?? 0;
                             $totalAmountDue = $records->sum(fn (Bill $bill) => $bill->getRawOriginal('amount_due'));
 
                             if ($totalPaymentAmount > $totalAmountDue) {
@@ -641,7 +641,7 @@ class BillResource extends Resource
                             }
                         })
                         ->action(function (Collection $records, Tables\Actions\BulkAction $action, array $data) {
-                            $totalPaymentAmount = CurrencyConverter::convertToCents($data['amount']);
+                            $totalPaymentAmount = $data['amount'] ?? 0;
                             $remainingAmount = $totalPaymentAmount;
 
                             $records->each(function (Bill $record) use (&$remainingAmount, $data) {
@@ -652,7 +652,7 @@ class BillResource extends Resource
                                 }
 
                                 $paymentAmount = min($amountDue, $remainingAmount);
-                                $data['amount'] = CurrencyConverter::convertCentsToFormatSimple($paymentAmount);
+                                $data['amount'] = $paymentAmount;
 
                                 $record->recordPayment($data);
                                 $remainingAmount -= $paymentAmount;

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

@@ -737,7 +737,7 @@ class InvoiceResource extends Resource
                                 ->label('Notes'),
                         ])
                         ->before(function (DocumentCollection $records, Tables\Actions\BulkAction $action, array $data) {
-                            $totalPaymentAmount = CurrencyConverter::convertToCents($data['amount']);
+                            $totalPaymentAmount = $data['amount'] ?? 0;
                             $totalAmountDue = $records->sumMoneyInCents('amount_due');
 
                             if ($totalPaymentAmount > $totalAmountDue) {
@@ -754,7 +754,7 @@ class InvoiceResource extends Resource
                             }
                         })
                         ->action(function (DocumentCollection $records, Tables\Actions\BulkAction $action, array $data) {
-                            $totalPaymentAmount = CurrencyConverter::convertToCents($data['amount']);
+                            $totalPaymentAmount = $data['amount'] ?? 0;
 
                             $remainingAmount = $totalPaymentAmount;
 
@@ -767,7 +767,7 @@ class InvoiceResource extends Resource
 
                                 $paymentAmount = min($amountDue, $remainingAmount);
 
-                                $data['amount'] = CurrencyConverter::convertCentsToFormatSimple($paymentAmount);
+                                $data['amount'] = $paymentAmount;
 
                                 $record->recordPayment($data);
 

app/Models/Accounting/Bill.php

@@ -228,7 +228,7 @@ class Bill extends Document
         $requiresConversion = $billCurrency !== $bankAccountCurrency;
 
         // Store the original payment amount in bill currency before any conversion
-        $amountInBillCurrencyCents = CurrencyConverter::convertToCents($data['amount'], $billCurrency);
+        $amountInBillCurrencyCents = $data['amount'];
 
         if ($requiresConversion) {
             $amountInBankCurrencyCents = CurrencyConverter::convertBalance(
@@ -236,12 +236,9 @@ class Bill extends Document
                 $billCurrency,
                 $bankAccountCurrency
             );
-            $formattedAmountForBankCurrency = CurrencyConverter::convertCentsToFormatSimple(
-                $amountInBankCurrencyCents,
-                $bankAccountCurrency
-            );
+            $formattedAmountForBankCurrency = $amountInBankCurrencyCents;
         } else {
-            $formattedAmountForBankCurrency = $data['amount']; // Already in simple format
+            $formattedAmountForBankCurrency = $amountInBillCurrencyCents;
         }
 
         // Create transaction with converted amount

app/Models/Accounting/Estimate.php

@@ -471,11 +471,11 @@ class Estimate extends Document
             'currency_code' => $this->currency_code,
             'discount_method' => $this->discount_method,
             'discount_computation' => $this->discount_computation,
-            'discount_rate' => $this->discount_rate,
-            'subtotal' => $this->subtotal,
-            'tax_total' => $this->tax_total,
-            'discount_total' => $this->discount_total,
-            'total' => $this->total,
+            'discount_rate' => $this->getRawOriginal('discount_rate'),
+            'subtotal' => $this->getRawOriginal('subtotal'),
+            'tax_total' => $this->getRawOriginal('tax_total'),
+            'discount_total' => $this->getRawOriginal('discount_total'),
+            'total' => $this->getRawOriginal('total'),
             'terms' => $this->terms,
             'footer' => $this->footer,
             'created_by' => auth()->id(),

app/Models/Accounting/RecurringInvoice.php

@@ -643,11 +643,11 @@ class RecurringInvoice extends Document
             'currency_code' => $this->currency_code,
             'discount_method' => $this->discount_method,
             'discount_computation' => $this->discount_computation,
-            'discount_rate' => $this->discount_rate,
-            'subtotal' => $this->subtotal,
-            'tax_total' => $this->tax_total,
-            'discount_total' => $this->discount_total,
-            'total' => $this->total,
+            'discount_rate' => $this->getRawOriginal('discount_rate'),
+            'subtotal' => $this->getRawOriginal('subtotal'),
+            'tax_total' => $this->getRawOriginal('tax_total'),
+            'discount_total' => $this->getRawOriginal('discount_total'),
+            'total' => $this->getRawOriginal('total'),
             'terms' => $this->terms,
             'footer' => $this->footer,
             'created_by' => auth()->id(),

app/Services/TransactionService.php

@@ -250,7 +250,7 @@ class TransactionService
         });
     }
 
-    private function getConvertedTransactionAmount(Transaction $transaction): string
+    private function getConvertedTransactionAmount(Transaction $transaction): int
     {
         $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
         $bankAccountCurrency = $transaction->bankAccount->account->currency_code;
@@ -259,7 +259,7 @@ class TransactionService
             return $this->convertToDefaultCurrency($transaction->amount, $bankAccountCurrency, $defaultCurrency);
         }
 
-        return $transaction->amount;
+        return CurrencyConverter::prepareForAccessor($transaction->amount, $defaultCurrency);
     }
 
     private function convertToDefaultCurrency(string $amount, string $fromCurrency, string $toCurrency): string
@@ -268,7 +268,7 @@ class TransactionService
 
         $convertedAmountInCents = CurrencyConverter::convertBalance($amountInCents, $fromCurrency, $toCurrency);
 
-        return CurrencyConverter::prepareForMutator($convertedAmountInCents, $toCurrency);
+        return $convertedAmountInCents;
     }
 
     private function hasRelevantChanges(Transaction $transaction): bool
@@ -276,7 +276,7 @@ class TransactionService
         return $transaction->wasChanged(['amount', 'account_id', 'bank_account_id', 'type']);
     }
 
-    private function updateJournalEntryForTransaction(JournalEntry $journalEntry, Account $account, string $convertedTransactionAmount): void
+    private function updateJournalEntryForTransaction(JournalEntry $journalEntry, Account $account, int $convertedTransactionAmount): void
     {
         DB::transaction(static function () use ($journalEntry, $account, $convertedTransactionAmount) {
             $journalEntry->update([

database/factories/Accounting/BillFactory.php

@@ -12,7 +12,6 @@ use App\Models\Banking\BankAccount;
 use App\Models\Common\Vendor;
 use App\Models\Company;
 use App\Models\Setting\DocumentDefault;
-use App\Utilities\Currency\CurrencyConverter;
 use App\Utilities\RateCalculator;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
@@ -174,7 +173,7 @@ class BillFactory extends Factory
 
                 $data = [
                     'posted_at' => $postedAt,
-                    'amount' => CurrencyConverter::convertCentsToFormatSimple($amount, $bill->currency_code),
+                    'amount' => $amount,
                     'payment_method' => $this->faker->randomElement(PaymentMethod::class),
                     'bank_account_id' => BankAccount::where('company_id', $bill->company_id)->inRandomOrder()->value('id'),
                     'notes' => $this->faker->sentence,
@@ -250,7 +249,7 @@ class BillFactory extends Factory
                 $scaledRate = RateCalculator::parseLocalizedRate($bill->discount_rate);
                 $discountTotalCents = RateCalculator::calculatePercentage($subtotalCents, $scaledRate);
             } else {
-                $discountTotalCents = CurrencyConverter::convertToCents($bill->discount_rate, $bill->currency_code);
+                $discountTotalCents = $bill->getRawOriginal('discount_rate');
             }
         }
 
@@ -258,10 +257,10 @@ class BillFactory extends Factory
         $currencyCode = $bill->currency_code;
 
         $bill->update([
-            'subtotal' => CurrencyConverter::convertCentsToFormatSimple($subtotalCents, $currencyCode),
-            'tax_total' => CurrencyConverter::convertCentsToFormatSimple($taxTotalCents, $currencyCode),
-            'discount_total' => CurrencyConverter::convertCentsToFormatSimple($discountTotalCents, $currencyCode),
-            'total' => CurrencyConverter::convertCentsToFormatSimple($grandTotalCents, $currencyCode),
+            'subtotal' => $subtotalCents,
+            'tax_total' => $taxTotalCents,
+            'discount_total' => $discountTotalCents,
+            'total' => $grandTotalCents,
         ]);
     }
 }

database/factories/Accounting/EstimateFactory.php

@@ -10,7 +10,6 @@ use App\Models\Accounting\Estimate;
 use App\Models\Common\Client;
 use App\Models\Company;
 use App\Models\Setting\DocumentDefault;
-use App\Utilities\Currency\CurrencyConverter;
 use App\Utilities\RateCalculator;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
@@ -231,7 +230,7 @@ class EstimateFactory extends Factory
                 $scaledRate = RateCalculator::parseLocalizedRate($estimate->discount_rate);
                 $discountTotalCents = RateCalculator::calculatePercentage($subtotalCents, $scaledRate);
             } else {
-                $discountTotalCents = CurrencyConverter::convertToCents($estimate->discount_rate, $estimate->currency_code);
+                $discountTotalCents = $estimate->getRawOriginal('discount_rate');
             }
         }
 
@@ -239,10 +238,10 @@ class EstimateFactory extends Factory
         $currencyCode = $estimate->currency_code;
 
         $estimate->update([
-            'subtotal' => CurrencyConverter::convertCentsToFormatSimple($subtotalCents, $currencyCode),
-            'tax_total' => CurrencyConverter::convertCentsToFormatSimple($taxTotalCents, $currencyCode),
-            'discount_total' => CurrencyConverter::convertCentsToFormatSimple($discountTotalCents, $currencyCode),
-            'total' => CurrencyConverter::convertCentsToFormatSimple($grandTotalCents, $currencyCode),
+            'subtotal' => $subtotalCents,
+            'tax_total' => $taxTotalCents,
+            'discount_total' => $discountTotalCents,
+            'total' => $grandTotalCents,
         ]);
     }
 }

database/factories/Accounting/InvoiceFactory.php

@@ -12,7 +12,6 @@ use App\Models\Banking\BankAccount;
 use App\Models\Common\Client;
 use App\Models\Company;
 use App\Models\Setting\DocumentDefault;
-use App\Utilities\Currency\CurrencyConverter;
 use App\Utilities\RateCalculator;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
@@ -192,7 +191,7 @@ class InvoiceFactory extends Factory
 
                 $data = [
                     'posted_at' => $postedAt,
-                    'amount' => CurrencyConverter::convertCentsToFormatSimple($amount, $invoice->currency_code),
+                    'amount' => $amount,
                     'payment_method' => $this->faker->randomElement(PaymentMethod::class),
                     'bank_account_id' => BankAccount::where('company_id', $invoice->company_id)->inRandomOrder()->value('id'),
                     'notes' => $this->faker->sentence,
@@ -275,7 +274,7 @@ class InvoiceFactory extends Factory
                 $scaledRate = RateCalculator::parseLocalizedRate($invoice->discount_rate);
                 $discountTotalCents = RateCalculator::calculatePercentage($subtotalCents, $scaledRate);
             } else {
-                $discountTotalCents = CurrencyConverter::convertToCents($invoice->discount_rate, $invoice->currency_code);
+                $discountTotalCents = $invoice->getRawOriginal('discount_rate');
             }
         }
 
@@ -283,10 +282,10 @@ class InvoiceFactory extends Factory
         $currencyCode = $invoice->currency_code;
 
         $invoice->update([
-            'subtotal' => CurrencyConverter::convertCentsToFormatSimple($subtotalCents, $currencyCode),
-            'tax_total' => CurrencyConverter::convertCentsToFormatSimple($taxTotalCents, $currencyCode),
-            'discount_total' => CurrencyConverter::convertCentsToFormatSimple($discountTotalCents, $currencyCode),
-            'total' => CurrencyConverter::convertCentsToFormatSimple($grandTotalCents, $currencyCode),
+            'subtotal' => $subtotalCents,
+            'tax_total' => $taxTotalCents,
+            'discount_total' => $discountTotalCents,
+            'total' => $grandTotalCents,
         ]);
     }
 }

database/factories/Accounting/RecurringInvoiceFactory.php

@@ -16,7 +16,6 @@ use App\Models\Accounting\DocumentLineItem;
 use App\Models\Accounting\RecurringInvoice;
 use App\Models\Common\Client;
 use App\Models\Company;
-use App\Utilities\Currency\CurrencyConverter;
 use App\Utilities\RateCalculator;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
@@ -325,7 +324,7 @@ class RecurringInvoiceFactory extends Factory
                 $scaledRate = RateCalculator::parseLocalizedRate($recurringInvoice->discount_rate);
                 $discountTotalCents = RateCalculator::calculatePercentage($subtotalCents, $scaledRate);
             } else {
-                $discountTotalCents = CurrencyConverter::convertToCents($recurringInvoice->discount_rate, $recurringInvoice->currency_code);
+                $discountTotalCents = $recurringInvoice->getRawOriginal('discount_rate');
             }
         }
 
@@ -333,10 +332,10 @@ class RecurringInvoiceFactory extends Factory
         $currencyCode = $recurringInvoice->currency_code;
 
         $recurringInvoice->update([
-            'subtotal' => CurrencyConverter::convertCentsToFormatSimple($subtotalCents, $currencyCode),
-            'tax_total' => CurrencyConverter::convertCentsToFormatSimple($taxTotalCents, $currencyCode),
-            'discount_total' => CurrencyConverter::convertCentsToFormatSimple($discountTotalCents, $currencyCode),
-            'total' => CurrencyConverter::convertCentsToFormatSimple($grandTotalCents, $currencyCode),
+            'subtotal' => $subtotalCents,
+            'tax_total' => $taxTotalCents,
+            'discount_total' => $discountTotalCents,
+            'total' => $grandTotalCents,
         ]);
     }
 }