terrylee/star-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[STYLE] 優化行銷促銷模組視覺體驗、語系對齊與修復下拉選單重置 Bug

Browse Source 
1. 簡化「來店禮」於繁中與日文語系檔的顯示文字，避免後台介面過長擠壓。
2. 修復來店禮、通行碼、取貨碼列表重置按鈕之時序競態 Bug，確保下拉選單確實清空後方送出 Ajax。
3. 來店禮與通行碼使用紀錄的類型選單新增 OnChange 自動 AJAX 提交，提升篩選操作體驗。
4. 補齊取貨碼使用紀錄的狀態篩選選單，並支援重置按鈕一鍵清空。
5. 移除通行碼與取貨碼使用紀錄中的「操作人員」欄位，配合極簡奢華風微調時間欄位靠右對齊，並修正表格空狀態的 colspan 為 5。
This commit is contained in:
sky121113 2026-05-22 15:20:19 +08:00
parent f59efc6dc7
commit 9b439814bd
8 changed files with 68 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/ja.json
View File

@ -2039,7 +2039,7 @@
"Welcome Gift Function": "ウェルカムギフト機能", "Welcome Gift Function": "ウェルカムギフト機能",
"Welcome Gift Name": "ウェルカムギフト名", "Welcome Gift Name": "ウェルカムギフト名",
"Welcome Gift Status": "来店ギフトステータス", "Welcome Gift Status": "来店ギフトステータス",
"Welcome Gifts": "ウェルカムギフト設定", "Welcome Gifts": "ウェルカムギフト",
"Work Content": "作業内容", "Work Content": "作業内容",
"Yes, Cancel": "はい、キャンセルします", "Yes, Cancel": "はい、キャンセルします",
"Yes, Deactivate": "はい、無効にします", "Yes, Deactivate": "はい、無効にします",

2
lang/zh_TW.json
View File

@ -2039,7 +2039,7 @@
"Welcome Gift Function": "迎賓禮功能", "Welcome Gift Function": "迎賓禮功能",
"Welcome Gift Name": "來店禮名稱", "Welcome Gift Name": "來店禮名稱",
"Welcome Gift Status": "來店禮", "Welcome Gift Status": "來店禮",
"Welcome Gifts": "來店禮設定", "Welcome Gifts": "來店禮",
"Work Content": "作業內容", "Work Content": "作業內容",
"Yes, Cancel": "確認取消", "Yes, Cancel": "確認取消",
"Yes, Deactivate": "是的，停用", "Yes, Deactivate": "是的，停用",

13
resources/views/admin/sales/pass-codes/partials/tab-list.blade.php
View File

@ -38,7 +38,18 @@
</svg> </svg>
</button> </button>
<button type="button" <button type="button"
@click="$el.closest('form').querySelector('input[name=search]').value=''; syncSelect('filter-status', ''); $el.closest('form').dispatchEvent(new Event('submit'))" @click="
const selectEl = document.getElementById('filter-status');
if (selectEl) {
selectEl.value = ' ';
if (window.HSSelect) {
const inst = window.HSSelect.getInstance(selectEl);
if (inst) inst.setValue(' ');
}
}
$el.closest('form').querySelector('input[name=search]').value = '';
$el.closest('form').dispatchEvent(new Event('submit'));
"
class="p-2.5 rounded-xl bg-slate-100 dark:bg-slate-800 text-slate-500 hover:bg-slate-200 dark:hover:bg-slate-700 transition-all" class="p-2.5 rounded-xl bg-slate-100 dark:bg-slate-800 text-slate-500 hover:bg-slate-200 dark:hover:bg-slate-700 transition-all"
title="{{ __('Reset') }}"> title="{{ __('Reset') }}">
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="2.5"> <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="2.5">

35
resources/views/admin/sales/pass-codes/partials/tab-logs.blade.php
View File

@ -24,6 +24,7 @@
:selected="request('action')" :selected="request('action')"
:placeholder="__('All Types')" :placeholder="__('All Types')"
:hasSearch="false" :hasSearch="false"
@change="$el.closest('form').dispatchEvent(new Event('submit'))"
> >
@foreach($actions as $key => $label) @foreach($actions as $key => $label)
<option value="{{ $key }}" {{ request('action') === $key ? 'selected' : '' }} data-title="{{ $label }}"> <option value="{{ $key }}" {{ request('action') === $key ? 'selected' : '' }} data-title="{{ $label }}">
@ -139,12 +140,9 @@
<th <th
class="px-6 py-4 text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-[0.15em] border-b border-slate-100 dark:border-slate-800 text-center"> class="px-6 py-4 text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-[0.15em] border-b border-slate-100 dark:border-slate-800 text-center">
{{ __('Sales Record') }}</th> {{ __('Sales Record') }}</th>
<th
class="px-6 py-4 text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-[0.15em] border-b border-slate-100 dark:border-slate-800 text-center">
{{ __('Time') }}</th>
<th <th
class="px-6 py-4 text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-[0.15em] border-b border-slate-100 dark:border-slate-800 text-right"> class="px-6 py-4 text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-[0.15em] border-b border-slate-100 dark:border-slate-800 text-right">
{{ __('Operator') }}</th> {{ __('Time') }}</th>
</tr> </tr>
</thead> </thead>
<tbody class="divide-y divide-slate-50 dark:divide-slate-800/80"> <tbody class="divide-y divide-slate-50 dark:divide-slate-800/80">
@ -194,35 +192,16 @@
<span class="text-slate-300 dark:text-slate-700">-</span> <span class="text-slate-300 dark:text-slate-700">-</span>
@endif @endif
</td> </td>
<td class="px-6 py-5 text-center whitespace-nowrap"> <td class="px-6 py-5 text-right whitespace-nowrap">
<span <span
class="text-xs font-mono font-black text-slate-700 dark:text-slate-200 tracking-widest"> class="text-xs font-mono font-black text-slate-700 dark:text-slate-200 tracking-widest">
{{ $log->created_at?->format('Y-m-d H:i:s') }} {{ $log->created_at?->format('Y-m-d H:i:s') }}
</span> </span>
</td> </td>
<td class="px-6 py-5 text-right whitespace-nowrap">
<div class="flex items-center justify-end gap-2">
@if($log->user)
<div
class="w-7 h-7 rounded-full bg-cyan-100 dark:bg-cyan-900/50 flex items-center justify-center text-cyan-600 dark:text-cyan-400 text-[10px] font-black border border-cyan-200/50 dark:border-cyan-800/50">
{{ Str::substr($log->user->name, 0, 1) }}
</div>
<span
class="text-xs font-bold text-slate-600 dark:text-slate-300 uppercase tracking-widest">
{{ $log->user->name }}
</span>
@else
<span
class="text-xs font-bold text-slate-400 dark:text-slate-500 uppercase tracking-widest">
{{ __('Machine') }}
</span>
@endif
</div>
</td>
</tr> </tr>
@empty @empty
<tr> <tr>
<td colspan="6" class="px-6 py-20 text-center"> <td colspan="5" class="px-6 py-20 text-center">
<div class="flex flex-col items-center justify-center gap-3"> <div class="flex flex-col items-center justify-center gap-3">
<div class="p-4 rounded-3xl bg-slate-50 dark:bg-slate-800/50"> <div class="p-4 rounded-3xl bg-slate-50 dark:bg-slate-800/50">
<svg class="w-8 h-8 text-slate-300 dark:text-slate-600" fill="none" <svg class="w-8 h-8 text-slate-300 dark:text-slate-600" fill="none"
@ -273,12 +252,6 @@
<div <div
class="grid grid-cols-2 gap-y-4 mb-4 border-y border-slate-100 dark:border-slate-800/50 py-4"> class="grid grid-cols-2 gap-y-4 mb-4 border-y border-slate-100 dark:border-slate-800/50 py-4">
<div>
<p class="text-[10px] font-black text-slate-400 uppercase tracking-widest mb-1">{{
__('Operator') }}</p>
<p class="text-sm font-bold text-slate-700 dark:text-slate-300 truncate">{{
$log->user->name ?? __('Machine') }}</p>
</div>
<div> <div>
<p class="text-[10px] font-black text-slate-400 uppercase tracking-widest mb-1">{{ <p class="text-[10px] font-black text-slate-400 uppercase tracking-widest mb-1">{{
__('Pass Code') }}</p> __('Pass Code') }}</p>

13
resources/views/admin/sales/pickup-codes/partials/tab-list.blade.php
View File

@ -42,7 +42,18 @@
</svg> </svg>
</button> </button>
<button type="button" <button type="button"
@click="$el.closest('form').querySelector('input[name=search]').value=''; syncSelect('filter-status', ''); $el.closest('form').dispatchEvent(new Event('submit'))" @click="
const selectEl = document.getElementById('filter-status');
if (selectEl) {
selectEl.value = ' ';
if (window.HSSelect) {
const inst = window.HSSelect.getInstance(selectEl);
if (inst) inst.setValue(' ');
}
}
$el.closest('form').querySelector('input[name=search]').value = '';
$el.closest('form').dispatchEvent(new Event('submit'));
"
class="p-2.5 rounded-xl bg-slate-100 dark:bg-slate-800 text-slate-500 dark:text-slate-400 hover:bg-slate-200 dark:hover:bg-slate-700 transition-all active:scale-95 border border-slate-200 dark:border-slate-700" class="p-2.5 rounded-xl bg-slate-100 dark:bg-slate-800 text-slate-500 dark:text-slate-400 hover:bg-slate-200 dark:hover:bg-slate-700 transition-all active:scale-95 border border-slate-200 dark:border-slate-700"
title="{{ __('Reset') }}"> title="{{ __('Reset') }}">
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"

56
resources/views/admin/sales/pickup-codes/partials/tab-logs.blade.php
View File

@ -17,6 +17,23 @@
placeholder="{{ __('Search logs...') }}"> placeholder="{{ __('Search logs...') }}">
</div> </div>
{{-- 狀態篩選 --}}
<div class="w-full sm:w-64">
<x-searchable-select
name="action"
:selected="request('action')"
:placeholder="__('All Status')"
:hasSearch="false"
@change="$el.closest('form').dispatchEvent(new Event('submit'))"
>
@foreach($actions as $key => $label)
<option value="{{ $key }}" {{ request('action') === $key ? 'selected' : '' }} data-title="{{ $label }}">
{{ $label }}
</option>
@endforeach
</x-searchable-select>
</div>
{{-- 開始時間 --}} {{-- 開始時間 --}}
<div class="relative group w-full sm:w-56 sm:flex-none" <div class="relative group w-full sm:w-56 sm:flex-none"
x-data="{ fp: null }" x-data="{ fp: null }"
@ -88,6 +105,11 @@
</button> </button>
<button type="button" @click=" <button type="button" @click="
$el.closest('form').querySelectorAll('input[type=text], input[type=hidden]:not([name=tab])').forEach(i => i.value = ''); $el.closest('form').querySelectorAll('input[type=text], input[type=hidden]:not([name=tab])').forEach(i => i.value = '');
$el.closest('form').querySelectorAll('select').forEach(s => {
s.value = ' ';
const instance = window.HSSelect.getInstance(s);
if (instance) instance.setValue(' ');
});
fetchTabData('logs', '{{ route('admin.sales.pickup-codes') }}?tab=logs'); fetchTabData('logs', '{{ route('admin.sales.pickup-codes') }}?tab=logs');
" "
class="p-2.5 rounded-xl bg-slate-100 dark:bg-slate-800 text-slate-500 hover:bg-slate-200 dark:hover:bg-slate-700 transition-all active:scale-95" class="p-2.5 rounded-xl bg-slate-100 dark:bg-slate-800 text-slate-500 hover:bg-slate-200 dark:hover:bg-slate-700 transition-all active:scale-95"
@ -118,12 +140,9 @@
<th <th
class="px-6 py-4 text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-[0.15em] border-b border-slate-100 dark:border-slate-800 text-center"> class="px-6 py-4 text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-[0.15em] border-b border-slate-100 dark:border-slate-800 text-center">
{{ __('Sales Record') }}</th> {{ __('Sales Record') }}</th>
<th
class="px-6 py-4 text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-[0.15em] border-b border-slate-100 dark:border-slate-800 text-center">
{{ __('Time') }}</th>
<th <th
class="px-6 py-4 text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-[0.15em] border-b border-slate-100 dark:border-slate-800 text-right"> class="px-6 py-4 text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-[0.15em] border-b border-slate-100 dark:border-slate-800 text-right">
{{ __('Operator') }}</th> {{ __('Time') }}</th>
</tr> </tr>
</thead> </thead>
<tbody class="divide-y divide-slate-50 dark:divide-slate-800/80"> <tbody class="divide-y divide-slate-50 dark:divide-slate-800/80">
@ -173,35 +192,16 @@
<span class="text-slate-300 dark:text-slate-700">-</span> <span class="text-slate-300 dark:text-slate-700">-</span>
@endif @endif
</td> </td>
<td class="px-6 py-5 text-center whitespace-nowrap"> <td class="px-6 py-5 text-right whitespace-nowrap">
<span <span
class="text-xs font-mono font-black text-slate-700 dark:text-slate-200 tracking-widest"> class="text-xs font-mono font-black text-slate-700 dark:text-slate-200 tracking-widest">
{{ $log->created_at?->format('Y-m-d H:i:s') }} {{ $log->created_at?->format('Y-m-d H:i:s') }}
</span> </span>
</td> </td>
<td class="px-6 py-5 text-right whitespace-nowrap">
<div class="flex items-center justify-end gap-2">
@if($log->user)
<div
class="w-7 h-7 rounded-full bg-cyan-100 dark:bg-cyan-900/50 flex items-center justify-center text-cyan-600 dark:text-cyan-400 text-[10px] font-black border border-cyan-200/50 dark:border-cyan-800/50">
{{ Str::substr($log->user->name, 0, 1) }}
</div>
<span
class="text-xs font-bold text-slate-600 dark:text-slate-300 uppercase tracking-widest">
{{ $log->user->name }}
</span>
@else
<span
class="text-xs font-bold text-slate-400 dark:text-slate-500 uppercase tracking-widest">
{{ __('Machine') }}
</span>
@endif
</div>
</td>
</tr> </tr>
@empty @empty
<tr> <tr>
<td colspan="6" class="px-6 py-20 text-center"> <td colspan="5" class="px-6 py-20 text-center">
<div class="flex flex-col items-center justify-center gap-3"> <div class="flex flex-col items-center justify-center gap-3">
<div class="p-4 rounded-3xl bg-slate-50 dark:bg-slate-800/50"> <div class="p-4 rounded-3xl bg-slate-50 dark:bg-slate-800/50">
<svg class="w-8 h-8 text-slate-300 dark:text-slate-600" fill="none" <svg class="w-8 h-8 text-slate-300 dark:text-slate-600" fill="none"
@ -252,12 +252,6 @@
<div <div
class="grid grid-cols-2 gap-y-4 mb-4 border-y border-slate-100 dark:border-slate-800/50 py-4"> class="grid grid-cols-2 gap-y-4 mb-4 border-y border-slate-100 dark:border-slate-800/50 py-4">
<div>
<p class="text-[10px] font-black text-slate-400 uppercase tracking-widest mb-1">{{
__('Operator') }}</p>
<p class="text-sm font-bold text-slate-700 dark:text-slate-300 truncate">{{
$log->user->name ?? __('Machine') }}</p>
</div>
<div> <div>
<p class="text-[10px] font-black text-slate-400 uppercase tracking-widest mb-1">{{ <p class="text-[10px] font-black text-slate-400 uppercase tracking-widest mb-1">{{
__('Pickup Code') }}</p> __('Pickup Code') }}</p>

13
resources/views/admin/sales/welcome-gifts/partials/tab-list.blade.php
View File

@ -38,7 +38,18 @@
</svg> </svg>
</button> </button>
<button type="button" <button type="button"
@click="$el.closest('form').querySelector('input[name=search]').value=''; syncSelect('filter-status', ''); $el.closest('form').dispatchEvent(new Event('submit'))" @click="
const selectEl = document.getElementById('filter-status');
if (selectEl) {
selectEl.value = ' ';
if (window.HSSelect) {
const inst = window.HSSelect.getInstance(selectEl);
if (inst) inst.setValue(' ');
}
}
$el.closest('form').querySelector('input[name=search]').value = '';
$el.closest('form').dispatchEvent(new Event('submit'));
"
class="p-2.5 rounded-xl bg-slate-100 dark:bg-slate-800 text-slate-500 hover:bg-slate-200 dark:hover:bg-slate-700 transition-all" class="p-2.5 rounded-xl bg-slate-100 dark:bg-slate-800 text-slate-500 hover:bg-slate-200 dark:hover:bg-slate-700 transition-all"
title="{{ __('Reset') }}"> title="{{ __('Reset') }}">
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="2.5"> <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="2.5">

1
resources/views/admin/sales/welcome-gifts/partials/tab-logs.blade.php
View File

@ -24,6 +24,7 @@
:selected="request('action')" :selected="request('action')"
:placeholder="__('All Types')" :placeholder="__('All Types')"
:hasSearch="false" :hasSearch="false"
@change="$el.closest('form').dispatchEvent(new Event('submit'))"
> >
@foreach($actions as $key => $label) @foreach($actions as $key => $label)
<option value="{{ $key }}" {{ request('action') === $key ? 'selected' : '' }} data-title="{{ $label }}"> <option value="{{ $key }}" {{ request('action') === $key ? 'selected' : '' }} data-title="{{ $label }}">