wip

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

@@ -261,7 +261,7 @@ class BillResource extends Resource
                                                 return;
                                             }
 
-                                            $unitPrice = CurrencyConverter::convertToFloat($offeringRecord->price, CurrencyAccessor::getDefaultCurrency());
+                                            $unitPrice = CurrencyConverter::convertCentsToFormatSimple($offeringRecord->price, 'USD');
 
                                             $set('description', $offeringRecord->description);
                                             $set('unit_price', $unitPrice);
@@ -284,7 +284,7 @@ class BillResource extends Resource
                                 Forms\Components\TextInput::make('unit_price')
                                     ->label('Price')
                                     ->hiddenLabel()
-                                    ->numeric()
+                                    ->money(useAffix: false)
                                     ->live()
                                     ->maxValue(9999999999.99)
                                     ->default(0),
@@ -327,7 +327,9 @@ class BillResource extends Resource
                                     ->extraAttributes(['class' => 'text-left sm:text-right'])
                                     ->content(function (Forms\Get $get) {
                                         $quantity = max((float) ($get('quantity') ?? 0), 0);
-                                        $unitPrice = max((float) ($get('unit_price') ?? 0), 0);
+                                        $unitPrice = CurrencyConverter::isValidAmount($get('unit_price'), 'USD')
+                                            ? CurrencyConverter::convertToFloat($get('unit_price'), 'USD')
+                                            : 0;
                                         $purchaseTaxes = $get('purchaseTaxes') ?? [];
                                         $purchaseDiscounts = $get('purchaseDiscounts') ?? [];
                                         $currencyCode = $get('../../currency_code') ?? CurrencyAccessor::getDefaultCurrency();

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

@@ -272,7 +272,7 @@ class InvoiceResource extends Resource
                                                 return;
                                             }
 
-                                            $unitPrice = CurrencyConverter::convertCentsToFloat($offeringRecord->price, CurrencyAccessor::getDefaultCurrency());
+                                            $unitPrice = CurrencyConverter::convertCentsToFormatSimple($offeringRecord->price, 'USD');
 
                                             $set('description', $offeringRecord->description);
                                             $set('unit_price', $unitPrice);
@@ -294,7 +294,7 @@ class InvoiceResource extends Resource
                                     ->default(1),
                                 Forms\Components\TextInput::make('unit_price')
                                     ->hiddenLabel()
-                                    ->numeric()
+                                    ->money(useAffix: false)
                                     ->live()
                                     ->maxValue(9999999999.99)
                                     ->default(0),
@@ -337,7 +337,9 @@ class InvoiceResource extends Resource
                                     ->extraAttributes(['class' => 'text-left sm:text-right'])
                                     ->content(function (Forms\Get $get) {
                                         $quantity = max((float) ($get('quantity') ?? 0), 0);
-                                        $unitPrice = max((float) ($get('unit_price') ?? 0), 0);
+                                        $unitPrice = CurrencyConverter::isValidAmount($get('unit_price'), 'USD')
+                                            ? CurrencyConverter::convertToFloat($get('unit_price'), 'USD')
+                                            : 0;
                                         $salesTaxes = $get('salesTaxes') ?? [];
                                         $salesDiscounts = $get('salesDiscounts') ?? [];
                                         $currencyCode = $get('../../currency_code') ?? CurrencyAccessor::getDefaultCurrency();

app/Models/Accounting/DocumentLineItem.php

@@ -41,14 +41,6 @@ class DocumentLineItem extends Model
         'updated_by',
     ];
 
-    protected $casts = [
-        'unit_price' => DocumentMoneyCast::class,
-        'subtotal' => DocumentMoneyCast::class,
-        'tax_total' => DocumentMoneyCast::class,
-        'discount_total' => DocumentMoneyCast::class,
-        'total' => DocumentMoneyCast::class,
-    ];
-
     public function documentable(): MorphTo
     {
         return $this->morphTo();

app/Models/Accounting/Invoice.php

@@ -393,7 +393,7 @@ class Invoice extends Document
 
         foreach ($this->lineItems as $index => $lineItem) {
             $lineItemDescription = "{$baseDescription} › {$lineItem->offering->name}";
-            $lineItemSubtotalInInvoiceCurrency = $lineItem->getRawOriginal('subtotal');
+            $lineItemSubtotalInInvoiceCurrency = $lineItem->subtotal;
 
             $journalEntryData[] = [
                 'type' => JournalEntryType::Credit,
@@ -415,7 +415,7 @@ class Invoice extends Document
 
             // Handle per-document discount allocation
             if ($this->discount_method->isPerDocument() && $totalLineItemSubtotalInInvoiceCurrency > 0) {
-                $lineItemSubtotalInInvoiceCurrency = (int) $lineItem->getRawOriginal('subtotal');
+                $lineItemSubtotalInInvoiceCurrency = $lineItem->subtotal;
 
                 if ($index === $this->lineItems->count() - 1) {
                     $lineItemDiscountInInvoiceCurrency = $remainingDiscountInInvoiceCurrency;

app/View/Models/DocumentTotalViewModel.php

@@ -72,22 +72,27 @@ class DocumentTotalViewModel
     private function calculateLineSubtotalInCents(array $item, string $currencyCode): int
     {
         $quantity = max((float) ($item['quantity'] ?? 0), 0);
-        $unitPrice = max((float) ($item['unit_price'] ?? 0), 0);
+        $unitPrice = CurrencyConverter::isValidAmount($item['unit_price'], 'USD')
+            ? CurrencyConverter::convertToFloat($item['unit_price'], 'USD')
+            : 0;
 
         $subtotal = $quantity * $unitPrice;
 
-        return CurrencyConverter::convertToCents($subtotal, $currencyCode);
+        return CurrencyConverter::convertToCents($subtotal, 'USD');
     }
 
     private function calculateAdjustmentsTotalInCents($lineItems, string $key, string $currencyCode): int
     {
-        return $lineItems->reduce(function ($carry, $item) use ($key, $currencyCode) {
+        return $lineItems->reduce(function ($carry, $item) use ($key) {
             $quantity = max((float) ($item['quantity'] ?? 0), 0);
-            $unitPrice = max((float) ($item['unit_price'] ?? 0), 0);
+            $unitPrice = CurrencyConverter::isValidAmount($item['unit_price'], 'USD')
+                ? CurrencyConverter::convertToFloat($item['unit_price'], 'USD')
+                : 0;
+
             $adjustmentIds = $item[$key] ?? [];
             $lineTotal = $quantity * $unitPrice;
 
-            $lineTotalInCents = CurrencyConverter::convertToCents($lineTotal, $currencyCode);
+            $lineTotalInCents = CurrencyConverter::convertToCents($lineTotal, 'USD');
 
             $adjustmentTotal = Adjustment::whereIn('id', $adjustmentIds)
                 ->get()
@@ -152,8 +157,7 @@ class DocumentTotalViewModel
 
     private function calculateAmountDueInCents(int $grandTotalInCents, string $currencyCode): int
     {
-        $amountPaid = $this->data['amount_paid'] ?? '0.00';
-        $amountPaidInCents = CurrencyConverter::convertToCents($amountPaid, $currencyCode);
+        $amountPaidInCents = $this->data['amount_paid'] ?? 0;
 
         return $grandTotalInCents - $amountPaidInCents;
     }

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.343.18",
+            "version": "3.343.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "ae98d503173740cce23b30d2ba2737c49b0d9876"
+                "reference": "00b44b1a9d570bc945d223b20886c1ac13b54641"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ae98d503173740cce23b30d2ba2737c49b0d9876",
-                "reference": "ae98d503173740cce23b30d2ba2737c49b0d9876",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/00b44b1a9d570bc945d223b20886c1ac13b54641",
+                "reference": "00b44b1a9d570bc945d223b20886c1ac13b54641",
                 "shasum": ""
             },
             "require": {
@@ -588,9 +588,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.343.18"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.343.19"
             },
-            "time": "2025-05-23T18:08:18+00:00"
+            "time": "2025-05-27T18:10:12+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -1799,7 +1799,7 @@
         },
         {
             "name": "filament/actions",
-            "version": "v3.3.16",
+            "version": "v3.3.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
@@ -1852,16 +1852,16 @@
         },
         {
             "name": "filament/filament",
-            "version": "v3.3.16",
+            "version": "v3.3.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
-                "reference": "ed0a0109e6b2663247fcd73076c95c918bc5b412"
+                "reference": "94ee92244d2a64666fb8c1ea50cb7315ebceb63b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/ed0a0109e6b2663247fcd73076c95c918bc5b412",
-                "reference": "ed0a0109e6b2663247fcd73076c95c918bc5b412",
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/94ee92244d2a64666fb8c1ea50cb7315ebceb63b",
+                "reference": "94ee92244d2a64666fb8c1ea50cb7315ebceb63b",
                 "shasum": ""
             },
             "require": {
@@ -1913,20 +1913,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-05-21T08:45:13+00:00"
+            "time": "2025-05-27T18:46:23+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v3.3.16",
+            "version": "v3.3.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "eeb18e482b1addc5fe88d57f59d6b91cb71957ff"
+                "reference": "5cef64051fcb23cbbc6152baaac5da1c44ec9a63"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/eeb18e482b1addc5fe88d57f59d6b91cb71957ff",
-                "reference": "eeb18e482b1addc5fe88d57f59d6b91cb71957ff",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/5cef64051fcb23cbbc6152baaac5da1c44ec9a63",
+                "reference": "5cef64051fcb23cbbc6152baaac5da1c44ec9a63",
                 "shasum": ""
             },
             "require": {
@@ -1969,11 +1969,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-05-21T08:45:29+00:00"
+            "time": "2025-05-27T18:46:33+00:00"
         },
         {
             "name": "filament/infolists",
-            "version": "v3.3.16",
+            "version": "v3.3.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
@@ -2024,7 +2024,7 @@
         },
         {
             "name": "filament/notifications",
-            "version": "v3.3.16",
+            "version": "v3.3.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
@@ -2076,7 +2076,7 @@
         },
         {
             "name": "filament/support",
-            "version": "v3.3.16",
+            "version": "v3.3.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
@@ -2135,7 +2135,7 @@
         },
         {
             "name": "filament/tables",
-            "version": "v3.3.16",
+            "version": "v3.3.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
@@ -2187,7 +2187,7 @@
         },
         {
             "name": "filament/widgets",
-            "version": "v3.3.16",
+            "version": "v3.3.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
@@ -3516,16 +3516,16 @@
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.20.0",
+            "version": "v5.21.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "30972c12a41f71abeb418bc9ff157da8d9231519"
+                "reference": "d83639499ad14985c9a6a9713b70073300ce998d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/30972c12a41f71abeb418bc9ff157da8d9231519",
-                "reference": "30972c12a41f71abeb418bc9ff157da8d9231519",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/d83639499ad14985c9a6a9713b70073300ce998d",
+                "reference": "d83639499ad14985c9a6a9713b70073300ce998d",
                 "shasum": ""
             },
             "require": {
@@ -3584,7 +3584,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2025-04-21T14:21:34+00:00"
+            "time": "2025-05-19T12:56:37+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -9861,16 +9861,16 @@
         },
         {
             "name": "laravel/sail",
-            "version": "v1.43.0",
+            "version": "v1.43.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sail.git",
-                "reference": "71a509b14b2621ce58574274a74290f933c687f7"
+                "reference": "3e7d899232a8c5e3ea4fc6dee7525ad583887e72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sail/zipball/71a509b14b2621ce58574274a74290f933c687f7",
-                "reference": "71a509b14b2621ce58574274a74290f933c687f7",
+                "url": "https://api.github.com/repos/laravel/sail/zipball/3e7d899232a8c5e3ea4fc6dee7525ad583887e72",
+                "reference": "3e7d899232a8c5e3ea4fc6dee7525ad583887e72",
                 "shasum": ""
             },
             "require": {
@@ -9920,7 +9920,7 @@
                 "issues": "https://github.com/laravel/sail/issues",
                 "source": "https://github.com/laravel/sail"
             },
-            "time": "2025-05-13T13:34:34+00:00"
+            "time": "2025-05-19T13:19:21+00:00"
         },
         {
             "name": "mockery/mockery",