ariaieboy · Aug 12, 2024 · Aug 12, 2024 · Aug 12, 2024 · Sep 22, 2024 · Sep 22, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,76 @@
 
 All notable changes to `filament-currency` will be documented in this file.
 
+## 1.13.0 - 2025-02-27
+
+### What's Changed
+
+* Laravel 12.x Compatibility by @laravel-shift in https://github.com/ariaieboy/filament-currency/pull/47
+
+### New Contributors
+
+* @laravel-shift made their first contribution in https://github.com/ariaieboy/filament-currency/pull/47
+
+**Full Changelog**: https://github.com/ariaieboy/filament-currency/compare/1.12.0...1.13.0
+
+## 1.12.0 - 2025-02-08
+
+- add support for laravel-money version 6
+
+> if you use PHP 8.4 you should upgrade to laravel-money version 6
+
+**Full Changelog**: https://github.com/ariaieboy/filament-currency/compare/1.11.0...1.12.0
+
+## 1.11.0 - 2025-01-11
+
+### What's Changed
+
+* Include Support for Summarizer by @eele94 in https://github.com/ariaieboy/filament-currency/pull/46
+
+### New Contributors
+
+* @eele94 made their first contribution in https://github.com/ariaieboy/filament-currency/pull/46
+
+**Full Changelog**: https://github.com/ariaieboy/filament-currency/compare/1.10.0...1.11.0
+
+## 1.10.0 - 2024-11-03
+
+- add support for `MONEY_DEFAULTS_CONVERT` env variable
+
+**Full Changelog**: https://github.com/ariaieboy/filament-currency/compare/1.9.2...1.10.0
+
+## 1.9.2 - 2024-09-29
+
+- add php 8.4 to composer.json
+
+**Full Changelog**: https://github.com/ariaieboy/filament-currency/compare/1.9.1...1.9.2
+
+## 1.9.1 - 2024-09-24
+
+### What's Changed
+
+* fix safari error on required inputs by @ariaieboy in https://github.com/ariaieboy/filament-currency/pull/44
+
+**Full Changelog**: https://github.com/ariaieboy/filament-currency/compare/1.9.0...1.9.1
+
+## 1.9.0 - 2024-09-22
+
+### What's Changed
+
+* 41 add textinputcolumn currencymask support by @ariaieboy in https://github.com/ariaieboy/filament-currency/pull/42
+
+**Full Changelog**: https://github.com/ariaieboy/filament-currency/compare/1.8.4...1.9.0
+
+## 1.8.4 - 2024-08-12
+
+**Full Changelog**: https://github.com/ariaieboy/filament-currency/compare/1.8.3...1.8.4
+
+## 1.8.3 - 2024-08-12
+
+* fix issue https://github.com/ariaieboy/filament-currency/issues/39#issuecomment-2284272710
+
+**Full Changelog**: https://github.com/ariaieboy/filament-currency/compare/1.8.2...1.8.3
+
 ## 1.8.2 - 2024-08-12
 
 ### What's Changed

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ A new `currency(string | Closure $currency = null, bool $shouldConvert = false)`
 
 ### Summary (Table Builder)
 
-The summarizer classes `Sum` and `Average` contains the method `currency(string | Closure $currency = null, bool $shouldConvert = false)` to display the value in the configured currency format.
+The summarizer classes `Summarizer`, `Sum` and `Average` contains the method `currency(string | Closure $currency = null, bool $shouldConvert = false)` to display the value in the configured currency format.
 
 ### Text Entry (InfoLists)
 
@@ -22,6 +22,10 @@ A new `currency(string | Closure $currency = null, bool $shouldConvert = false)`
 
 We also have a `currencyMask()` method for `TextInput` that lets you mask your numbers in front-end and return the plain number to back-end.
 
+### Text Input Column (Table Builder)
+
+We also have a `currencyMask()` method for `TextInputColumn` that lets you mask your numbers in front-end and return the plain number to back-end.
+
 By using this package you can configure the formatter using [laravel-money config](https://github.com/akaunting/laravel-money/blob/master/config/money.php).
 
 For example, you can customize the `symbol`, `symbol_first`, `decimal_mark`, and `thousands_separator` for each currency. Or if you want you can add your custom currency to the config and use it in the `currency()` method instead of standard money.

diff --git a/composer.json b/composer.json
@@ -20,23 +20,23 @@
         }
     ],
     "require": {
-        "php": "~8.1|~8.2|~8.3",
-        "akaunting/laravel-money": "^1.2|^2.0|^3.0|^4.0|^5.2",
+        "php": "~8.1|~8.2|~8.3|~8.4",
+        "akaunting/laravel-money": "^1.2|^2.0|^3.0|^4.0|^5.2|^6",
         "filament/tables": "^3.0",
-        "illuminate/contracts": "^10.0|^11",
+        "illuminate/contracts": "^10.0|^11|^12.0",
         "spatie/laravel-package-tools": "^1.15.0"
     },
     "require-dev": {
         "laravel/pint": "^1.0",
         "nunomaduro/collision": "^7.9",
         "larastan/larastan": "^2.7.0",
-        "orchestra/testbench": "^8.0",
-        "pestphp/pest": "^2.0",
-        "pestphp/pest-plugin-arch": "^2.0",
-        "pestphp/pest-plugin-laravel": "^2.0",
+        "orchestra/testbench": "^8.0|^10.0",
+        "pestphp/pest": "^2.0|^3.7",
+        "pestphp/pest-plugin-arch": "^2.0|^3.0",
+        "pestphp/pest-plugin-laravel": "^2.0|^3.1",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0"
+        "phpstan/phpstan-deprecation-rules": "^1.0|^2.0",
+        "phpstan/phpstan-phpunit": "^1.0|^2.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/config/filament-currency.php b/config/filament-currency.php
@@ -7,4 +7,5 @@
      * we use it in the fallback to support the laravel-money version 5.
      */
     'default_currency' => env('CURRENCY_DEFAULT', env('MONEY_DEFAULTS_CURRENCY', config('money.defaults.currency', 'USD'))),
+    'default_convert' => env('MONEY_DEFAULTS_CONVERT', false),
 ];
diff --git a/ide-helper.stubs.php b/ide-helper.stubs.php
@@ -11,6 +11,13 @@ public function currency(string | Closure | null $currency = null, bool $shouldC
             return $this;
         }
     }
+    class TextInputColumn
+    {
+        public function currencyMask($thousandSeparator = ',', $decimalSeparator = '.', $precision = 2): self
+        {
+            return $this;
+        }
+    }
 }
 
 namespace Filament\Forms\Components {
@@ -28,6 +35,14 @@ public function currencyMask($thousandSeparator = ',', $decimalSeparator = '.',
 
     use Closure;
 
+    class Summarizer
+    {
+        public function currency(string | Closure | null $currency = null, bool $shouldConvert = false): self
+        {
+            return $this;
+        }
+    }
+
     class Average
     {
         public function currency(string | Closure | null $currency = null, bool $shouldConvert = false): self

diff --git a/resources/views/currency-mask.blade.php b/resources/views/currency-mask.blade.php
@@ -1,13 +1,11 @@
 @php
     $datalistOptions = $getDatalistOptions();
     $extraAlpineAttributes = $getExtraAlpineAttributes();
+    $hasInlineLabel = $hasInlineLabel();
     $id = $getId();
     $isConcealed = $isConcealed();
     $isDisabled = $isDisabled();
-    $isLive = $isLive();
-    $isLiveOnBlur = $isLiveOnBlur();
-    $isLiveDebounced = $isLiveDebounced();
-    $liveDebounce = $getLiveDebounce();
+    $isPasswordRevealable = $isPasswordRevealable();
     $isPrefixInline = $isPrefixInline();
     $isSuffixInline = $isSuffixInline();
     $mask = $getMask();
@@ -19,32 +17,43 @@
     $suffixLabel = $getSuffixLabel();
     $statePath = $getStatePath();
     $xmask = "\$money(\$input,'$decimalSeparator','$thousandSeparator',$precision)";
-    $xmodel = "x-model".($isLive?($isLiveOnBlur?".lazy":($isLiveDebounced?(".debounce.".$liveDebounce."ms"):"")):"");
+    $xmodel = "x-model".($isLive()?($isLiveOnBlur()?".lazy":($isLiveDebounced()?(".debounce.".$getLiveDebounce()."ms"):"")):"");
     $xdata = <<<JS
     {
         input:\$wire.{$applyStateBindingModifiers("\$entangle('{$statePath}')")},
         masked:'',
         init(){
         \$nextTick(this.updateMasked());
-        \$watch('masked',(value, oldValue)=>this.updateInput(value, oldValue));
+        \$watch('masked',(value, oldValue)=>this.updateInput(value,oldValue));
         \$watch('input', () => this.updateMasked());
         },
         updateMasked(){
             if(this.input !== undefined && typeof Number(this.input) === 'number') {
-                if(this.masked?.replaceAll('$thousandSeparator','').replaceAll('$decimalSeparator','.') !== this.input){
+                if(this.masked?.toString().replaceAll('$thousandSeparator','').replaceAll('$decimalSeparator','.') !== this.input){
                     this.masked = this.input?.toString().replaceAll('.','$decimalSeparator');
                 }
             }
         },
         updateInput(value, oldValue){
-            if(value !== oldValue)
-                this.input = this.masked?.replaceAll('$thousandSeparator','').replaceAll('$decimalSeparator','.');
+            if(value?.toString().replaceAll('$thousandSeparator','').replaceAll('$decimalSeparator','.') !== oldValue?.toString().replaceAll('$thousandSeparator','').replaceAll('$decimalSeparator','.')){
+                this.input = this.masked?.toString().replaceAll('$thousandSeparator','').replaceAll('$decimalSeparator','.');
+            }
         }
     }
 JS;
 @endphp
 
-<x-dynamic-component :component="$getFieldWrapperView()" :field="$field">
+<x-dynamic-component
+        :component="$getFieldWrapperView()"
+        :field="$field">
+    <x-slot
+            name="label"
+            @class([
+                'sm:pt-1.5' => $hasInlineLabel,
+            ])
+    >
+        {{ $getLabel() }}
+    </x-slot>
     <x-filament::input.wrapper
             :disabled="$isDisabled"
             :inline-prefix="$isPrefixInline"
@@ -55,11 +64,12 @@
             :suffix="$suffixLabel"
             :suffix-actions="$suffixActions"
             :suffix-icon="$suffixIcon"
+            :suffix-icon-color="$getSuffixIconColor()"
             :valid="! $errors->has($statePath)"
             class="fi-fo-text-input"
             :attributes="
             \Filament\Support\prepare_inherited_attributes($getExtraAttributeBag())
-                ->class(['overflow-hidden'])
+                ->class(['fi-fo-text-input overflow-hidden'])
         "
     >
         <x-filament::input

diff --git a/resources/views/text-input-column.blade.php b/resources/views/text-input-column.blade.php
@@ -0,0 +1,147 @@
+@php
+    use Filament\Support\Enums\Alignment;
+
+    $isDisabled = $isDisabled();
+    $state = $getState();
+    $mask = $getMask();
+
+    $alignment = $getAlignment() ?? Alignment::Start;
+
+    if (! $alignment instanceof Alignment) {
+        $alignment = filled($alignment) ? (Alignment::tryFrom($alignment) ?? $alignment) : null;
+    }
+
+    if (filled($mask)) {
+        $type = 'text';
+    } else {
+        $type = $getType();
+    }
+    $xmask = "\$money(\$input,'$decimalSeparator','$thousandSeparator',$precision)";
+    $xchange = <<<JS
+
+                                isLoading = true
+
+                                const response = await \$wire.updateTableColumnState(
+                                    name,
+                                    recordKey,
+                                    \$event.target.value.toString()?.replaceAll('$thousandSeparator','').replaceAll('$decimalSeparator','.'),
+                                )
+
+                                error = response?.error ?? undefined
+
+                                if (! error) {
+                                    if(state?.toString().replaceAll('$thousandSeparator','').replaceAll('$decimalSeparator','.') !== response.toString()){
+                                    state = response
+                                    }
+                                }
+
+                                isLoading = false
+JS;
+@endphp
+
+<div
+        x-data="{
+        error: undefined,
+
+        isEditing: false,
+
+        isLoading: false,
+
+        name: @js($getName()),
+
+        recordKey: @js($recordKey),
+
+        state: @js($state),
+    }"
+        x-init="
+        () => {
+            Livewire.hook('commit', ({ component, commit, succeed, fail, respond }) => {
+                succeed(({ snapshot, effect }) => {
+                    $nextTick(() => {
+                        if (component.id !== @js($this->getId())) {
+                            return
+                        }
+
+                        if (isEditing) {
+                            return
+                        }
+
+                        if (! $refs.newState) {
+                            return
+                        }
+
+                        let newState = $refs.newState.value?.toString().replaceAll('{{$thousandSeparator}}','').replaceAll('{{$decimalSeparator}}','.')
+
+                        if (state?.toString().replaceAll('{{$thousandSeparator}}','').replaceAll('{{$decimalSeparator}}','.') === newState) {
+                            return
+                        }
+
+                        state = newState
+                    })
+                })
+            })
+        }
+    "
+        {{
+            $attributes
+                ->merge($getExtraAttributes(), escape: false)
+                ->class([
+                    'fi-ta-text-input',
+                    'px-3 py-4' => ! $isInline(),
+                ])
+        }}
+>
+    <input
+            type="hidden"
+            value="{{ str($state)->replace('"', '\\"')->replace(',','') }}"
+            x-ref="newState"
+    />
+
+    <x-filament::input.wrapper
+            :alpine-disabled="'isLoading || ' . \Illuminate\Support\Js::from($isDisabled)"
+            alpine-valid="error === undefined"
+            x-tooltip="
+            error === undefined
+                ? false
+                : {
+                    content: error,
+                    theme: $store.theme,
+                }
+        "
+            x-on:click.stop=""
+    >
+        {{-- format-ignore-start --}}
+        <x-filament::input
+                :disabled="$isDisabled"
+                :input-mode="$getInputMode()"
+                :placeholder="$getPlaceholder()"
+                :step="$getStep()"
+                :type="$type"
+                :x-bind:disabled="$isDisabled ? null : 'isLoading'"
+                x-model="state"
+                x-on:blur="isEditing = false"
+                x-on:focus="isEditing = true"
+                :attributes="
+                \Filament\Support\prepare_inherited_attributes(
+                    $getExtraInputAttributeBag()
+                        ->merge([
+                            'x-on:change' . ($type === 'number' ? '.debounce.1s' : null) => $xchange,
+                            'x-mask:dynamic'=> $xmask,
+                        ])
+                        ->class([
+                            match ($alignment) {
+                                Alignment::Start => 'text-start',
+                                Alignment::Center => 'text-center',
+                                Alignment::End => 'text-end',
+                                Alignment::Left => 'text-left',
+                                Alignment::Right => 'text-right',
+                                Alignment::Justify, Alignment::Between => 'text-justify',
+                                default => $alignment,
+                            },
+                        ])
+                )
+            "
+        />
+        {{-- format-ignore-end --}}
+    </x-filament::input.wrapper>
+</div>