[FEAT] 優化廣告與機台管理介面及效能

1. [廣告管理] 修復編輯素材時刪除按鈕顯示邏輯並優化預覽功能。 2. [廣告管理] 修正請求回傳格式為 JSON，解決 AJAX 解析錯誤。 3. [機台管理] 實作 Alpine.js 無感頁籤切換（機台列表與效期管理）。 4. [機台管理] 移除冗餘返回按鈕，改為動態標題與頁籤重設邏輯。 5. [機台管理] 統一後端查詢，減少切換分頁時的延遲感。 6. [商品管理] 支援商品圖片 WebP 自動轉換，並調整上傳大小限制 (10MB)。 7. [UI] 修正多個管理模組的 JS 時序競爭與 Preline HSSelect 重置問題。
2026-04-01 13:01:45 +08:00
parent 2e49129d77
commit 953d6a41f3
14 changed files with 387 additions and 166 deletions
--- a/app/Http/Controllers/Admin/AdvertisementController.php
+++ b/app/Http/Controllers/Admin/AdvertisementController.php
@@ -6,11 +6,14 @@ use App\Models\Machine\Machine;
 use App\Models\Machine\MachineAdvertisement;
 use App\Models\System\Advertisement;
 use App\Models\System\Company;
+use App\Traits\ImageHandler;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;

 class AdvertisementController extends AdminController
 {
+    use ImageHandler;
+
    public function index(Request $request)
    {
        $user = auth()->user();
@@ -48,13 +51,19 @@ class AdvertisementController extends AdminController
                'required',
                'file',
                'mimes:jpeg,png,jpg,gif,webp,mp4,mov,avi',
-                $request->type === 'image' ? 'max:5120' : 'max:51200', // Image 5MB, Video 50MB
+                $request->type === 'image' ? 'max:10240' : 'max:51200', // Image 10MB, Video 50MB
            ],
            'company_id' => 'nullable|exists:companies,id',
        ]);

        $user = auth()->user();
-        $path = $request->file('file')->store('ads', 'public');
+        $file = $request->file('file');
+        
+        if ($request->type === 'image') {
+            $path = $this->storeAsWebp($file, 'ads');
+        } else {
+            $path = $file->store('ads', 'public');
+        }

        if ($user->isSystemAdmin()) {
            $companyId = $request->filled('company_id') ? $request->company_id : null;
@@ -71,6 +80,14 @@ class AdvertisementController extends AdminController
            'is_active' => true,
        ]);

+        if ($request->wantsJson()) {
+            return response()->json([
+                'success' => true,
+                'message' => __('Advertisement created successfully.'),
+                'data' => $advertisement
+            ]);
+        }
+
        return redirect()->back()->with('success', __('Advertisement created successfully.'));
    }

@@ -88,7 +105,7 @@ class AdvertisementController extends AdminController
            $rules['file'] = [
                'file',
                'mimes:jpeg,png,jpg,gif,webp,mp4,mov,avi',
-                $request->type === 'image' ? 'max:5120' : 'max:51200',
+                $request->type === 'image' ? 'max:10240' : 'max:51200',
            ];
        }

@@ -104,16 +121,32 @@ class AdvertisementController extends AdminController

        if ($request->hasFile('file')) {
            // 刪除舊檔案
+            // 處理 URL 可能包含 storage 或原始路徑的情況
            $oldPath = str_replace(Storage::disk('public')->url(''), '', $advertisement->url);
+            // 去除開頭可能的斜線
+            $oldPath = ltrim($oldPath, '/');
            Storage::disk('public')->delete($oldPath);

            // 存入新檔案
-            $path = $request->file('file')->store('ads', 'public');
+            $file = $request->file('file');
+            if ($request->type === 'image') {
+                $path = $this->storeAsWebp($file, 'ads');
+            } else {
+                $path = $file->store('ads', 'public');
+            }
            $data['url'] = Storage::disk('public')->url($path);
        }

        $advertisement->update($data);

+        if ($request->wantsJson()) {
+            return response()->json([
+                'success' => true,
+                'message' => __('Advertisement updated successfully.'),
+                'data' => $advertisement
+            ]);
+        }
+
        return redirect()->back()->with('success', __('Advertisement updated successfully.'));
    }

@@ -129,6 +162,13 @@ class AdvertisementController extends AdminController
        Storage::disk('public')->delete($path);

        $advertisement->delete();
+        if ($request->wantsJson()) {
+            return response()->json([
+                'success' => true,
+                'message' => __('Advertisement deleted successfully.')
+            ]);
+        }
+        
        return redirect()->back()->with('success', __('Advertisement deleted successfully.'));
    }

--- a/app/Http/Controllers/Admin/BasicSettings/MachinePhotoController.php
+++ b/app/Http/Controllers/Admin/BasicSettings/MachinePhotoController.php
@@ -23,6 +23,12 @@ class MachinePhotoController extends Controller
            'machine_id' => $machine->id,
            'files' => $request->allFiles()
        ]);
+        
+        $request->validate([
+            'machine_image_0' => 'nullable|image|mimes:jpeg,png,jpg,gif,webp|max:10240',
+            'machine_image_1' => 'nullable|image|mimes:jpeg,png,jpg,gif,webp|max:10240',
+            'machine_image_2' => 'nullable|image|mimes:jpeg,png,jpg,gif,webp|max:10240',
+        ]);

        try {
            $images = $machine->images ?? [];
--- a/app/Http/Controllers/Admin/BasicSettings/MachineSettingController.php
+++ b/app/Http/Controllers/Admin/BasicSettings/MachineSettingController.php
@@ -94,7 +94,7 @@ class MachineSettingController extends AdminController
            'machine_model_id' => 'required|exists:machine_models,id',
            'payment_config_id' => 'nullable|exists:payment_configs,id',
            'location' => 'nullable|string|max:255',
-            'images.*' => 'image|mimes:jpeg,png,jpg,gif|max:2048',
+            'images.*' => 'image|mimes:jpeg,png,jpg,gif,webp|max:10240', // Increase to 10MB
        ]);

        $imagePaths = [];
@@ -163,6 +163,12 @@ class MachineSettingController extends AdminController
                'machine_model_id' => 'required|exists:machine_models,id',
                'payment_config_id' => 'nullable|exists:payment_configs,id',
                'location' => 'nullable|string|max:255',
+                'image_0' => 'nullable|image|mimes:jpeg,png,jpg,gif,webp|max:10240',
+                'image_1' => 'nullable|image|mimes:jpeg,png,jpg,gif,webp|max:10240',
+                'image_2' => 'nullable|image|mimes:jpeg,png,jpg,gif,webp|max:10240',
+                'remove_image_0' => 'nullable|boolean',
+                'remove_image_1' => 'nullable|boolean',
+                'remove_image_2' => 'nullable|boolean',
            ]);

            // 僅限系統管理員可修改公司
@@ -178,34 +184,47 @@ class MachineSettingController extends AdminController
            throw $e;
        }

-        $machine->update(array_merge($validated, [
+        // 排除虛擬欄位 (圖片上傳、移除標記)，這些欄位不在資料表內
+        $dataToUpdate = \Illuminate\Support\Arr::except($validated, [
+            'image_0', 'image_1', 'image_2', 
+            'remove_image_0', 'remove_image_1', 'remove_image_2'
+        ]);
+
+        $machine->update(array_merge($dataToUpdate, [
            'updater_id' => auth()->id(),
        ]));

-        // 處理圖片更新 (支援 3 個獨立槽位)
-        if ($request->hasFile('images')) {
-            $currentImages = $machine->images ?? [];
-            $newImages = $request->file('images');
-            $updated = false;
+        // 處理圖片更新 (支援 3 個獨立槽位: image_0, image_1, image_2)
+        $currentImages = $machine->images ?? [];
+        $updated = false;

-            foreach ($newImages as $index => $file) {
-                // 限制 3 個槽位 (0, 1, 2)
-                if ($index < 0 || $index > 2) continue;
+        for ($i = 0; $i < 3; $i++) {
+            $inputName = "image_$i";
+            $removeName = "remove_image_$i";

-                // 刪除該槽位的舊圖
-                if (isset($currentImages[$index]) && !empty($currentImages[$index])) {
-                    \Illuminate\Support\Facades\Storage::disk('public')->delete($currentImages[$index]);
+            // 如果有新圖片上傳
+            if ($request->hasFile($inputName)) {
+                // 刪除舊圖
+                if (isset($currentImages[$i]) && !empty($currentImages[$i])) {
+                    \Illuminate\Support\Facades\Storage::disk('public')->delete($currentImages[$i]);
                }
-
-                // 處理並儲存新圖
-                $currentImages[$index] = $this->storeAsWebp($file, 'machines');
+                // 儲存新圖
+                $currentImages[$i] = $this->storeAsWebp($request->file($inputName), 'machines');
                $updated = true;
+            } 
+            // 否則，如果有刪除標記
+            elseif ($request->input($removeName) === '1') {
+                if (isset($currentImages[$i]) && !empty($currentImages[$i])) {
+                    \Illuminate\Support\Facades\Storage::disk('public')->delete($currentImages[$i]);
+                    unset($currentImages[$i]);
+                    $updated = true;
+                }
            }
+        }

-            if ($updated) {
-                ksort($currentImages);
-                $machine->update(['images' => array_values($currentImages)]);
-            }
+        if ($updated) {
+            ksort($currentImages);
+            $machine->update(['images' => array_values($currentImages)]);
        }

        return redirect()->route('admin.basic-settings.machines.index')
--- a/app/Http/Controllers/Admin/MachineController.php
+++ b/app/Http/Controllers/Admin/MachineController.php
@@ -8,9 +8,6 @@ use Illuminate\View\View;

 class MachineController extends AdminController
 {
-    /**
-     * 顯示所有機台列表或效期管理
-     */
    public function index(Request $request): View
    {
        $tab = $request->input('tab', 'list');
@@ -26,33 +23,27 @@ class MachineController extends AdminController
            });
        }

-        if ($tab === 'list') {
-            $machines = $query->when($request->status, function ($query, $status) {
-                    return $query->where('status', $status);
-                })
-                ->orderBy("last_heartbeat_at", "desc")->orderBy("id", "desc")
-                ->paginate($per_page)
-                ->withQueryString();
+        // 統一預加載貨道統計資料 (無論在哪一個頁籤)
+        $machines = $query->withCount(['slots as total_slots'])
+            ->withCount(['slots as expired_count' => function ($q) {
+                $q->where('expiry_date', '<', now()->toDateString());
+            }])
+            ->withCount(['slots as pending_count' => function ($q) {
+                $q->whereNull('expiry_date');
+            }])
+            ->withCount(['slots as warning_count' => function ($q) {
+                $q->whereBetween('expiry_date', [now()->toDateString(), now()->addDays(7)->toDateString()]);
+            }])
+            // 只有在機台列表且有狀態篩選時才套用狀態過濾
+            ->when($request->status && $tab === 'list', function ($q, $status) {
+                return $q->where('status', $status);
+            })
+            ->orderBy("last_heartbeat_at", "desc")
+            ->orderBy("id", "desc")
+            ->paginate($per_page)
+            ->withQueryString();

-            return view('admin.machines.index', compact('machines', 'tab'));
-        } else {
-            // 效期管理模式：獲取機台及其貨道統計
-            $machines = $query->withCount(['slots as total_slots'])
-                ->withCount(['slots as expired_count' => function ($q) {
-                    $q->where('expiry_date', '<', now()->toDateString());
-                }])
-                ->withCount(['slots as pending_count' => function ($q) {
-                    $q->whereNull('expiry_date');
-                }])
-                ->withCount(['slots as warning_count' => function ($q) {
-                    $q->whereBetween('expiry_date', [now()->toDateString(), now()->addDays(7)->toDateString()]);
-                }])
-                ->orderBy("last_heartbeat_at", "desc")->orderBy("id", "desc")
-                ->paginate($per_page)
-                ->withQueryString();
-
-            return view('admin.machines.index', compact('machines', 'tab'));
-        }
+        return view('admin.machines.index', compact('machines', 'tab'));
    }

    /**
--- a/app/Http/Controllers/Admin/ProductController.php
+++ b/app/Http/Controllers/Admin/ProductController.php
@@ -126,7 +126,7 @@ class ProductController extends Controller
            'metadata' => 'nullable|array',
            'is_active' => 'nullable|boolean',
            'company_id' => 'nullable|exists:companies,id',
-            'image' => 'nullable|image|mimes:jpeg,png,jpg,gif|max:2048',
+            'image' => 'nullable|image|mimes:jpeg,png,jpg,gif,webp|max:10240', // Increase to 10MB
        ]);

        try {
@@ -216,7 +216,7 @@ class ProductController extends Controller
            'member_price' => 'required|numeric|min:0',
            'metadata' => 'nullable|array',
            'is_active' => 'nullable|boolean',
-            'image' => 'nullable|image|mimes:jpeg,png,jpg,gif|max:2048',
+            'image' => 'nullable|image|mimes:jpeg,png,jpg,gif,webp|max:10240', // Increase to 10MB
            'remove_image' => 'nullable|boolean',
        ]);