diff --git a/lang/ja.json b/lang/ja.json
index 4e94710..e31b6de 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -2039,7 +2039,7 @@
     "Welcome Gift Function": "ウェルカムギフト機能",
     "Welcome Gift Name": "ウェルカムギフト名",
     "Welcome Gift Status": "来店ギフトステータス",
-    "Welcome Gifts": "ウェルカムギフト設定",
+    "Welcome Gifts": "ウェルカムギフト",
     "Work Content": "作業内容",
     "Yes, Cancel": "はい、キャンセルします",
     "Yes, Deactivate": "はい、無効にします",
diff --git a/lang/zh_TW.json b/lang/zh_TW.json
index 73d105d..e3c7f91 100644
--- a/lang/zh_TW.json
+++ b/lang/zh_TW.json
@@ -2039,7 +2039,7 @@
     "Welcome Gift Function": "迎賓禮功能",
     "Welcome Gift Name": "來店禮名稱",
     "Welcome Gift Status": "來店禮",
-    "Welcome Gifts": "來店禮設定",
+    "Welcome Gifts": "來店禮",
     "Work Content": "作業內容",
     "Yes, Cancel": "確認取消",
     "Yes, Deactivate": "是的，停用",
diff --git a/resources/views/admin/sales/pass-codes/partials/tab-list.blade.php b/resources/views/admin/sales/pass-codes/partials/tab-list.blade.php
index 4257b7c..b48ec56 100644
--- a/resources/views/admin/sales/pass-codes/partials/tab-list.blade.php
+++ b/resources/views/admin/sales/pass-codes/partials/tab-list.blade.php
@@ -38,7 +38,18 @@
             </svg>
         </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"
             title="{{ __('Reset') }}">
             <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="2.5">
diff --git a/resources/views/admin/sales/pass-codes/partials/tab-logs.blade.php b/resources/views/admin/sales/pass-codes/partials/tab-logs.blade.php
index 5ff710d..032b4ec 100644
--- a/resources/views/admin/sales/pass-codes/partials/tab-logs.blade.php
+++ b/resources/views/admin/sales/pass-codes/partials/tab-logs.blade.php
@@ -24,6 +24,7 @@
             :selected="request('action')"
             :placeholder="__('All Types')"
             :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 }}">
@@ -139,12 +140,9 @@
                 <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">
                     {{ __('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
                     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>
         </thead>
         <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>
                     @endif
                 </td>
-                <td class="px-6 py-5 text-center whitespace-nowrap">
+                <td class="px-6 py-5 text-right whitespace-nowrap">
                     <span
                         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') }}
                     </span>
                 </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>
             @empty
             <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="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"
@@ -273,12 +252,6 @@
 
         <div
             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>
                 <p class="text-[10px] font-black text-slate-400 uppercase tracking-widest mb-1">{{
                     __('Pass Code') }}</p>
diff --git a/resources/views/admin/sales/pickup-codes/partials/tab-list.blade.php b/resources/views/admin/sales/pickup-codes/partials/tab-list.blade.php
index 4e419a0..bf495f3 100644
--- a/resources/views/admin/sales/pickup-codes/partials/tab-list.blade.php
+++ b/resources/views/admin/sales/pickup-codes/partials/tab-list.blade.php
@@ -42,7 +42,18 @@
             </svg>
         </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"
             title="{{ __('Reset') }}">
             <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"
diff --git a/resources/views/admin/sales/pickup-codes/partials/tab-logs.blade.php b/resources/views/admin/sales/pickup-codes/partials/tab-logs.blade.php
index 2153cb2..4ed340a 100644
--- a/resources/views/admin/sales/pickup-codes/partials/tab-logs.blade.php
+++ b/resources/views/admin/sales/pickup-codes/partials/tab-logs.blade.php
@@ -17,6 +17,23 @@
             placeholder="{{ __('Search logs...') }}">
     </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" 
          x-data="{ fp: null }" 
@@ -88,6 +105,11 @@
         </button>
         <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('select').forEach(s => {
+                    s.value = ' ';
+                    const instance = window.HSSelect.getInstance(s);
+                    if (instance) instance.setValue(' ');
+                });
                 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"
@@ -118,12 +140,9 @@
                 <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">
                     {{ __('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
                     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>
         </thead>
         <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>
                     @endif
                 </td>
-                <td class="px-6 py-5 text-center whitespace-nowrap">
+                <td class="px-6 py-5 text-right whitespace-nowrap">
                     <span
                         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') }}
                     </span>
                 </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>
             @empty
             <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="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"
@@ -252,12 +252,6 @@
 
         <div
             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>
                 <p class="text-[10px] font-black text-slate-400 uppercase tracking-widest mb-1">{{
                     __('Pickup Code') }}</p>
diff --git a/resources/views/admin/sales/welcome-gifts/partials/tab-list.blade.php b/resources/views/admin/sales/welcome-gifts/partials/tab-list.blade.php
index 5e8f776..75f6cfd 100644
--- a/resources/views/admin/sales/welcome-gifts/partials/tab-list.blade.php
+++ b/resources/views/admin/sales/welcome-gifts/partials/tab-list.blade.php
@@ -38,7 +38,18 @@
             </svg>
         </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"
             title="{{ __('Reset') }}">
             <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="2.5">
diff --git a/resources/views/admin/sales/welcome-gifts/partials/tab-logs.blade.php b/resources/views/admin/sales/welcome-gifts/partials/tab-logs.blade.php
index 07b4b5a..5d70df7 100644
--- a/resources/views/admin/sales/welcome-gifts/partials/tab-logs.blade.php
+++ b/resources/views/admin/sales/welcome-gifts/partials/tab-logs.blade.php
@@ -24,6 +24,7 @@
             :selected="request('action')"
             :placeholder="__('All Types')"
             :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 }}">