wip

app/Casts/JournalEntryCast.php

@@ -2,23 +2,15 @@
 
 namespace App\Casts;
 
-use App\Utilities\Currency\CurrencyAccessor;
-use App\Utilities\Currency\CurrencyConverter;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Illuminate\Database\Eloquent\Model;
 use UnexpectedValueException;
 
 class JournalEntryCast implements CastsAttributes
 {
-    public function get(Model $model, string $key, mixed $value, array $attributes): string
+    public function get(Model $model, string $key, mixed $value, array $attributes): int
     {
-        $currency_code = CurrencyAccessor::getDefaultCurrency();
-
-        if ($value !== null) {
-            return CurrencyConverter::prepareForMutator($value, $currency_code);
-        }
-
-        return '';
+        return (int) $value;
     }
 
     /**

app/Casts/MoneyCast.php

@@ -2,23 +2,15 @@
 
 namespace App\Casts;
 
-use App\Utilities\Currency\CurrencyAccessor;
-use App\Utilities\Currency\CurrencyConverter;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Illuminate\Database\Eloquent\Model;
 use UnexpectedValueException;
 
 class MoneyCast implements CastsAttributes
 {
-    public function get(Model $model, string $key, mixed $value, array $attributes): string
+    public function get(Model $model, string $key, mixed $value, array $attributes): int
     {
-        $currency_code = $attributes['currency_code'] ?? CurrencyAccessor::getDefaultCurrency();
-
-        if ($value !== null) {
-            return CurrencyConverter::prepareForMutator($value, $currency_code);
-        }
-
-        return '';
+        return (int) $value;
     }
 
     /**

app/Casts/TransactionAmountCast.php

@@ -4,7 +4,6 @@ namespace App\Casts;
 
 use App\Models\Banking\BankAccount;
 use App\Utilities\Currency\CurrencyAccessor;
-use App\Utilities\Currency\CurrencyConverter;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Illuminate\Database\Eloquent\Model;
 use UnexpectedValueException;
@@ -37,22 +36,9 @@ class TransactionAmountCast implements CastsAttributes
         }
     }
 
-    public function get(Model $model, string $key, mixed $value, array $attributes): string
+    public function get(Model $model, string $key, mixed $value, array $attributes): int
     {
-        // Attempt to retrieve the currency code from the related bankAccount->account model
-        $bankAccountId = $attributes['bank_account_id'] ?? null;
-
-        if ($bankAccountId !== null && ! isset(self::$currencyCache[$bankAccountId])) {
-            $this->loadMissingBankAccounts([$bankAccountId]);
-        }
-
-        $currencyCode = $this->getCurrencyCodeFromBankAccountId($bankAccountId);
-
-        if ($value !== null) {
-            return CurrencyConverter::prepareForMutator($value, $currencyCode);
-        }
-
-        return '';
+        return (int) $value;
     }
 
     /**

app/Collections/Accounting/JournalEntryCollection.php

@@ -4,7 +4,6 @@ namespace App\Collections\Accounting;
 
 use App\Models\Accounting\JournalEntry;
 use App\Utilities\Currency\CurrencyAccessor;
-use App\Utilities\Currency\CurrencyConverter;
 use App\ValueObjects\Money;
 use Illuminate\Database\Eloquent\Collection;
 
@@ -14,7 +13,7 @@ class JournalEntryCollection extends Collection
     {
         $total = $this->reduce(static function ($carry, JournalEntry $item) {
             if ($item->type->isDebit()) {
-                $amountAsInteger = CurrencyConverter::convertToCents($item->amount);
+                $amountAsInteger = $item->amount;
 
                 return bcadd($carry, $amountAsInteger, 0);
             }
@@ -29,7 +28,7 @@ class JournalEntryCollection extends Collection
     {
         $total = $this->reduce(static function ($carry, JournalEntry $item) {
             if ($item->type->isCredit()) {
-                $amountAsInteger = CurrencyConverter::convertToCents($item->amount);
+                $amountAsInteger = $item->amount;
 
                 return bcadd($carry, $amountAsInteger, 0);
             }

app/Concerns/HasTransactionAction.php

@@ -14,7 +14,6 @@ use Closure;
 use Filament\Forms;
 use Filament\Forms\Components\Actions\Action as FormAction;
 use Filament\Forms\Form;
-use Filament\Support\RawJs;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Str;
 
@@ -328,23 +327,7 @@ trait HasTransactionAction
             Forms\Components\TextInput::make('amount')
                 ->label('Amount')
                 ->live()
-                ->mask(RawJs::make('$money($input)'))
-                ->dehydrateStateUsing(function (?string $state): ?int {
-                    if (blank($state)) {
-                        return null;
-                    }
-
-                    // Remove thousand separators
-                    $cleaned = str_replace(',', '', $state);
-
-                    // If no decimal point, assume it's whole dollars (add .00)
-                    if (! str_contains($cleaned, '.')) {
-                        $cleaned .= '.00';
-                    }
-
-                    // Convert to float then to cents (integer)
-                    return (int) round((float) $cleaned * 100);
-                })
+                ->money()
                 ->afterStateUpdated(function (Forms\Get $get, Forms\Set $set, ?string $state, ?string $old) {
                     $this->updateJournalEntryAmount(JournalEntryType::parse($get('type')), $state, $old);
                 })

app/DTO/DocumentDTO.php

@@ -94,9 +94,9 @@ readonly class DocumentDTO
         );
     }
 
-    protected static function formatToMoney(float | string $value, ?string $currencyCode): string
+    protected static function formatToMoney(int $value, ?string $currencyCode): string
     {
-        return CurrencyConverter::formatToMoney($value, $currencyCode);
+        return CurrencyConverter::formatCentsToMoney($value, $currencyCode);
     }
 
     public function getFontHtml(): Htmlable

app/DTO/DocumentPreviewDTO.php

@@ -17,7 +17,7 @@ readonly class DocumentPreviewDTO extends DocumentDTO
         $paymentTerms = PaymentTerms::parse($data['payment_terms']) ?? $settings->payment_terms;
 
         $amountDue = $settings->type !== DocumentType::Estimate ?
-            self::formatToMoney('950', null) :
+            self::formatToMoney(95000, null) :
             null;
 
         return new self(
@@ -31,11 +31,11 @@ readonly class DocumentPreviewDTO extends DocumentDTO
             date: $company->locale->date_format->getLabel(),
             dueDate: $paymentTerms->getDueDate($company->locale->date_format->value),
             currencyCode: CurrencyAccessor::getDefaultCurrency(),
-            subtotal: self::formatToMoney('1000', null),
-            discount: self::formatToMoney('100', null),
-            tax: self::formatToMoney('50', null),
-            total: self::formatToMoney('950', null),
-            amountDue: $amountDue,
+            subtotal: self::formatToMoney(100000, null), // $1000.00
+            discount: self::formatToMoney(10000, null), // $100.00
+            tax: self::formatToMoney(5000, null), // $50.00
+            total: self::formatToMoney(95000, null), // $950.00
+            amountDue: $amountDue, // $950.00 or null for estimates
             company: CompanyDTO::fromModel($company),
             client: ClientPreviewDTO::fake(),
             lineItems: LineItemPreviewDTO::fakeItems(),

app/DTO/LineItemDTO.php

@@ -26,8 +26,12 @@ readonly class LineItemDTO
         );
     }
 
-    protected static function formatToMoney(float | string $value, ?string $currencyCode): string
+    protected static function formatToMoney(float | string | int $value, ?string $currencyCode): string
     {
+        if (is_int($value)) {
+            return CurrencyConverter::formatCentsToMoney($value, $currencyCode);
+        }
+
         return CurrencyConverter::formatToMoney($value, $currencyCode);
     }
 }

app/DTO/LineItemPreviewDTO.php

@@ -8,25 +8,25 @@ readonly class LineItemPreviewDTO extends LineItemDTO
     {
         return [
             new self(
-                name: 'Item 1',
-                description: 'Sample item description',
+                name: 'Professional Services',
+                description: 'Consulting and strategic planning',
                 quantity: 2,
-                unitPrice: self::formatToMoney(150.00, null),
-                subtotal: self::formatToMoney(300.00, null),
+                unitPrice: self::formatToMoney(15000, null), // $150.00
+                subtotal: self::formatToMoney(30000, null),  // $300.00
             ),
             new self(
-                name: 'Item 2',
-                description: 'Another sample item description',
+                name: 'Software License',
+                description: 'Annual subscription and support',
                 quantity: 3,
-                unitPrice: self::formatToMoney(200.00, null),
-                subtotal: self::formatToMoney(600.00, null),
+                unitPrice: self::formatToMoney(20000, null), // $200.00
+                subtotal: self::formatToMoney(60000, null),  // $600.00
             ),
             new self(
-                name: 'Item 3',
-                description: 'Yet another sample item description',
+                name: 'Training Session',
+                description: 'Team onboarding and documentation',
                 quantity: 1,
-                unitPrice: self::formatToMoney(180.00, null),
-                subtotal: self::formatToMoney(180.00, null),
+                unitPrice: self::formatToMoney(10000, null), // $100.00
+                subtotal: self::formatToMoney(10000, null),  // $100.00
             ),
         ];
     }

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

@@ -584,11 +584,11 @@ class BillResource extends Resource
                             }
                         })
                         ->mountUsing(function (Collection $records, Form $form) {
-                            $totalAmountDue = $records->sum(fn (Bill $bill) => $bill->getRawOriginal('amount_due'));
+                            $totalAmountDue = $records->sum('amount_due');
 
                             $form->fill([
                                 'posted_at' => now(),
-                                'amount' => CurrencyConverter::convertCentsToFormatSimple($totalAmountDue),
+                                'amount' => $totalAmountDue,
                             ]);
                         })
                         ->form([
@@ -625,7 +625,7 @@ class BillResource extends Resource
                         ])
                         ->before(function (Collection $records, Tables\Actions\BulkAction $action, array $data) {
                             $totalPaymentAmount = $data['amount'] ?? 0;
-                            $totalAmountDue = $records->sum(fn (Bill $bill) => $bill->getRawOriginal('amount_due'));
+                            $totalAmountDue = $records->sum('amount_due');
 
                             if ($totalPaymentAmount > $totalAmountDue) {
                                 $formattedTotalAmountDue = CurrencyConverter::formatCentsToMoney($totalAmountDue);
@@ -645,7 +645,7 @@ class BillResource extends Resource
                             $remainingAmount = $totalPaymentAmount;
 
                             $records->each(function (Bill $record) use (&$remainingAmount, $data) {
-                                $amountDue = $record->getRawOriginal('amount_due');
+                                $amountDue = $record->amount_due;
 
                                 if ($amountDue <= 0 || $remainingAmount <= 0) {
                                     return;

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

@@ -210,7 +210,7 @@ class PaymentsRelationManager extends RelationManager
                         }
                     )
                     ->sortable()
-                    ->currency(static fn (Transaction $transaction) => $transaction->bankAccount?->account->currency_code ?? CurrencyAccessor::getDefaultCurrency(), true),
+                    ->currency(static fn (Transaction $transaction) => $transaction->bankAccount?->account->currency_code ?? CurrencyAccessor::getDefaultCurrency()),
             ])
             ->filters([
                 //

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

@@ -272,7 +272,7 @@ class InvoiceResource extends Resource
                                                 return;
                                             }
 
-                                            $unitPrice = CurrencyConverter::convertToFloat($offeringRecord->price, CurrencyAccessor::getDefaultCurrency());
+                                            $unitPrice = CurrencyConverter::convertCentsToFloat($offeringRecord->price, CurrencyAccessor::getDefaultCurrency());
 
                                             $set('description', $offeringRecord->description);
                                             $set('unit_price', $unitPrice);
@@ -697,7 +697,7 @@ class InvoiceResource extends Resource
                             }
                         })
                         ->mountUsing(function (DocumentCollection $records, Form $form) {
-                            $totalAmountDue = $records->sumMoneyFormattedSimple('amount_due');
+                            $totalAmountDue = $records->sum('amount_due');
 
                             $form->fill([
                                 'posted_at' => now(),
@@ -738,7 +738,7 @@ class InvoiceResource extends Resource
                         ])
                         ->before(function (DocumentCollection $records, Tables\Actions\BulkAction $action, array $data) {
                             $totalPaymentAmount = $data['amount'] ?? 0;
-                            $totalAmountDue = $records->sumMoneyInCents('amount_due');
+                            $totalAmountDue = $records->sum('amount_due');
 
                             if ($totalPaymentAmount > $totalAmountDue) {
                                 $formattedTotalAmountDue = CurrencyConverter::formatCentsToMoney($totalAmountDue);
@@ -759,7 +759,7 @@ class InvoiceResource extends Resource
                             $remainingAmount = $totalPaymentAmount;
 
                             $records->each(function (Invoice $record) use (&$remainingAmount, $data) {
-                                $amountDue = $record->getRawOriginal('amount_due');
+                                $amountDue = $record->amount_due;
 
                                 if ($amountDue <= 0 || $remainingAmount <= 0) {
                                     return;

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

@@ -223,7 +223,7 @@ class PaymentsRelationManager extends RelationManager
                         }
                     )
                     ->sortable()
-                    ->currency(static fn (Transaction $transaction) => $transaction->bankAccount?->account->currency_code ?? CurrencyAccessor::getDefaultCurrency(), true),
+                    ->currency(static fn (Transaction $transaction) => $transaction->bankAccount?->account->currency_code ?? CurrencyAccessor::getDefaultCurrency()),
             ])
             ->filters([
                 //

app/Models/Accounting/Bill.php

@@ -267,7 +267,7 @@ class Bill extends Document
 
         $journalEntryData = [];
 
-        $totalInBillCurrency = $this->getRawOriginal('total');
+        $totalInBillCurrency = $this->total;
         $journalEntryData[] = [
             'type' => JournalEntryType::Credit,
             'account_id' => Account::getAccountsPayableAccount($this->company_id)->id,
@@ -276,7 +276,7 @@ class Bill extends Document
         ];
 
         $totalLineItemSubtotalInBillCurrency = (int) $this->lineItems()->sum('subtotal');
-        $billDiscountTotalInBillCurrency = (int) $this->getRawOriginal('discount_total');
+        $billDiscountTotalInBillCurrency = (int) $this->discount_total;
         $remainingDiscountInBillCurrency = $billDiscountTotalInBillCurrency;
 
         foreach ($this->lineItems as $index => $lineItem) {

app/Providers/MacroServiceProvider.php

@@ -66,6 +66,15 @@ class MacroServiceProvider extends ServiceProvider
             }
 
             $this->mask(RawJs::make('$money($input)'))
+                ->afterStateHydrated(function (TextInput $component, ?int $state) use ($currency) {
+                    if (blank($state)) {
+                        return;
+                    }
+
+                    $currencyCode = $component->evaluate($currency);
+                    $formatted = CurrencyConverter::convertCentsToFormatSimple($state, $currencyCode);
+                    $component->state($formatted);
+                })
                 ->dehydrateStateUsing(function (?string $state): ?int {
                     if (blank($state)) {
                         return null;
@@ -187,7 +196,7 @@ class MacroServiceProvider extends ServiceProvider
 
         TextColumn::macro('currency', function (string | Closure | null $currency = null, ?bool $convert = null): static {
             $currency ??= CurrencyAccessor::getDefaultCurrency();
-            $convert ??= true;
+            $convert ??= false;
 
             $this->formatStateUsing(static function (TextColumn $column, $state) use ($currency, $convert): ?string {
                 if (blank($state)) {
@@ -205,7 +214,7 @@ class MacroServiceProvider extends ServiceProvider
 
         TextEntry::macro('currency', function (string | Closure | null $currency = null, ?bool $convert = null): static {
             $currency ??= CurrencyAccessor::getDefaultCurrency();
-            $convert ??= true;
+            $convert ??= false;
 
             $this->formatStateUsing(static function (TextEntry $entry, $state) use ($currency, $convert): ?string {
                 if (blank($state)) {
@@ -223,7 +232,7 @@ class MacroServiceProvider extends ServiceProvider
 
         TextColumn::macro('currencyWithConversion', function (string | Closure | null $currency = null, ?bool $convertFromCents = null): static {
             $currency ??= CurrencyAccessor::getDefaultCurrency();
-            $convertFromCents ??= false;
+            $convertFromCents ??= true;
 
             $this->formatStateUsing(static function (TextColumn $column, $state) use ($currency, $convertFromCents): ?string {
                 if (blank($state)) {

app/Services/TransactionService.php

@@ -259,16 +259,12 @@ class TransactionService
             return $this->convertToDefaultCurrency($transaction->amount, $bankAccountCurrency, $defaultCurrency);
         }
 
-        return CurrencyConverter::prepareForAccessor($transaction->amount, $defaultCurrency);
+        return $transaction->amount;
     }
 
-    private function convertToDefaultCurrency(string $amount, string $fromCurrency, string $toCurrency): string
+    private function convertToDefaultCurrency(int $amount, string $fromCurrency, string $toCurrency): int
     {
-        $amountInCents = CurrencyConverter::prepareForAccessor($amount, $fromCurrency);
-
-        $convertedAmountInCents = CurrencyConverter::convertBalance($amountInCents, $fromCurrency, $toCurrency);
-
-        return $convertedAmountInCents;
+        return CurrencyConverter::convertBalance($amount, $fromCurrency, $toCurrency);
     }
 
     private function hasRelevantChanges(Transaction $transaction): bool