Merge pull request #17975 from marcusmoore/replace-date-and-time-display-macros

Removed date and time display format form macros

Author: snipe

resources/macros/macros.php

@@ -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

resources/views/blade/input/date-display-format.blade.php

@@ -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>

resources/views/blade/input/time-display-format.blade.php

@@ -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>

resources/views/settings/localization.blade.php

@@ -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>') !!}