wip refactor

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

@@ -129,6 +129,7 @@ class BillResource extends Resource
                             })
                             ->schema([
                                 Forms\Components\Select::make('offering_id')
+                                    ->label('Item')
                                     ->relationship('purchasableOffering', 'name')
                                     ->preload()
                                     ->searchable()
@@ -156,11 +157,13 @@ class BillResource extends Resource
                                     ->live()
                                     ->default(1),
                                 Forms\Components\TextInput::make('unit_price')
+                                    ->label('Price')
                                     ->hiddenLabel()
                                     ->numeric()
                                     ->live()
                                     ->default(0),
                                 Forms\Components\Select::make('purchaseTaxes')
+                                    ->label('Taxes')
                                     ->relationship('purchaseTaxes', 'name')
                                     ->saveRelationshipsUsing(null)
                                     ->dehydrated(true)
@@ -169,6 +172,7 @@ class BillResource extends Resource
                                     ->live()
                                     ->searchable(),
                                 Forms\Components\Select::make('purchaseDiscounts')
+                                    ->label('Discounts')
                                     ->relationship('purchaseDiscounts', 'name')
                                     ->saveRelationshipsUsing(null)
                                     ->dehydrated(true)
@@ -183,6 +187,7 @@ class BillResource extends Resource
                                     ->searchable(),
                                 Forms\Components\Placeholder::make('total')
                                     ->hiddenLabel()
+                                    ->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);
@@ -253,15 +258,17 @@ class BillResource extends Resource
                 Tables\Columns\TextColumn::make('vendor.name')
                     ->sortable(),
                 Tables\Columns\TextColumn::make('total')
-                    ->currency()
-                    ->sortable(),
+                    ->currencyWithConversion(static fn (Bill $record) => $record->currency_code)
+                    ->sortable()
+                    ->toggleable(),
                 Tables\Columns\TextColumn::make('amount_paid')
                     ->label('Amount Paid')
-                    ->currency()
-                    ->sortable(),
+                    ->currencyWithConversion(static fn (Bill $record) => $record->currency_code)
+                    ->sortable()
+                    ->toggleable(),
                 Tables\Columns\TextColumn::make('amount_due')
                     ->label('Amount Due')
-                    ->currency()
+                    ->currencyWithConversion(static fn (Bill $record) => $record->currency_code)
                     ->sortable(),
             ])
             ->filters([

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

@@ -240,6 +240,7 @@ class InvoiceResource extends Resource
                                     ->searchable(),
                                 Forms\Components\Placeholder::make('total')
                                     ->hiddenLabel()
+                                    ->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);

app/Filament/Forms/Components/DocumentTotals.php

@@ -20,21 +20,22 @@ class DocumentTotals extends Grid
         parent::setUp();
 
         $this->schema([
-            TextInput::make('discount_rate')
-                ->label('Discount Rate')
-                ->hiddenLabel()
-                ->live()
-                ->rate(computation: static fn (Get $get) => $get('discount_computation'), showAffix: false),
             Select::make('discount_computation')
                 ->label('Discount Computation')
                 ->hiddenLabel()
-                ->options([
-                    'percentage' => '%',
-                    'fixed' => '$',
-                ])
+                ->options(AdjustmentComputation::class)
                 ->default(AdjustmentComputation::Percentage)
                 ->selectablePlaceholder(false)
                 ->live(),
+            TextInput::make('discount_rate')
+                ->label('Discount Rate')
+                ->hiddenLabel()
+                ->live()
+                ->extraInputAttributes(['class' => 'text-right'])
+                ->rate(
+                    computation: static fn (Get $get) => $get('discount_computation'),
+                    currency: static fn (Get $get) => $get('currency_code'),
+                ),
         ]);
     }
 

app/Helpers/format.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Setting\NumberFormat;
 use App\Models\Setting\Localization;
 use Filament\Support\RawJs;
@@ -44,18 +45,15 @@ if (! function_exists('percentMask')) {
 if (! function_exists('ratePrefix')) {
     function ratePrefix($computation, ?string $currency = null): ?string
     {
-        if ($computation instanceof BackedEnum) {
-            $computation = $computation->value;
-        }
+        $computationEnum = AdjustmentComputation::parse($computation);
+        $localization = Localization::firstOrFail();
 
-        if ($computation === 'fixed') {
-            return currency($currency)->getCodePrefix();
+        if ($computationEnum->isFixed() && currency($currency)->isSymbolFirst()) {
+            return currency($currency)->getPrefix();
         }
 
-        if ($computation === 'percentage' || $computation === 'compound') {
-            $percent_first = Localization::firstOrFail()->percent_first;
-
-            return $percent_first ? '%' : null;
+        if ($computationEnum->isPercentage() && $localization->percent_first) {
+            return '%';
         }
 
         return null;
@@ -65,18 +63,15 @@ if (! function_exists('ratePrefix')) {
 if (! function_exists('rateSuffix')) {
     function rateSuffix($computation, ?string $currency = null): ?string
     {
-        if ($computation instanceof BackedEnum) {
-            $computation = $computation->value;
-        }
-
-        if ($computation === 'percentage' || $computation === 'compound') {
-            $percent_first = Localization::firstOrFail()->percent_first;
+        $computationEnum = AdjustmentComputation::parse($computation);
+        $localization = Localization::firstOrFail();
 
-            return $percent_first ? null : '%';
+        if ($computationEnum->isFixed() && ! currency($currency)->isSymbolFirst()) {
+            return currency($currency)->getSuffix();
         }
 
-        if ($computation === 'fixed') {
-            return currency($currency)->getCodeSuffix();
+        if ($computationEnum->isPercentage() && ! $localization->percent_first) {
+            return '%';
         }
 
         return null;
@@ -84,19 +79,21 @@ if (! function_exists('rateSuffix')) {
 }
 
 if (! function_exists('rateMask')) {
-    function rateMask($computation, ?string $currency = null): RawJs
+    function rateMask($computation, ?string $currency = null): ?RawJs
     {
-        if ($computation instanceof BackedEnum) {
-            $computation = $computation->value;
-        }
+        $computationEnum = AdjustmentComputation::parse($computation);
 
-        if ($computation === 'percentage' || $computation === 'compound') {
+        if ($computationEnum->isPercentage()) {
             return percentMask(4);
         }
 
-        $precision = currency($currency)->getPrecision();
+        if ($computationEnum->isFixed()) {
+            $precision = currency($currency)->getPrecision();
 
-        return RawJs::make(generateJsCode($precision, $currency));
+            return RawJs::make(generateJsCode($precision, $currency));
+        }
+
+        return null;
     }
 }
 
@@ -107,21 +104,18 @@ if (! function_exists('rateFormat')) {
             return null;
         }
 
-        if ($computation instanceof BackedEnum) {
-            $computation = $computation->value;
-        }
-
-        if ($computation === 'percentage' || $computation === 'compound') {
-            $percent_first = Localization::firstOrFail()->percent_first;
+        $computationEnum = AdjustmentComputation::parse($computation);
+        $localization = Localization::firstOrFail();
 
-            if ($percent_first) {
-                return '%' . $state;
-            }
+        if ($computationEnum->isPercentage() && $localization->percent_first) {
+            return '%' . $state;
+        }
 
+        if ($computationEnum->isPercentage() && ! $localization->percent_first) {
             return $state . '%';
         }
 
-        if ($computation === 'fixed') {
+        if ($computationEnum->isFixed()) {
             return money($state, $currency, true)->formatWithCode();
         }
 

app/Providers/MacroServiceProvider.php

@@ -4,6 +4,7 @@ namespace App\Providers;
 
 use Akaunting\Money\Currency;
 use Akaunting\Money\Money;
+use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Setting\DateFormat;
 use App\Models\Accounting\AccountSubtype;
 use App\Models\Setting\Localization;
@@ -62,6 +63,56 @@ class MacroServiceProvider extends ServiceProvider
             return $this;
         });
 
+        TextInput::macro('rate', function (string | Closure | null $computation = null, string | Closure | null $currency = null, bool $showAffix = true): static {
+            return $this
+                ->when(
+                    $showAffix,
+                    fn (TextInput $component) => $component
+                        ->prefix(function (TextInput $component) use ($computation, $currency) {
+                            $evaluatedComputation = $component->evaluate($computation);
+                            $evaluatedCurrency = $component->evaluate($currency);
+
+                            return ratePrefix($evaluatedComputation, $evaluatedCurrency);
+                        })
+                        ->suffix(function (TextInput $component) use ($computation, $currency) {
+                            $evaluatedComputation = $component->evaluate($computation);
+                            $evaluatedCurrency = $component->evaluate($currency);
+
+                            return rateSuffix($evaluatedComputation, $evaluatedCurrency);
+                        })
+                )
+                ->mask(static function (TextInput $component) use ($computation, $currency) {
+                    $computation = $component->evaluate($computation);
+                    $currency = $component->evaluate($currency);
+
+                    $computationEnum = AdjustmentComputation::parse($computation);
+
+                    if ($computationEnum->isPercentage()) {
+                        return rateMask(computation: $computation);
+                    }
+
+                    return moneyMask($currency);
+                })
+                ->rule(static function (TextInput $component) use ($computation) {
+                    return static function (string $attribute, $value, Closure $fail) use ($computation, $component) {
+                        $computation = $component->evaluate($computation);
+                        $numericValue = (float) $value;
+
+                        if ($computation instanceof BackedEnum) {
+                            $computation = $computation->value;
+                        }
+
+                        if ($computation === 'percentage' || $computation === 'compound') {
+                            if ($numericValue < 0 || $numericValue > 100) {
+                                $fail(translate('The rate must be between 0 and 100.'));
+                            }
+                        } elseif ($computation === 'fixed' && $numericValue < 0) {
+                            $fail(translate('The rate must be greater than 0.'));
+                        }
+                    };
+                });
+        });
+
         TextColumn::macro('defaultDateFormat', function (): static {
             $localization = Localization::firstOrFail();
 
@@ -190,49 +241,6 @@ class MacroServiceProvider extends ServiceProvider
             return $this;
         });
 
-        TextInput::macro('rate', function (string | Closure | null $computation = null, bool $showAffix = true): static {
-            $this
-                ->when(
-                    $showAffix,
-                    fn (TextInput $component) => $component
-                        ->prefix(static function (TextInput $component) use ($computation) {
-                            $computation = $component->evaluate($computation);
-
-                            return ratePrefix(computation: $computation);
-                        })
-                        ->suffix(static function (TextInput $component) use ($computation) {
-                            $computation = $component->evaluate($computation);
-
-                            return rateSuffix(computation: $computation);
-                        })
-                )
-                ->mask(static function (TextInput $component) use ($computation) {
-                    $computation = $component->evaluate($computation);
-
-                    return rateMask(computation: $computation);
-                })
-                ->rule(static function (TextInput $component) use ($computation) {
-                    return static function (string $attribute, $value, Closure $fail) use ($computation, $component) {
-                        $computation = $component->evaluate($computation);
-                        $numericValue = (float) $value;
-
-                        if ($computation instanceof BackedEnum) {
-                            $computation = $computation->value;
-                        }
-
-                        if ($computation === 'percentage' || $computation === 'compound') {
-                            if ($numericValue < 0 || $numericValue > 100) {
-                                $fail(translate('The rate must be between 0 and 100.'));
-                            }
-                        } elseif ($computation === 'fixed' && $numericValue < 0) {
-                            $fail(translate('The rate must be greater than 0.'));
-                        }
-                    };
-                });
-
-            return $this;
-        });
-
         Field::macro('validateAccountCode', function (string | Closure | null $subtype = null): static {
             $this
                 ->rules([

app/View/Models/DocumentTotalViewModel.php

@@ -86,7 +86,7 @@ class DocumentTotalViewModel
         }
 
         $discountComputation = AdjustmentComputation::parse($this->data['discount_computation']) ?? AdjustmentComputation::Percentage;
-        $discountRate = $this->data['discount_rate'] ?? '0';
+        $discountRate = blank($this->data['discount_rate']) ? '0' : $this->data['discount_rate'];
 
         if ($discountComputation->isPercentage()) {
             $scaledDiscountRate = RateCalculator::parseLocalizedRate($discountRate);
@@ -94,6 +94,10 @@ class DocumentTotalViewModel
             return RateCalculator::calculatePercentage($subtotalInCents, $scaledDiscountRate);
         }
 
+        if (! CurrencyConverter::isValidAmount($discountRate)) {
+            $discountRate = '0';
+        }
+
         return CurrencyConverter::convertToCents($discountRate, $currencyCode);
     }
 

resources/views/filament/forms/components/document-totals.blade.php

@@ -12,8 +12,8 @@
     $isPerDocumentDiscount = $discountMethod->isPerDocument();
 @endphp
 
-<div class="totals-summary w-full pr-14">
-    <table class="w-full text-right table-fixed">
+<div class="totals-summary w-full sm:pr-14">
+    <table class="w-full text-right table-fixed hidden sm:table">
         <colgroup>
             <col class="w-[20%]"> {{-- Items --}}
             <col class="w-[30%]"> {{-- Description --}}
@@ -35,11 +35,11 @@
             </tr>
             @if($isPerDocumentDiscount)
                 <tr>
-                    <td colspan="4" class="text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white text-right">Discount:</td>
-                    <td class="text-sm px-4 py-2">
+                    <td colspan="3" class="text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white text-right">Discount:</td>
+                    <td colspan="2" class="text-sm px-4 py-2">
                         <div class="flex justify-between space-x-2">
                             @foreach($getChildComponentContainer()->getComponents() as $component)
-                                <div class="flex-1">{{ $component }}</div>
+                                <div class="flex-1 text-left">{{ $component }}</div>
                             @endforeach
                         </div>
                     </td>
@@ -66,4 +66,42 @@
             @endif
         </tbody>
     </table>
+
+    <!-- Mobile View -->
+    <div class="block sm:hidden p-5">
+        <div class="flex flex-col space-y-6">
+            <div class="flex justify-between items-center">
+                <span class="text-sm font-medium text-gray-950 dark:text-white">Subtotal:</span>
+                <span class="text-sm text-gray-950 dark:text-white">{{ $subtotal }}</span>
+            </div>
+            <div class="flex justify-between items-center">
+                <span class="text-sm font-medium text-gray-950 dark:text-white">Taxes:</span>
+                <span class="text-sm text-gray-950 dark:text-white">{{ $taxTotal }}</span>
+            </div>
+            @if($isPerDocumentDiscount)
+                <div class="flex flex-col space-y-2">
+                    <span class="text-sm font-medium text-gray-950 dark:text-white">Discount:</span>
+                    <div class="flex justify-between space-x-2">
+                        @foreach($getChildComponentContainer()->getComponents() as $component)
+                            <div class="w-1/2">{{ $component }}</div>
+                        @endforeach
+                    </div>
+                </div>
+            @else
+                <div class="flex justify-between items-center">
+                    <span class="text-sm font-medium text-gray-950 dark:text-white">Discounts:</span>
+                    <span class="text-sm text-gray-950 dark:text-white">({{ $discountTotal }})</span>
+                </div>
+            @endif
+            <div class="flex justify-between items-center font-semibold">
+                <span class="text-sm font-medium text-gray-950 dark:text-white">Total:</span>
+                <span class="text-sm text-gray-950 dark:text-white">{{ $grandTotal }}</span>
+            </div>
+            @if($conversionMessage)
+                <div class="text-sm text-gray-600">
+                    {{ $conversionMessage }}
+                </div>
+            @endif
+        </div>
+    </div>
 </div>