Merge branch 'dev' into demo
This commit is contained in:
commit
d15bf133ce
@ -34,6 +34,7 @@
|
||||
<div class="relative group w-full sm:w-56 sm:flex-none"
|
||||
x-data="{ fp: null }"
|
||||
x-init="fp = flatpickr($refs.startDate, {
|
||||
disableMobile: true,
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
@ -56,6 +57,7 @@
|
||||
<div class="relative group w-full sm:w-56 sm:flex-none"
|
||||
x-data="{ fp: null }"
|
||||
x-init="fp = flatpickr($refs.endDate, {
|
||||
disableMobile: true,
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
|
||||
@ -32,14 +32,15 @@
|
||||
<div class="relative group w-full lg:w-56 lg:flex-none"
|
||||
x-data="{ fp: null }"
|
||||
x-init="fp = flatpickr($refs.startDate, {
|
||||
disableMobile: true,
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
defaultHour: 0,
|
||||
defaultMinute: 0,
|
||||
locale: '{{ app()->getLocale() == 'zh_TW' ? 'zh_tw' : 'en' }}',
|
||||
locale: '{{ app()->getLocale() == \'zh_TW\' ? \'zh_tw\' : \'en\' }}',
|
||||
position: 'auto right',
|
||||
defaultDate: '{{ $filters['start_date'] }}'
|
||||
defaultDate: '{{ $filters[\'start_date\'] }}'
|
||||
})">
|
||||
<span class="absolute inset-y-0 left-0 flex items-center pl-4 pointer-events-none z-10 text-slate-400 group-focus-within:text-cyan-500 transition-colors">
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" /></svg>
|
||||
@ -54,14 +55,15 @@
|
||||
<div class="relative group w-full lg:w-56 lg:flex-none"
|
||||
x-data="{ fp: null }"
|
||||
x-init="fp = flatpickr($refs.endDate, {
|
||||
disableMobile: true,
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
defaultHour: 23,
|
||||
defaultMinute: 59,
|
||||
locale: '{{ app()->getLocale() == 'zh_TW' ? 'zh_tw' : 'en' }}',
|
||||
locale: '{{ app()->getLocale() == \'zh_TW\' ? \'zh_tw\' : \'en\' }}',
|
||||
position: 'auto right',
|
||||
defaultDate: '{{ $filters['end_date'] }}'
|
||||
defaultDate: '{{ $filters[\'end_date\'] }}'
|
||||
})">
|
||||
<span class="absolute inset-y-0 left-0 flex items-center pl-4 pointer-events-none z-10 text-slate-400 group-focus-within:text-cyan-500 transition-colors">
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" /></svg>
|
||||
|
||||
@ -33,14 +33,15 @@
|
||||
<div class="relative group w-full lg:w-56 lg:flex-none"
|
||||
x-data="{ fp: null }"
|
||||
x-init="fp = flatpickr($refs.startDate, {
|
||||
disableMobile: true,
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
defaultHour: 0,
|
||||
defaultMinute: 0,
|
||||
locale: '{{ app()->getLocale() == 'zh_TW' ? 'zh_tw' : 'en' }}',
|
||||
locale: '{{ app()->getLocale() == \'zh_TW\' ? \'zh_tw\' : \'en\' }}',
|
||||
position: 'auto right',
|
||||
defaultDate: '{{ $filters['start_date'] }}'
|
||||
defaultDate: '{{ $filters[\'start_date\'] }}'
|
||||
})">
|
||||
<span class="absolute inset-y-0 left-0 flex items-center pl-4 pointer-events-none z-10 text-slate-400 group-focus-within:text-cyan-500 transition-colors">
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" /></svg>
|
||||
@ -55,14 +56,15 @@
|
||||
<div class="relative group w-full lg:w-56 lg:flex-none"
|
||||
x-data="{ fp: null }"
|
||||
x-init="fp = flatpickr($refs.endDate, {
|
||||
disableMobile: true,
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
defaultHour: 23,
|
||||
defaultMinute: 59,
|
||||
locale: '{{ app()->getLocale() == 'zh_TW' ? 'zh_tw' : 'en' }}',
|
||||
locale: '{{ app()->getLocale() == \'zh_TW\' ? \'zh_tw\' : \'en\' }}',
|
||||
position: 'auto right',
|
||||
defaultDate: '{{ $filters['end_date'] }}'
|
||||
defaultDate: '{{ $filters[\'end_date\'] }}'
|
||||
})">
|
||||
<span class="absolute inset-y-0 left-0 flex items-center pl-4 pointer-events-none z-10 text-slate-400 group-focus-within:text-cyan-500 transition-colors">
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" /></svg>
|
||||
|
||||
@ -36,6 +36,7 @@
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
disableMobile: true,
|
||||
defaultHour: 0,
|
||||
defaultMinute: 0,
|
||||
locale: '{{ app()->getLocale() == 'zh_TW' ? 'zh_tw' : 'en' }}',
|
||||
@ -58,6 +59,7 @@
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
disableMobile: true,
|
||||
defaultHour: 23,
|
||||
defaultMinute: 59,
|
||||
locale: '{{ app()->getLocale() == 'zh_TW' ? 'zh_tw' : 'en' }}',
|
||||
|
||||
@ -37,6 +37,7 @@
|
||||
<div class="relative group w-full sm:w-56 sm:flex-none"
|
||||
x-data="{ fp: null }"
|
||||
x-init="fp = flatpickr($refs.startDate, {
|
||||
disableMobile: true,
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
@ -59,6 +60,7 @@
|
||||
<div class="relative group w-full sm:w-56 sm:flex-none"
|
||||
x-data="{ fp: null }"
|
||||
x-init="fp = flatpickr($refs.endDate, {
|
||||
disableMobile: true,
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
|
||||
@ -35,6 +35,7 @@
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
disableMobile: true,
|
||||
locale: 'zh_tw',
|
||||
position: 'auto right',
|
||||
defaultDate: '{{ request('start_date', $movementDefaultStart ?? '') }}'
|
||||
@ -55,6 +56,7 @@
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
disableMobile: true,
|
||||
locale: 'zh_tw',
|
||||
position: 'auto right',
|
||||
defaultDate: '{{ request('end_date', $movementDefaultEnd ?? '') }}'
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
disableMobile: true,
|
||||
defaultHour: 0,
|
||||
defaultMinute: 0,
|
||||
locale: 'zh_tw',
|
||||
@ -47,6 +48,7 @@
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
disableMobile: true,
|
||||
defaultHour: 23,
|
||||
defaultMinute: 59,
|
||||
locale: 'zh_tw',
|
||||
|
||||
@ -632,6 +632,7 @@
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
disableMobile: true,
|
||||
defaultHour: 0,
|
||||
defaultMinute: 0,
|
||||
locale: 'zh_tw',
|
||||
@ -654,6 +655,7 @@
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
disableMobile: true,
|
||||
defaultHour: 23,
|
||||
defaultMinute: 59,
|
||||
locale: 'zh_tw',
|
||||
|
||||
@ -399,6 +399,7 @@
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
disableMobile: true,
|
||||
defaultHour: 0,
|
||||
defaultMinute: 0,
|
||||
locale: 'zh_tw',
|
||||
@ -421,6 +422,7 @@
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
disableMobile: true,
|
||||
defaultHour: 23,
|
||||
defaultMinute: 59,
|
||||
locale: 'zh_tw',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user