From 8977e7eb0faf3720f6420fbe8552c4f1146e6e2e Mon Sep 17 00:00:00 2001 From: terrylee Date: Mon, 22 Jun 2026 09:54:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(pharmacy-pickup):=20=E9=A0=98=E8=97=A5?= =?UTF-8?q?=E5=96=AE=E6=A8=A1=E7=B5=84=EF=BC=88=E5=BE=8C=E5=8F=B0=E5=BB=BA?= =?UTF-8?q?=E5=96=AE=E2=86=92QR=E2=86=92=E6=A9=9F=E5=8F=B0B660=E6=8E=83?= =?UTF-8?q?=E7=A2=BC=E2=86=92=E5=87=BA=E8=B2=A8=E5=9B=9E=E5=A0=B1=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 機台系統設定：取物單模式(pickup_sheet)下新增「領藥單」開關 pharmacy_pickup_enabled，B014 下發 FunctionSet.PharmacyPickup - 權限：銷售管理→領藥單 menu.sales.pharmacy-pickup（角色/帳號可勾選授權，租戶模板預設關） - 資料模型：orders 加 order_type/pricing_slip_no/created_by（領藥單序號=flow_id）、pickup_codes.slot_no 可空 - 後台：PharmacyPickupController + PharmacyPickupService（以商品為單位建單、庫存不預扣）+ 建單/列表/列印頁(QR內嵌,不顯姓名) - B660：領藥單回多貨道 items[]（保留 slot_no 向後相容）+ 模式 gate + 標記已領 - 出貨回報：finalizePharmacyDispense（獨立於銷售/發票/閉環）+ flow_id 終態冪等 + 庫存只扣一次 - 修正 PickupCode::isValid() 對 null expires_at 的 NPE、status 補入 fillable Co-Authored-By: Claude Opus 4.8 --- PHARMACY_PICKUP_DESIGN.md | 61 +++++ .../MachineSettingController.php | 9 + .../Admin/PharmacyPickupController.php | 140 ++++++++++ .../Api/V1/App/MachineController.php | 48 +++- app/Models/Transaction/Order.php | 33 +++ app/Models/Transaction/PickupCode.php | 5 +- .../Transaction/PharmacyPickupService.php | 241 ++++++++++++++++++ .../Transaction/TransactionService.php | 67 +++++ ...pharmacy_pickup_fields_to_orders_table.php | 46 ++++ ...slot_no_nullable_on_pickup_codes_table.php | 27 ++ database/seeders/RoleSeeder.php | 1 + lang/en.json | 3 + lang/ja.json | 3 + lang/zh_TW.json | 28 ++ .../basic-settings/machines/index.blade.php | 22 ++ .../partials/tab-system-settings.blade.php | 6 + .../sales/pharmacy-pickup/index.blade.php | 181 +++++++++++++ .../sales/pharmacy-pickup/print.blade.php | 79 ++++++ .../layouts/partials/sidebar-menu.blade.php | 6 + routes/web.php | 8 +- 20 files changed, 1004 insertions(+), 10 deletions(-) create mode 100644 PHARMACY_PICKUP_DESIGN.md create mode 100644 app/Http/Controllers/Admin/PharmacyPickupController.php create mode 100644 app/Services/Transaction/PharmacyPickupService.php create mode 100644 database/migrations/2026_06_18_130000_add_pharmacy_pickup_fields_to_orders_table.php create mode 100644 database/migrations/2026_06_18_130100_make_slot_no_nullable_on_pickup_codes_table.php create mode 100644 resources/views/admin/sales/pharmacy-pickup/index.blade.php create mode 100644 resources/views/admin/sales/pharmacy-pickup/print.blade.php diff --git a/PHARMACY_PICKUP_DESIGN.md b/PHARMACY_PICKUP_DESIGN.md new file mode 100644 index 0000000..9a0f379 --- /dev/null +++ b/PHARMACY_PICKUP_DESIGN.md @@ -0,0 +1,61 @@ +# 領藥單 / 批價單取藥模組 — 設計文件（v2，已納入交叉檢查修正） + +分支：`feat/pharmacy-pickup`（自 `dev` 切出）。 + +`star-cloud` 是自動販賣機（智能機）雲端後台（Laravel 12 + Sail + MySQL + Redis + EMQX + Go mqtt-gateway）。 +本模組為**可授權功能**，只開放給部分客戶/機台：藥師依病人「批價單」人工建立「領藥單」→ 系統產序號 + 一張 QR → 病人到智能機掃碼 → 雲端驗證回多貨道 → 一次出全部 → 出貨結果回傳後台。不串 HIS、不存病人姓名病歷（比照中國醫取物單僅存編號）。 + +--- + +## 一、目標流程 +1. 病人拿批價單到櫃台。 +2. 藥師在後台**人工**勾選該機台貨道上的藥品 + 數量，建立「領藥單」；可選填**批價單號**當依據。 +3. 領藥單序號系統自動產生（`RX` + 日期 + 流水，如 `RX26061800001`），並**同時作為 `orders.flow_id`**（見修正②）。 +4. 系統產生**一張 QR 領藥單**，列印給病人。 +5. 病人到智能機掃 QR → 機台呼叫 **B660** → 雲端確認該機台為 `pickup_sheet` 模式且 `pharmacy_pickup_enabled` 開啟 → 回傳該單**所有貨道清單** → 機台一次出全部。 +6. 出貨結果經 MQTT `transaction/finalize`（帶 `dispense[]`）回傳 → 彙整更新領藥單出貨狀態。 + +--- + +## 二、模組授權機制（定案：取物單模式下的開關） +領藥單**不是**獨立的 shopping_mode，而是既有「取物單(pickup_sheet)」模式**底下的一個開關** `pharmacy_pickup_enabled`： +- `machines.settings.shopping_mode` 維持三種：`basic` / `employee_card` / `pickup_sheet`（取物單，中國醫物料編號領藥）。 +- 在「機台系統設定 → 購物方式」選 `pickup_sheet` 時，下方出現「**領藥單**」開關 `settings.pharmacy_pickup_enabled`。 +- 授權 = 機台為 `pickup_sheet` 模式且 `pharmacy_pickup_enabled=true`；後台「領藥單」選單僅在「公司有任一機台符合此條件」時顯示。 +- B014 `getSettings` 的 `FunctionSet` 新增 `PharmacyPickup` 旗標下發給機台；`ShoppingMode` 仍為 pickup_sheet。 +- 控制器強制：非 pickup_sheet 模式時 `pharmacy_pickup_enabled` 一律存 false。 +- （後續可選）公司層級 license gate，由系統管理員授權哪些公司可開此開關。 + +### ✅ Phase 1 已完成（本次） +- `machines/index.blade.php`：選「取物單」時，下方顯示「領藥單」開關（checkbox `settings[pharmacy_pickup_enabled]`）+ Alpine 資料。 +- `partials/tab-system-settings.blade.php`：取物單模式且開關開時，摘要加顯示 `領藥單`。 +- `MachineSettingController.php`：`shopping_mode` 白名單(basic/employee_card/pickup_sheet)；新增持久化 `pharmacy_pickup_enabled`（僅 pickup_sheet 模式可為 true）。 +- `MachineController.php`（B014）：`FunctionSet.PharmacyPickup` 下發。 +- `lang/{en,zh_TW,ja}.json`：新增 `Pharmacy Pickup (Rx)`（zh_TW=「領藥單」）+ 開關說明。 +- 驗證：2 controller PHP lint 通過、view:cache 成功、3 JSON 合法、登入頁 200。已部署測試機 192.168.0.130。 + +--- + +## 三、交叉檢查修正（必須遵守） +- **修正①（旗標）**：領藥單做成「取物單(pickup_sheet)模式下的開關 `pharmacy_pickup_enabled`」，並完整接上 B014 `FunctionSet.PharmacyPickup` 下發（非孤立旗標）。✅ 已採用。 +- **修正②（冪等/扣庫存）**：領藥單必須有 `flow_id`（用領藥單序號），讓出貨上報套用既有 `finalizeTransaction` 終態冪等保護；**庫存只在 finalize 扣一次**，建單不預扣（避免雙重扣減 / 重送 MQTT 重複扣）。 +- **修正③（B660 相容）**：保留回傳 `slot_no`（領藥單填第一筆或 null），**additive 新增 `items:[{slot_no,product_name,qty}]`**；用 `order_type` 分流；靠 `shopping_mode=pharmacy_pickup` gate 只放行新版機台。 +- **修正④（報表/發票隔離）**：`orders` 加 `order_type`；`SalesController` 銷售分頁與 CSV 匯出預設 `where order_type='sale'`，領藥單獨立頁；確認領藥 finalize 上報**不帶 invoice 區塊**（不會誤開發票）。 +- **修正⑤（既有脆弱點）**：先修 `PickupCode::isValid()` 對 null `expires_at` 的 NPE（`$this->expires_at?->isFuture() ?? true`）；把 `status` 補進 PickupCode `$fillable`；確認 `order_items` 實際欄位（`sku` vs `barcode`）。 +- **修正⑥（建單必填）**：`orders.payment_status` / `payment_type` 為 NOT NULL，建單須明確給值（領藥單給 0 / 特定碼）；多貨道「一次出全部」需與機台端對齊（既有 B055/dispatchDispense 為單貨道）。 + +--- + +## 四、資料模型變更 +- `orders` 新增：`order_type ENUM('sale','pharmacy_pickup') default 'sale'`、`pricing_slip_no VARCHAR NULL`、`created_by BIGINT NULL`。序號存 `order_no` 且**等於 `flow_id`**。 +- `pickup_codes.slot_no` 改 nullable（領藥單多貨道由 order_items×machine_slots 解析；一般取貨碼仍走 slot_no，以 order_type 區分讀取）。 +- 一張領藥單 = 1 Order(`pharmacy_pickup`) + N OrderItem + 1 PickupCode；付款欄位給定值；`delivery_status` 初始 0。 + +--- + +## 五、後續任務（修正後） +- **Phase 2 資料模型**：上述 migration；Order 加常數/scope；先修正⑤的 PickupCode 脆弱點。 +- **Phase 3 後台建單 + 列印**：`PharmacyPickupService::create()`（產序號=flow_id、庫存檢查、交易內建單）、`Admin/PharmacyPickupController`、勾選頁 + 列印頁（QR、不顯示姓名）。建單僅限 `pharmacy_pickup` 模式機台。 +- **Phase 4 B660**：additive items[] + order_type 分流 + 模式 gate + 標記碼已領。 +- **Phase 5 回報**：finalize 帶 dispense[] 一次彙整（復用 `resolveDeliveryStatusFromDispense`），靠 flow_id 終態冪等；庫存只扣一次；領藥單詳情顯示逐道結果。 +- **Phase 6 Android（另 repo）**：`shopping_mode=pharmacy_pickup` 啟用領藥 SaleFlow（沿用中國醫 TakeMedicineDialog/DispatchDialog，資料來源換 B660）。 diff --git a/app/Http/Controllers/Admin/BasicSettings/MachineSettingController.php b/app/Http/Controllers/Admin/BasicSettings/MachineSettingController.php index b007952..3d03d19 100644 --- a/app/Http/Controllers/Admin/BasicSettings/MachineSettingController.php +++ b/app/Http/Controllers/Admin/BasicSettings/MachineSettingController.php @@ -364,7 +364,11 @@ class MachineSettingController extends AdminController 'ambient_temp_monitoring_enabled', ]; + $allowedShoppingModes = ['basic', 'employee_card', 'pickup_sheet']; $shoppingMode = $settings['shopping_mode'] ?? 'basic'; + if (!in_array($shoppingMode, $allowedShoppingModes, true)) { + $shoppingMode = 'basic'; + } $data = []; foreach ($allowedFields as $field) { @@ -434,6 +438,11 @@ class MachineSettingController extends AdminController $jsonSettings[$field] = $data[$field]; } + // 領藥單模組：僅在「取物單(pickup_sheet)」模式下可啟用，其他模式一律關閉 + $jsonSettings['pharmacy_pickup_enabled'] = ($shoppingMode === 'pickup_sheet') + ? (bool) ($settings['pharmacy_pickup_enabled'] ?? false) + : false; + // 顯示語系 (languages)：機台螢幕可切換的語系，最多 N 種，僅系統管理員可設定。 // 商品翻譯範圍由「公司機台語系聯集」反推，故此處異動需失效聯集快取並重建商品目錄。 // 非系統管理員即使送出 languages 亦一律忽略（不報錯，讓其仍可儲存其他設定）。 diff --git a/app/Http/Controllers/Admin/PharmacyPickupController.php b/app/Http/Controllers/Admin/PharmacyPickupController.php new file mode 100644 index 0000000..e38f60a --- /dev/null +++ b/app/Http/Controllers/Admin/PharmacyPickupController.php @@ -0,0 +1,140 @@ +where('settings->shopping_mode', 'pickup_sheet') + ->where('settings->pharmacy_pickup_enabled', true) + ->orderBy('name') + ->get(); + + $selectedMachine = null; + $products = new Collection(); + + if ($request->filled('machine_id')) { + $selectedMachine = $machines->firstWhere('id', (int) $request->input('machine_id')); + if ($selectedMachine) { + $products = $this->service->availableProducts($selectedMachine); + } + } + + $orders = Order::pharmacyPickup() + ->with(['machine:id,name,serial_no', 'items', 'creator:id,name', 'pickupCode']) + ->latest() + ->paginate($request->input('per_page', 10)) + ->withQueryString(); + + return view('admin.sales.pharmacy-pickup.index', [ + 'title' => __('menu.sales.pharmacy-pickup'), + 'machines' => $machines, + 'selectedMachine' => $selectedMachine, + 'products' => $products, + 'orders' => $orders, + ]); + } + + public function store(Request $request) + { + $request->validate([ + 'machine_id' => 'required|exists:machines,id', + 'pricing_slip_no' => 'nullable|string|max:64', + ]); + + // 由勾選的 products[] + qty[product_id] 組出 items + $productIds = (array) $request->input('products', []); + $qtyMap = (array) $request->input('qty', []); + $items = []; + foreach ($productIds as $pid) { + $q = (int) ($qtyMap[$pid] ?? 0); + if ($q > 0) { + $items[] = ['product_id' => (int) $pid, 'quantity' => $q]; + } + } + + try { + $order = $this->service->create([ + 'machine_id' => (int) $request->input('machine_id'), + 'pricing_slip_no' => $request->input('pricing_slip_no'), + 'items' => $items, + ], Auth::id()); + } catch (ValidationException $e) { + return back()->withErrors($e->errors())->withInput(); + } + + return redirect() + ->route('admin.sales.pharmacy-pickup', ['machine_id' => $request->input('machine_id')]) + ->with('success', __('Pharmacy pickup order created: :no', ['no' => $order->order_no])) + ->with('created_order_id', $order->id); + } + + /** + * 可列印的領藥單（QR 內嵌 SVG，內容為 8 碼領藥碼，機台掃描後送 B660 驗證）。 + */ + public function print(Order $order) + { + abort_unless($order->order_type === Order::TYPE_PHARMACY_PICKUP, 404); + + $order->load(['items', 'machine', 'pickupCode', 'creator:id,name']); + $code = $order->pickupCode?->code; + $qrSvg = $code + ? QrCode::format('svg')->size(220)->margin(1)->errorCorrection('M')->generate($code) + : null; + + return view('admin.sales.pharmacy-pickup.print', [ + 'order' => $order, + 'qrSvg' => $qrSvg, + ]); + } + + public function cancel(Order $order) + { + abort_unless($order->order_type === Order::TYPE_PHARMACY_PICKUP, 404); + + if (in_array($order->status, [Order::STATUS_COMPLETED, Order::STATUS_FAILED], true) + || $order->delivery_status === Order::DELIVERY_STATUS_SUCCESS) { + return back()->with('error', __('This pharmacy pickup order can no longer be cancelled.')); + } + + $order->update(['status' => Order::STATUS_FAILED]); + if ($order->pickupCode) { + $order->pickupCode->update(['status' => 'cancelled']); + } + + SystemOperationLog::create([ + 'company_id' => $order->company_id, + 'user_id' => Auth::id(), + 'module' => 'pharmacy_pickup', + 'action' => 'cancel', + 'target_id' => $order->id, + 'target_type' => Order::class, + ]); + + return back()->with('success', __('Pharmacy pickup order cancelled.')); + } +} diff --git a/app/Http/Controllers/Api/V1/App/MachineController.php b/app/Http/Controllers/Api/V1/App/MachineController.php index 02eaebd..33ebc12 100644 --- a/app/Http/Controllers/Api/V1/App/MachineController.php +++ b/app/Http/Controllers/Api/V1/App/MachineController.php @@ -501,6 +501,7 @@ class MachineController extends Controller 'WelcomeGift' => (bool) ($s['welcome_gift_enabled'] ?? false), // 來店禮 'MemberSystem' => (bool) ($s['member_system_enabled'] ?? false), // 會員系統 'AmbientTemp' => (bool) ($s['ambient_temp_monitoring_enabled'] ?? false), // 環境溫度監控 + 'PharmacyPickup' => (bool) ($s['pharmacy_pickup_enabled'] ?? false), // 領藥單(雲端建單，取物單模式下開關) ]; // 5-4 ShoppingMode：購物方式（頂層字串） @@ -690,17 +691,50 @@ class MachineController extends Controller ]); // 移除 StaffCardLog 重複紀錄，因為取貨碼本身有 status 和 order_id 可以追蹤 - // 憑證的「核銷」將由 MQTT finalizeTransaction 流程處理，不再需要 B660 PUT + // 一般取貨碼的「核銷」仍由 MQTT finalizeTransaction 流程處理（行為不變）。 + + $data = [ + 'slot_no' => $pickupCode->slot_no, // 保留：既有單貨道機台讀此欄（領藥單為 null） + 'pickup_code_id' => $pickupCode->id, + 'code_id' => $pickupCode->id, // 統一回傳 code_id + 'status' => $pickupCode->status, + ]; + + // === 領藥單(pharmacy_pickup)擴充：回傳多貨道清單 + 標記碼已領（僅領藥單，不影響既有單貨道流程） === + $order = $pickupCode->order; + $isPharmacy = $order && $order->order_type === \App\Models\Transaction\Order::TYPE_PHARMACY_PICKUP; + + if ($isPharmacy) { + // Gate：機台須仍為「取物單模式 + 領藥單開關開啟」才放行領藥碼 + $settings = $machine->settings ?? []; + $enabled = (($settings['shopping_mode'] ?? null) === 'pickup_sheet') + && (bool) ($settings['pharmacy_pickup_enabled'] ?? false); + + if (!$enabled) { + return response()->json(['success' => false, 'message' => 'Pharmacy pickup not enabled on this machine', 'code' => 403], 403); + } + + // 依目前貨道庫存解析多貨道出貨清單（一商品可跨多貨道湊量） + $items = app(\App\Services\Transaction\PharmacyPickupService::class)->resolveDispenseItems($order); + + // 標記碼已領（usage_count++；達上限轉 used）——僅領藥單，避免動到既有單貨道核銷流程 + $pickupCode->usage_count = (int) $pickupCode->usage_count + 1; + $pickupCode->used_at = $pickupCode->used_at ?? now(); + if ($pickupCode->usage_count >= (int) $pickupCode->usage_limit) { + $pickupCode->status = 'used'; + } + $pickupCode->save(); + + $data['order_type'] = \App\Models\Transaction\Order::TYPE_PHARMACY_PICKUP; + $data['order_no'] = $order->order_no; + $data['items'] = $items; // [{slot_no, product_id, product_name, qty}, ...] + $data['status'] = $pickupCode->status; + } return response()->json([ 'success' => true, 'code' => 200, - 'data' => [ - 'slot_no' => $pickupCode->slot_no, - 'pickup_code_id' => $pickupCode->id, - 'code_id' => $pickupCode->id, // 統一回傳 code_id - 'status' => 'active' - ] + 'data' => $data, ]); } diff --git a/app/Models/Transaction/Order.php b/app/Models/Transaction/Order.php index 2e98628..6c7ef33 100644 --- a/app/Models/Transaction/Order.php +++ b/app/Models/Transaction/Order.php @@ -13,6 +13,10 @@ class Order extends Model { use HasFactory, SoftDeletes, TenantScoped; + // 訂單類型 (order_type) + public const TYPE_SALE = 'sale'; // 一般銷售 + public const TYPE_PHARMACY_PICKUP = 'pharmacy_pickup'; // 領藥單 + // 支付狀態 public const PAYMENT_STATUS_FAILED = 0; public const PAYMENT_STATUS_SUCCESS = 1; @@ -30,6 +34,8 @@ class Order extends Model public const STATUS_COMPLETED = 'completed'; public const STATUS_FAILED = 'failed'; public const STATUS_ABANDONED = 'abandoned'; + // 領藥單專用：已開立、等待病人到機台領取（非 pending，不被逾時清掃；非終態，可被出貨 finalize 更新）。 + public const STATUS_AWAITING_PICKUP = 'awaiting_pickup'; /** 終態清單：到了這些狀態就不再變更（冪等）。 */ public const TERMINAL_STATUSES = [ @@ -42,6 +48,9 @@ class Order extends Model 'company_id', 'flow_id', 'order_no', + 'order_type', + 'pricing_slip_no', + 'created_by', 'machine_id', 'member_id', 'payment_type', @@ -182,11 +191,29 @@ class Order extends Model . mb_substr($name, -1); } + /** 一般銷售訂單 */ + public function scopeSales($query) + { + return $query->where('order_type', self::TYPE_SALE); + } + + /** 領藥單 */ + public function scopePharmacyPickup($query) + { + return $query->where('order_type', self::TYPE_PHARMACY_PICKUP); + } + public function machine() { return $this->belongsTo(Machine::class); } + /** 建單者 (領藥單藥師) */ + public function creator() + { + return $this->belongsTo(\App\Models\System\User::class, 'created_by'); + } + public function member() { return $this->belongsTo(Member::class); @@ -207,6 +234,12 @@ class Order extends Model return $this->hasMany(DispenseRecord::class); } + /** 領藥單對應的領藥碼（一單一碼） */ + public function pickupCode() + { + return $this->hasOne(PickupCode::class); + } + public function staffCardLog() { return $this->hasOne(\App\Models\StaffCardLog::class); diff --git a/app/Models/Transaction/PickupCode.php b/app/Models/Transaction/PickupCode.php index f8b3bc4..a5e52f4 100644 --- a/app/Models/Transaction/PickupCode.php +++ b/app/Models/Transaction/PickupCode.php @@ -18,6 +18,7 @@ class PickupCode extends Model 'slot_no', 'code', 'slug', + 'status', 'expires_at', 'used_at', 'usage_limit', @@ -78,9 +79,9 @@ class PickupCode extends Model */ public function isValid(): bool { - return $this->status === 'active' + return $this->status === 'active' && ($this->usage_count < $this->usage_limit) - && ($this->expires_at->isFuture()); + && ($this->expires_at?->isFuture() ?? true); // null expires_at = 無到期限制 } /** diff --git a/app/Services/Transaction/PharmacyPickupService.php b/app/Services/Transaction/PharmacyPickupService.php new file mode 100644 index 0000000..af92fdf --- /dev/null +++ b/app/Services/Transaction/PharmacyPickupService.php @@ -0,0 +1,241 @@ +id) + ->where('is_active', true) + ->where('stock', '>', 0) + ->with('product') + ->get() + ->groupBy('product_id') + ->map(function ($slots) { + $product = $slots->first()->product; + if (!$product) { + return null; + } + + return (object) [ + 'product_id' => $product->id, + 'name' => $product->localized_name ?? $product->name, + 'spec' => $product->localized_spec ?? $product->spec, + 'barcode' => $product->barcode, + 'price' => (float) ($product->price ?? 0), + 'available' => (int) $slots->sum('stock'), + 'slot_count' => $slots->count(), + 'slots' => $slots->pluck('slot_no')->implode(', '), + ]; + }) + ->filter() + ->sortBy('name') + ->values(); + } + + /** + * 建立一張領藥單：Order(pharmacy_pickup) + N 個 OrderItem + 1 個 PickupCode。 + * + * @param array{machine_id:int, pricing_slip_no?:string, items:array, expires_at?:\DateTimeInterface} $data + */ + public function create(array $data, int $userId): Order + { + $machine = Machine::findOrFail($data['machine_id']); + $items = collect($data['items'] ?? []) + ->map(fn ($i) => ['product_id' => (int) $i['product_id'], 'quantity' => (int) $i['quantity']]) + ->filter(fn ($i) => $i['quantity'] > 0) + ->values(); + + if ($items->isEmpty()) { + throw ValidationException::withMessages([ + 'items' => __('Please select at least one medicine with quantity.'), + ]); + } + + return DB::transaction(function () use ($machine, $items, $data, $userId) { + $orderItemsData = []; + $total = 0.0; + + foreach ($items as $item) { + $product = Product::findOrFail($item['product_id']); + $qty = $item['quantity']; + + // 該機台此商品跨貨道可用庫存（僅檢查，不預扣） + $available = (int) MachineSlot::where('machine_id', $machine->id) + ->where('product_id', $product->id) + ->where('is_active', true) + ->sum('stock'); + + if ($qty > $available) { + throw ValidationException::withMessages([ + 'items' => __('Insufficient stock for :name (requested :qty, available :available).', [ + 'name' => $product->localized_name ?? $product->name, + 'qty' => $qty, + 'available' => $available, + ]), + ]); + } + + $price = (float) ($product->price ?? 0); + $subtotal = $price * $qty; + $total += $subtotal; + + $orderItemsData[] = [ + 'product_id' => $product->id, + 'product_name' => $product->localized_name ?? $product->name, + 'barcode' => $product->barcode, + 'quantity' => $qty, + 'price' => $price, + 'subtotal' => $subtotal, + ]; + } + + $serial = $this->generateSerial(); + + $order = Order::create([ + 'company_id' => $machine->company_id, + 'flow_id' => $serial, + 'order_no' => $serial, + 'order_type' => Order::TYPE_PHARMACY_PICKUP, + 'pricing_slip_no' => $data['pricing_slip_no'] ?? null, + 'created_by' => $userId, + 'machine_id' => $machine->id, + 'payment_type' => self::PAYMENT_TYPE_PHARMACY, + 'total_amount' => $total, + 'discount_amount' => 0, + 'pay_amount' => 0, + 'change_amount' => 0, + 'points_used' => 0, + 'payment_status' => Order::PAYMENT_STATUS_SUCCESS, + 'status' => Order::STATUS_AWAITING_PICKUP, + 'delivery_status' => Order::DELIVERY_STATUS_FAILED, // 0：尚未出貨 + 'machine_time' => now(), + ]); + + foreach ($orderItemsData as $oi) { + $order->items()->create($oi); + } + + $pickupCode = PickupCode::create([ + 'company_id' => $machine->company_id, + 'machine_id' => $machine->id, + 'slot_no' => null, // 多貨道：由 B660 掃碼時解析 + 'code' => PickupCode::generateUniqueCode($machine->id), + 'status' => 'active', + 'expires_at' => $data['expires_at'] ?? now()->endOfDay(), // 預設當日有效 + 'usage_limit' => 1, + 'usage_count' => 0, + 'created_by' => $userId, + 'order_id' => $order->id, + ]); + + SystemOperationLog::create([ + 'company_id' => $machine->company_id, + 'user_id' => $userId, + 'module' => 'pharmacy_pickup', + 'action' => 'create', + 'target_id' => $order->id, + 'target_type' => Order::class, + 'new_values' => [ + 'order_no' => $order->order_no, + 'pricing_slip_no' => $order->pricing_slip_no, + 'pickup_code' => $pickupCode->code, + 'items' => $orderItemsData, + ], + ]); + + return $order->load(['items', 'pickupCode', 'machine']); + }); + } + + /** + * 解析一張領藥單在「目前機台貨道庫存」下的出貨清單（一商品可跨多貨道湊量）。 + * 回傳：[['slot_no'=>, 'product_id'=>, 'product_name'=>, 'qty'=>], ...] + * 庫存不足時盡力分配（出可出的數量；部分/失敗由出貨回報 Phase 標記）。 + */ + public function resolveDispenseItems(Order $order): array + { + $result = []; + + foreach ($order->items as $orderItem) { + $remaining = (int) $orderItem->quantity; + + $slots = MachineSlot::where('machine_id', $order->machine_id) + ->where('product_id', $orderItem->product_id) + ->where('is_active', true) + ->where('stock', '>', 0) + ->orderByDesc('stock') + ->orderBy('slot_no') + ->get(); + + foreach ($slots as $slot) { + if ($remaining <= 0) { + break; + } + $take = min($remaining, (int) $slot->stock); + if ($take <= 0) { + continue; + } + $result[] = [ + 'slot_no' => $slot->slot_no, + 'product_id' => $orderItem->product_id, + 'product_name' => $orderItem->product_name, + 'qty' => $take, + ]; + $remaining -= $take; + } + // $remaining > 0 表示目前庫存不足以完全滿足此商品，僅回傳可出的部分。 + } + + return $result; + } + + /** + * 產生領藥單序號：RX + 西元年月日 + 當日 4 碼流水（與 flow_id 唯一性衝突時自動遞增）。 + */ + protected function generateSerial(): string + { + $datePart = now()->format('Ymd'); + $base = Order::withoutGlobalScopes() + ->where('order_type', Order::TYPE_PHARMACY_PICKUP) + ->whereDate('created_at', now()->toDateString()) + ->count(); + + $attempt = 0; + do { + $seq = $base + 1 + $attempt; + $serial = 'RX' . $datePart . str_pad((string) $seq, 4, '0', STR_PAD_LEFT); + $attempt++; + } while ( + Order::withoutGlobalScopes()->where('flow_id', $serial)->exists() + && $attempt < 100 + ); + + return $serial; + } +} diff --git a/app/Services/Transaction/TransactionService.php b/app/Services/Transaction/TransactionService.php index b6d1832..47365ce 100644 --- a/app/Services/Transaction/TransactionService.php +++ b/app/Services/Transaction/TransactionService.php @@ -348,6 +348,12 @@ class TransactionService ]); return $existingOrder; } + + // 領藥單(pharmacy_pickup)：走獨立出貨回報流程，完全不經銷售/發票/閉環邏輯。 + // 第一次回報後 status→completed(終態)，後續重送會在上面的終態檢查 early-return（冪等、不重複扣庫存）。 + if ($existingOrder && $existingOrder->order_type === Order::TYPE_PHARMACY_PICKUP) { + return $this->finalizePharmacyDispense($existingOrder, $data); + } } else { throw new \Exception("Flow ID is required for finalization"); } @@ -517,6 +523,67 @@ class TransactionService }); } + /** + * 領藥單出貨回報（獨立於銷售流程）。 + * + * 機台逐道出貨後，以 transaction/finalize 帶 dispense[]（每出貨一單位一筆，含 slot_no/dispense_status）回報。 + * 本方法：建立出貨紀錄（沿用 recordDispense：成功則扣 1 庫存）→ 彙整 delivery_status → + * 將訂單轉為終態 completed（冪等：重送會在 finalizeTransaction 開頭 early-return）→ 標記領藥碼已領 + 核銷日誌。 + */ + protected function finalizePharmacyDispense(Order $order, array $data): Order + { + return DB::transaction(function () use ($order, $data) { + $serialNo = $data['serial_no'] ?? $order->machine?->serial_no; + + if (!empty($data['dispense'])) { + $dispenseList = isset($data['dispense'][0]) ? $data['dispense'] : [$data['dispense']]; + foreach ($dispenseList as $dispenseItem) { + $dispenseItem['serial_no'] = $serialNo; + $dispenseItem['flow_id'] = $order->flow_id; + $dispenseItem['order_id'] = $order->id; + $this->recordDispense($dispenseItem); // 建 DispenseRecord；dispense_status=1 時扣 1 庫存 + } + $deliveryStatus = $this->resolveDeliveryStatusFromDispense($data['dispense']); + } else { + // 無出貨明細視為失敗 + $deliveryStatus = Order::DELIVERY_STATUS_FAILED; + } + + $order->update([ + 'delivery_status' => $deliveryStatus, + 'status' => Order::STATUS_COMPLETED, // 終態 → 後續重送冪等 + 'machine_time' => $data['machine_time'] ?? $order->machine_time, + ]); + + // 標記領藥碼已領（B660 通常已標 used；此處保險並留核銷日誌） + $pickupCode = $order->pickupCode; + if ($pickupCode) { + if ($pickupCode->status !== 'used') { + $pickupCode->update(['status' => 'used', 'used_at' => $pickupCode->used_at ?? now()]); + } + PickupCodeLog::create([ + 'company_id' => $order->company_id, + 'machine_id' => $order->machine_id, + 'pickup_code_id' => $pickupCode->id, + 'order_id' => $order->id, + 'action' => 'used', + 'remark' => "log.pickup.pharmacy_dispensed", + 'raw_data' => [ + 'order_no' => $order->order_no, + 'delivery_status' => $deliveryStatus, + ], + ]); + } + + Log::info('Pharmacy pickup dispense finalized', [ + 'flow_id' => $order->flow_id, + 'delivery_status' => $deliveryStatus, + ]); + + return $order; + }); + } + /** * Resolve order-level delivery status from item-level dispense results. */ diff --git a/database/migrations/2026_06_18_130000_add_pharmacy_pickup_fields_to_orders_table.php b/database/migrations/2026_06_18_130000_add_pharmacy_pickup_fields_to_orders_table.php new file mode 100644 index 0000000..4c8b80c --- /dev/null +++ b/database/migrations/2026_06_18_130000_add_pharmacy_pickup_fields_to_orders_table.php @@ -0,0 +1,46 @@ +string('order_type', 20)->default('sale')->index() + ->comment('訂單類型: sale=一般銷售, pharmacy_pickup=領藥單')->after('order_no'); + } + if (!Schema::hasColumn('orders', 'pricing_slip_no')) { + $table->string('pricing_slip_no', 64)->nullable() + ->comment('批價單號 (領藥單藥師填寫之依據)')->after('order_type'); + } + if (!Schema::hasColumn('orders', 'created_by')) { + $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete() + ->comment('建單者 (領藥單由後台藥師建立)')->after('pricing_slip_no'); + } + }); + } + + public function down(): void + { + Schema::table('orders', function (Blueprint $table) { + if (Schema::hasColumn('orders', 'created_by')) { + $table->dropForeign(['created_by']); + $table->dropColumn('created_by'); + } + if (Schema::hasColumn('orders', 'pricing_slip_no')) { + $table->dropColumn('pricing_slip_no'); + } + if (Schema::hasColumn('orders', 'order_type')) { + $table->dropColumn('order_type'); + } + }); + } +}; diff --git a/database/migrations/2026_06_18_130100_make_slot_no_nullable_on_pickup_codes_table.php b/database/migrations/2026_06_18_130100_make_slot_no_nullable_on_pickup_codes_table.php new file mode 100644 index 0000000..2fbc32e --- /dev/null +++ b/database/migrations/2026_06_18_130100_make_slot_no_nullable_on_pickup_codes_table.php @@ -0,0 +1,27 @@ +string('slot_no')->nullable()->change(); + }); + } + + public function down(): void + { + Schema::table('pickup_codes', function (Blueprint $table) { + $table->string('slot_no')->nullable(false)->change(); + }); + } +}; diff --git a/database/seeders/RoleSeeder.php b/database/seeders/RoleSeeder.php index 2a98060..ce88935 100644 --- a/database/seeders/RoleSeeder.php +++ b/database/seeders/RoleSeeder.php @@ -39,6 +39,7 @@ class RoleSeeder extends Seeder 'menu.sales.promotions', 'menu.sales.pass-codes', 'menu.sales.store-gifts', + 'menu.sales.pharmacy-pickup', 'menu.analysis', 'menu.analysis.change-stock', 'menu.analysis.machine-reports', diff --git a/lang/en.json b/lang/en.json index 4fa8aa9..3e9e5dc 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1549,6 +1549,8 @@ "Pickup Recipient (Prescription Slip)": "Pickup Recipient (Prescription Slip)", "Pickup Recipient Info": "Pickup Recipient Info", "Pickup Sheet (Material No.)": "Pickup Sheet (Material No.)", + "Pharmacy Pickup (Rx)": "Pharmacy Pickup (Rx)", + "Issue pharmacy pickup orders from the backend; patient scans QR to dispense.": "Issue pharmacy pickup orders from the backend; patient scans QR to dispense.", "Pickup Ticket": "Pickup Ticket", "Pickup Voucher": "Pickup Voucher", "Pickup code cancelled.": "Pickup code cancelled.", @@ -2532,6 +2534,7 @@ "menu.sales.promotions": "Promotions", "menu.sales.records": "Sales Records", "menu.sales.store-gifts": "Store Gifts", + "menu.sales.pharmacy-pickup": "Pharmacy Pickup", "menu.special-permission": "Special Permissions", "menu.special-permission.clear-stock": "Clear Stock", "menu.warehouses": "Warehouse Management", diff --git a/lang/ja.json b/lang/ja.json index 6d150b6..60a2643 100644 --- a/lang/ja.json +++ b/lang/ja.json @@ -1549,6 +1549,8 @@ "Pickup Recipient (Prescription Slip)": "受取者（処方箋）", "Pickup Recipient Info": "受取者情報", "Pickup Sheet (Material No.)": "ピッキングシート（材料番号）", + "Pharmacy Pickup (Rx)": "薬品受取", + "Issue pharmacy pickup orders from the backend; patient scans QR to dispense.": "バックエンドで薬品受取注文を発行し、患者がQRをスキャンして払い出します。", "Pickup Ticket": "商品受取チケット", "Pickup Voucher": "受取票", "Pickup code cancelled.": "受取コードがキャンセルされました。", @@ -2532,6 +2534,7 @@ "menu.sales.promotions": "プロモーション期間", "menu.sales.records": "販売記録", "menu.sales.store-gifts": "来店ギフト", + "menu.sales.pharmacy-pickup": "薬品受取", "menu.special-permission": "特別権限", "menu.special-permission.clear-stock": "在庫クリア", "menu.warehouses": "倉庫管理", diff --git a/lang/zh_TW.json b/lang/zh_TW.json index 4c8880d..34bb9d3 100644 --- a/lang/zh_TW.json +++ b/lang/zh_TW.json @@ -1549,6 +1549,8 @@ "Pickup Recipient (Prescription Slip)": "取物人(領藥單)", "Pickup Recipient Info": "取物人資訊", "Pickup Sheet (Material No.)": "取物單(物料編號)", + "Pharmacy Pickup (Rx)": "領藥單", + "Issue pharmacy pickup orders from the backend; patient scans QR to dispense.": "由後台開立領藥單，病人到機台掃 QR 出貨。", "Pickup Ticket": "商品領取券", "Pickup Voucher": "取物單", "Pickup code cancelled.": "取貨碼已取消", @@ -2532,6 +2534,32 @@ "menu.sales.promotions": "促銷時段", "menu.sales.records": "銷售紀錄", "menu.sales.store-gifts": "來店禮", + "menu.sales.pharmacy-pickup": "領藥單", + "Spec": "規格", + "Created": "建立時間", + "Available": "可用庫存", + "optional": "選填", + "Awaiting Pickup": "待領取", + "Picked Up": "已領取", + "Voided": "已作廢", + "Issue a pharmacy pickup order, print the QR ticket, patient scans at the machine to dispense.": "開立領藥單、列印 QR 領藥單，病人到機台掃碼即可出貨。", + "Create Pharmacy Pickup Order": "建立領藥單", + "No machines enabled for pharmacy pickup. Enable it under Machine System Settings (Pickup Sheet mode → Pharmacy Pickup switch).": "尚無啟用領藥單的機台。請至「機台系統設定」（取物單模式 → 領藥單開關）啟用。", + "-- Select Machine --": "-- 選擇機台 --", + "Pricing Slip No.": "批價單號", + "e.g. the hospital pricing slip number": "例如：醫院批價單上的單號", + "This machine currently has no medicine in stock.": "此機台目前無可領藥品庫存。", + "Medicine": "藥品", + "Create & Generate QR": "建立並產生 QR", + "Pharmacy Pickup Orders": "領藥單列表", + "Cancel this pharmacy pickup order?": "確定要作廢這張領藥單嗎？", + "No pharmacy pickup orders yet.": "目前尚無領藥單。", + "Please select at least one medicine with quantity.": "請至少勾選一項藥品並填寫數量。", + "Insufficient stock for :name (requested :qty, available :available).": ":name 庫存不足（需求 :qty，可用 :available）。", + "Pharmacy pickup order created: :no": "領藥單已建立：:no", + "This pharmacy pickup order can no longer be cancelled.": "此領藥單已無法作廢。", + "Pharmacy pickup order cancelled.": "領藥單已作廢。", + "Scan the QR code or enter the pickup code at the machine to collect your medicine.": "請至機台掃描 QR 碼，或輸入領藥碼領取藥品。", "menu.special-permission": "特殊權限", "menu.special-permission.clear-stock": "庫存清空", "menu.warehouses": "倉儲管理", diff --git a/resources/views/admin/basic-settings/machines/index.blade.php b/resources/views/admin/basic-settings/machines/index.blade.php index d4e55a2..c29ca86 100644 --- a/resources/views/admin/basic-settings/machines/index.blade.php +++ b/resources/views/admin/basic-settings/machines/index.blade.php @@ -204,6 +204,9 @@ pickup_code_enabled: settings.pickup_code_enabled === true || settings.pickup_code_enabled === 1 || settings.pickup_code_enabled === '1', pass_code_enabled: settings.pass_code_enabled === true || settings.pass_code_enabled === 1 || settings.pass_code_enabled === '1', + // 領藥單（取物單模式下的開關） + pharmacy_pickup_enabled: settings.pharmacy_pickup_enabled === true || settings.pharmacy_pickup_enabled === 1 || settings.pharmacy_pickup_enabled === '1', + // 零售附加功能 shopping_cart_enabled: machine.shopping_cart_enabled === true || machine.shopping_cart_enabled === 1 || machine.shopping_cart_enabled === '1', welcome_gift_enabled: machine.welcome_gift_enabled === true || machine.welcome_gift_enabled === 1 || machine.welcome_gift_enabled === '1', @@ -619,6 +622,25 @@ + +
+
+

{{ __('Pharmacy Pickup (Rx)') }}

+

{{ __('Issue pharmacy pickup orders from the backend; patient scans QR to dispense.') }}

+
+
+ +
+
+
diff --git a/resources/views/admin/basic-settings/machines/partials/tab-system-settings.blade.php b/resources/views/admin/basic-settings/machines/partials/tab-system-settings.blade.php index 0d11b43..20ffb18 100644 --- a/resources/views/admin/basic-settings/machines/partials/tab-system-settings.blade.php +++ b/resources/views/admin/basic-settings/machines/partials/tab-system-settings.blade.php @@ -99,6 +99,9 @@ $activeFeatures[] = __('Staff Card'); } elseif ($shoppingMode === 'pickup_sheet') { $activeFeatures[] = __('Pickup Sheet (Material No.)'); + if ($machine->settings['pharmacy_pickup_enabled'] ?? false) { + $activeFeatures[] = __('Pharmacy Pickup (Rx)'); + } } else { $activeFeatures[] = __('Basic Mode'); @@ -242,6 +245,9 @@ $activeFeatures[] = __('Staff Card'); } elseif ($shoppingMode === 'pickup_sheet') { $activeFeatures[] = __('Pickup Sheet (Material No.)'); + if ($machine->settings['pharmacy_pickup_enabled'] ?? false) { + $activeFeatures[] = __('Pharmacy Pickup (Rx)'); + } } else { $activeFeatures[] = __('Basic Mode'); diff --git a/resources/views/admin/sales/pharmacy-pickup/index.blade.php b/resources/views/admin/sales/pharmacy-pickup/index.blade.php new file mode 100644 index 0000000..a87b2f9 --- /dev/null +++ b/resources/views/admin/sales/pharmacy-pickup/index.blade.php @@ -0,0 +1,181 @@ +@extends('layouts.admin') + +@section('content') +@php + $statusLabels = [ + 'awaiting_pickup' => __('Awaiting Pickup'), + 'completed' => __('Picked Up'), + 'failed' => __('Voided'), + 'pending' => __('Pending'), + 'abandoned' => __('Abandoned'), + ]; + $statusColors = [ + 'awaiting_pickup' => 'bg-amber-100 text-amber-700 dark:bg-amber-500/10 dark:text-amber-400', + 'completed' => 'bg-emerald-100 text-emerald-700 dark:bg-emerald-500/10 dark:text-emerald-400', + 'failed' => 'bg-rose-100 text-rose-700 dark:bg-rose-500/10 dark:text-rose-400', + ]; +@endphp + +
+ +
+

{{ __('menu.sales.pharmacy-pickup') }}

+ {{ __('Issue a pharmacy pickup order, print the QR ticket, patient scans at the machine to dispense.') }} +
+ + @if(session('success')) +
{{ session('success') }}
+ @endif + @if(session('error')) +
{{ session('error') }}
+ @endif + @if($errors->any()) +
+
    + @foreach($errors->all() as $err)
  • {{ $err }}
    • @endforeach +
+
+ @endif + + {{-- 建立領藥單 --}} +
+

{{ __('Create Pharmacy Pickup Order') }}

+ + @if($machines->isEmpty()) +

{{ __('No machines enabled for pharmacy pickup. Enable it under Machine System Settings (Pickup Sheet mode → Pharmacy Pickup switch).') }}

+ @else + {{-- 選機台（變更即重新載入該機台可領藥品） --}} +
+
+ + +
+
+ + @if($selectedMachine) +
+ @csrf + + +
+ + +
+ + @if($products->isEmpty()) +

{{ __('This machine currently has no medicine in stock.') }}

+ @else +
+ + + + + + + + + + + + @foreach($products as $p) + + + + + + + + @endforeach + +
{{ __('Medicine') }}{{ __('Spec') }}{{ __('Available') }}{{ __('Quantity') }}
+ + {{ $p->name }}{{ $p->spec ?: '-' }}{{ $p->available }} + +
+
+ + + @endif +
+ @endif + @endif +
+ + {{-- 領藥單列表 --}} +
+

{{ __('Pharmacy Pickup Orders') }}

+ +
+ + + + + + + + + + + + + + + @forelse($orders as $order) + + + + + + + + + + + @empty + + @endforelse + +
{{ __('Order No.') }}{{ __('Pricing Slip No.') }}{{ __('Machine') }}{{ __('Items') }}{{ __('Pickup Code') }}{{ __('Status') }}{{ __('Created') }}{{ __('Actions') }}
{{ $order->order_no }}{{ $order->pricing_slip_no ?: '-' }}{{ $order->machine?->name ?? '-' }} + @foreach($order->items as $it) +
{{ $it->product_name }} × {{ $it->quantity }}
+ @endforeach + 		{{ $order->pickupCode?->code ?? '-' }} + {{ $statusLabels[$order->status] ?? $order->status }} + +
{{ $order->created_at?->format('Y-m-d H:i') }}
+
{{ $order->creator?->name }}
+ 		+
+ @if($order->status !== 'failed' && $order->pickupCode) + {{ __('Print') }} + @endif + @if($order->status === 'awaiting_pickup') +
+ @csrf + +
+ @endif + @if($order->status === 'failed' && !($order->pickupCode)) + - + @endif +
+
{{ __('No pharmacy pickup orders yet.') }}
+
+ +
{{ $orders->links() }}
+
+
+@endsection diff --git a/resources/views/admin/sales/pharmacy-pickup/print.blade.php b/resources/views/admin/sales/pharmacy-pickup/print.blade.php new file mode 100644 index 0000000..4aaaedb --- /dev/null +++ b/resources/views/admin/sales/pharmacy-pickup/print.blade.php @@ -0,0 +1,79 @@ + + + + + + {{ __('menu.sales.pharmacy-pickup') }} {{ $order->order_no }} + + + +
+ +
+ +
+
+

{{ __('menu.sales.pharmacy-pickup') }}

+
{{ $order->machine?->name }}@if($order->machine?->location) · {{ $order->machine->location }}@endif
+
+ +
{{ __('Order No.') }}{{ $order->order_no }}
+ @if($order->pricing_slip_no) +
{{ __('Pricing Slip No.') }}{{ $order->pricing_slip_no }}
+ @endif +
{{ __('Created') }}{{ $order->created_at?->format('Y-m-d H:i') }}
+ @if($order->pickupCode?->expires_at) +
{{ __('Valid Until') }}{{ $order->pickupCode->expires_at->format('Y-m-d H:i') }}
+ @endif + + + + + + + @foreach($order->items as $it) + + @endforeach + +
{{ __('Medicine') }}{{ __('Quantity') }}
{{ $it->product_name }}{{ $it->quantity }}
+ +
+
{{ __('Pickup Code') }}
+
{{ $order->pickupCode?->code ?? '--------' }}
+
+ + @if($qrSvg) +
{!! $qrSvg !!}
+ @endif + +
{{ __('Scan the QR code or enter the pickup code at the machine to collect your medicine.') }}
+
+ + diff --git a/resources/views/layouts/partials/sidebar-menu.blade.php b/resources/views/layouts/partials/sidebar-menu.blade.php index 434b3cf..8109f6c 100644 --- a/resources/views/layouts/partials/sidebar-menu.blade.php +++ b/resources/views/layouts/partials/sidebar-menu.blade.php @@ -216,6 +216,12 @@ {{ __('Store Gifts') }} @endcan + @can('menu.sales.pharmacy-pickup') +
  • + + {{ __('menu.sales.pharmacy-pickup') }} +
    • + @endcan
    diff --git a/routes/web.php b/routes/web.php index bfa8bd6..ea1a262 100644 --- a/routes/web.php +++ b/routes/web.php @@ -170,7 +170,13 @@ Route::middleware(['auth', 'auth.session', 'verified', 'tenant.access'])->prefix Route::post('/store-gifts', [App\Http\Controllers\Admin\SalesController::class, 'storeWelcomeGift'])->name('store-gifts.store'); Route::patch('/store-gifts/{welcomeGift}', [App\Http\Controllers\Admin\SalesController::class, 'updateWelcomeGift'])->name('store-gifts.update'); Route::delete('/store-gifts/{welcomeGift}', [App\Http\Controllers\Admin\SalesController::class, 'destroyWelcomeGift'])->name('store-gifts.destroy'); - + + // 領藥單（取物單模式 / 領藥模組）— 受權限 menu.sales.pharmacy-pickup 控管 + Route::get('/pharmacy-pickup', [App\Http\Controllers\Admin\PharmacyPickupController::class, 'index'])->name('pharmacy-pickup')->middleware('can:menu.sales.pharmacy-pickup'); + Route::post('/pharmacy-pickup', [App\Http\Controllers\Admin\PharmacyPickupController::class, 'store'])->name('pharmacy-pickup.store')->middleware('can:menu.sales.pharmacy-pickup'); + Route::get('/pharmacy-pickup/{order}/print', [App\Http\Controllers\Admin\PharmacyPickupController::class, 'print'])->name('pharmacy-pickup.print')->middleware('can:menu.sales.pharmacy-pickup'); + Route::post('/pharmacy-pickup/{order}/cancel', [App\Http\Controllers\Admin\PharmacyPickupController::class, 'cancel'])->name('pharmacy-pickup.cancel')->middleware('can:menu.sales.pharmacy-pickup'); + // 詳情路由必須放在最後，避免攔截其他具體路由 Route::get('/{order}', [App\Http\Controllers\Admin\SalesController::class, 'show'])->name('show'); });