From b2e9eb866c3e978c67271c6ca3ded50a411fda5e Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 2 Oct 2025 15:38:59 -0700
Subject: [PATCH 1/3] Replace digit_separator form macro

Fixes #17204
---
 resources/views/settings/localization.blade.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/views/settings/localization.blade.php b/resources/views/settings/localization.blade.php
index c358350cd69a..6b7b0fcc8f70 100644
--- a/resources/views/settings/localization.blade.php
+++ b/resources/views/settings/localization.blade.php
@@ -99,7 +99,12 @@ class="form-control select2-container"
                                     id="default_currency"
                                 >
 
-                                {!! Form::digit_separator('digit_separator', old('digit_separator', $setting->digit_separator), 'select2') !!}
+                                <x-input.select
+                                    name="digit_separator"
+                                    :options="['1,234.56', '1.234,56']"
+                                    :selected="old('digit_separator', $setting->digit_separator)"
+                                    style="min-width:120px"
+                                />
 
                                 {!! $errors->first('default_currency', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                             </div>

From 689d5a2d580f39a31255f4d250fa696bcf7481ec Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 2 Oct 2025 15:39:28 -0700
Subject: [PATCH 2/3] Remove digit_separator form macro

---
 resources/macros/macros.php | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/resources/macros/macros.php b/resources/macros/macros.php
index b048c407fa1e..d356c5260596 100644
--- a/resources/macros/macros.php
+++ b/resources/macros/macros.php
@@ -86,25 +86,6 @@
     return $select;
 });
 
-Form::macro('digit_separator', function ($name = 'digit_separator', $selected = null, $class = null) {
-    $formats = [
-        '1,234.56',
-        '1.234,56',
-    ];
-
-    foreach ($formats as $format) {
-    }
-    $select = '<select name="'.$name.'" class="'.$class.'" style="min-width:120px">';
-    foreach ($formats as $format_inner) {
-        $select .= '<option value="'.$format_inner.'"'.($selected == $format_inner ? ' selected="selected"' : '').'>'.$format_inner.'</option> ';
-    }
-
-    $select .= '</select>';
-
-    return $select;
-});
-
-
 Form::macro('name_display_format', function ($name = 'name_display_format', $selected = null, $class = null) {
     $formats = [
         'first_last' => trans('general.firstname_lastname_display'),

From cd785c9fc382d254f35e7605b2b10422a7e15576 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 6 Oct 2025 13:06:52 -0700
Subject: [PATCH 3/3] Remove name_display_format macro that was accidentally
 re-added

---
 resources/macros/macros.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/resources/macros/macros.php b/resources/macros/macros.php
index 0c3628fe2694..231e306c7e92 100644
--- a/resources/macros/macros.php
+++ b/resources/macros/macros.php
@@ -86,22 +86,6 @@
     return $select;
 });
 
-Form::macro('name_display_format', function ($name = 'name_display_format', $selected = null, $class = null) {
-    $formats = [
-        'first_last' => trans('general.firstname_lastname_display'),
-        'last_first' => trans('general.lastname_firstname_display'),
-    ];
-
-    $select = '<select name="' . $name . '" class="' . $class . '" style="width: 100%" aria-label="' . $name . '">';
-    foreach ($formats as $format => $label) {
-        $select .= '<option value="' . $format . '"' . ($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"') . '>' . $label . '</option> ' . "\n";
-    }
-
-    $select .= '</select>';
-
-    return $select;
-});
-
 /**
  * Barcode macro
  * Generates the dropdown menu of available 1D barcodes