Skip to content

Fixed #17204 - replace Form::digit_separator macro #17976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snipe merged 4 commits into from
Oct 8, 2025
+6 −19
Merged

Fixed #17204 - replace Form::digit_separator macro #17976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2e9eb8
Replace digit_separator form macro
marcusmoore Oct 2, 2025
689d5a2
Remove digit_separator form macro
marcusmoore Oct 2, 2025
23885f5
Merge branch 'develop' into 17204-replace-form-digit-separator
marcusmoore Oct 6, 2025
cd785c9
Remove name_display_format macro that was accidentally re-added
marcusmoore Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions resources/macros/macros.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,24 +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;
});

/**
* Barcode macro
* Generates the dropdown menu of available 1D barcodes
Expand Down
7 changes: 6 additions & 1 deletion resources/views/settings/localization.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,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>
Expand Down
Loading