Skip to content

Removed date and time display format form macros #17975

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 9, 2025
Merged

Removed date and time display format form macros #17975

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
2ca0d39
Replace Form:: date_display_format on localization screen
marcusmoore Oct 2, 2025
673f936
Replace Form:: time_display_format on localization screen
marcusmoore Oct 2, 2025
c8b7782
Remove date_display_format and time_display_format macros
marcusmoore Oct 2, 2025
a1e65cd
Merge branch 'develop' into replace-date-and-time-display-macros
marcusmoore Oct 8, 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
47 changes: 0 additions & 47 deletions resources/macros/macros.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,53 +39,6 @@
return $select;
});

Form::macro('date_display_format', function ($name = 'date_display_format', $selected = null, $class = null) {
$formats = [
'Y-m-d',
'D M d, Y',
'M j, Y',
'd M, Y',
'm/d/Y',
'n/d/y',
'd/m/Y',
'd.m.Y',
'Y.m.d.',
];

foreach ($formats as $format) {
$date_display_formats[$format] = Carbon::parse(date('Y-m-d'))->format($format);
}
$select = '<select name="'.$name.'" class="'.$class.'" style="min-width:100%" aria-label="'.$name.'">';
foreach ($date_display_formats as $format => $date_display_format) {
$select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'">'.$date_display_format.'</option> ';
}

$select .= '</select>';

return $select;
});

Form::macro('time_display_format', function ($name = 'time_display_format', $selected = null, $class = null) {
$formats = [
'g:iA',
'h:iA',
'H:i',
];

$datetime = date("y-m-d").' 14:00:00';
foreach ($formats as $format) {
$time_display_formats[$format] = Carbon::parse($datetime)->format($format);
}
$select = '<select name="'.$name.'" class="'.$class.'" style="min-width:150px" aria-label="'.$name.'">';
foreach ($time_display_formats as $format => $time_display_format) {
$select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$time_display_format.'</option> ';
}

$select .= '</select>';

return $select;
});

/**
* Barcode macro
* Generates the dropdown menu of available 1D barcodes
Expand Down
29 changes: 29 additions & 0 deletions resources/views/blade/input/date-display-format.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
@php
$formats = [
'Y-m-d',
'D M d, Y',
'M j, Y',
'd M, Y',
'm/d/Y',
'n/d/y',
'd/m/Y',
'd.m.Y',
'Y.m.d.',
];

foreach ($formats as $format) {
$date_display_formats[$format] = Carbon::parse(date('Y-m-d'))->format($format);
}
@endphp

<x-input.select {{ $attributes }}>
@foreach($date_display_formats as $format => $date_display_format)
<option
value="{{ $format }}"
@selected($selected == $format)
role="option"
>
{{ $date_display_format }}
</option>
@endforeach
</x-input.select>
24 changes: 24 additions & 0 deletions resources/views/blade/input/time-display-format.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
@php
$formats = [
'g:iA',
'h:iA',
'H:i',
];

$datetime = date("y-m-d").' 14:00:00';

foreach ($formats as $format) {
$time_display_formats[$format] = Carbon::parse($datetime)->format($format);
}
@endphp

<x-input.select {{ $attributes }}>
@foreach ($time_display_formats as $format => $time_display_format)
<option
value="{{ $format }}"
@selected($selected == $format)
>
{{ $time_display_format }}
</option>
@endforeach
</x-input.select>
4 changes: 2 additions & 2 deletions resources/views/settings/localization.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@
<label for="time_display_format">{{ trans('general.time_and_date_display') }}</label>
</div>
<div class="col-md-5 col-xs-12">
{!! Form::date_display_format('date_display_format', old('date_display_format', $setting->date_display_format), 'select2') !!}
<x-input.date-display-format name="date_display_format" :selected="old('date_display_format', $setting->date_display_format)" style="min-width:100%" />
</div>
<div class="col-md-3 col-xs-12">
{!! Form::time_display_format('time_display_format', old('time_display_format', $setting->time_display_format), 'select2') !!}
<x-input.time-display-format name="time_display_format" :selected="old('time_display_format', $setting->time_display_format)" style="min-width:150px" />
</div>

{!! $errors->first('time_display_format', '<div class="col-md-9 col-md-offset-3"><span class="alert-msg" aria-hidden="true">:message</span> </div>') !!}
Expand Down
Loading