From 6ce4c2c8edfad9ed7a37d65c5565fd23d935cfeb Mon Sep 17 00:00:00 2001 From: sky121113 Date: Wed, 24 Jun 2026 14:36:20 +0800 Subject: [PATCH] =?UTF-8?q?[FIX]=20=E8=B2=A8=E9=81=93=E9=8E=96=E5=AE=9A?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=B4=80=E9=8C=84=E9=A1=AF=E7=A4=BA=E8=88=87?= =?UTF-8?q?=E5=A4=9A=E8=AA=9E=E7=B3=BB=E8=A3=9C=E9=BD=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 操作紀錄徽章補上鎖定/解鎖切換顯示，修正僅 is_locked 變動時出現空白「貨道 N:」 2. 補齊鎖定彈窗 4 個語系 key（Sale Status / On Sale / Locked (Sale Paused) / Lock (Pause Sale)）三語系對齊 Co-Authored-By: Claude Opus 4.8 (1M context) --- lang/en.json | 4 ++++ lang/ja.json | 4 ++++ lang/zh_TW.json | 4 ++++ resources/views/admin/remote/stock.blade.php | 8 ++++++++ 4 files changed, 20 insertions(+) diff --git a/lang/en.json b/lang/en.json index d14532b..9124034 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1039,11 +1039,13 @@ "Location found!": "Location found!", "Location not found": "Location not found", "Lock": "Lock", + "Lock (Pause Sale)": "Lock (Pause Sale)", "Lock Now": "Lock Now", "Lock Page": "Lock Page", "Lock Page Lock": "Lock Page Lock", "Lock Page Unlock": "Lock Page Unlock", "Locked": "Locked", + "Locked (Sale Paused)": "Locked (Sale Paused)", "Locked Page": "Locked Page", "Log Details": "Log Details", "Log Time": "Log Time", @@ -1409,6 +1411,7 @@ "Offline Machines": "Offline Machines", "Old": "Old", "Old Value": "Old Value", + "On Sale": "On Sale", "Once": "Once", "Once your account is deleted, all of its resources and data will be permanently deleted. Before deleting your account, please download any data or information that you wish to retain.": "Once your account is deleted, all of its resources and data will be permanently deleted. Before deleting your account, please download any data or information that you wish to retain.", "Once your account is deleted, all of its resources and data will be permanently deleted. Please enter your password to confirm you would like to permanently delete your account.": "Once your account is deleted, all of its resources and data will be permanently deleted. Please enter your password to confirm you would like to permanently delete your account.", @@ -1806,6 +1809,7 @@ "SYSTEM": "SYSTEM", "Safety Stock": "Safety Stock", "Sale Price": "Sale Price", + "Sale Status": "Sale Status", "Sales": "Sales", "Sales Activity": "Sales Activity", "Sales Amount": "Sales Amount", diff --git a/lang/ja.json b/lang/ja.json index befd334..93c00fd 100644 --- a/lang/ja.json +++ b/lang/ja.json @@ -1039,11 +1039,13 @@ "Location found!": "座標を取得しました！", "Location not found": "場所が見つかりません。ランドマーク名（例：花蓮県庁）を使用してみてください", "Lock": "ロック", + "Lock (Pause Sale)": "ロック（販売停止）", "Lock Now": "今すぐロック", "Lock Page": "ページロック", "Lock Page Lock": "機器アプリロック", "Lock Page Unlock": "機器アプリロック解除", "Locked": "ロック中", + "Locked (Sale Paused)": "ロック中（販売停止）", "Locked Page": "ロックページ", "Log Details": "Log Details", "Log Time": "記録時間", @@ -1409,6 +1411,7 @@ "Offline Machines": "オフライン機器", "Old": "Old", "Old Value": "Old Value", + "On Sale": "販売中", "Once": "一回のみ", "Once your account is deleted, all of its resources and data will be permanently deleted. Before deleting your account, please download any data or information that you wish to retain.": "アカウントが削除されると、すべてのリソースとデータは完全に削除されます。アカウントを削除する前に、保持したいデータや情報をダウンロードしてください。", "Once your account is deleted, all of its resources and data will be permanently deleted. Please enter your password to confirm you would like to permanently delete your account.": "アカウントが削除されると、すべてのデータは永久に削除されます。完全に削除することを確認するためにパスワードを入力してください。", @@ -1806,6 +1809,7 @@ "SYSTEM": "システムレベル", "Safety Stock": "安全在庫", "Sale Price": "販売価格", + "Sale Status": "販売状態", "Sales": "販売管理", "Sales Activity": "販売活動", "Sales Amount": "売上金額", diff --git a/lang/zh_TW.json b/lang/zh_TW.json index f4b9749..1ad52e0 100644 --- a/lang/zh_TW.json +++ b/lang/zh_TW.json @@ -1039,11 +1039,13 @@ "Location found!": "已成功獲取座標！", "Location not found": "找不到位置，您可以嘗試使用地標名稱（例如：花蓮縣政府）", "Lock": "鎖定", + "Lock (Pause Sale)": "鎖定（暫停販售）", "Lock Now": "立即鎖定", "Lock Page": "頁面鎖定", "Lock Page Lock": "機台 APP 鎖定", "Lock Page Unlock": "機台 APP 解鎖", "Locked": "尚未解鎖", + "Locked (Sale Paused)": "已鎖定（暫停販售）", "Locked Page": "鎖定頁", "Log Details": "操作紀錄詳情", "Log Time": "記錄時間", @@ -1409,6 +1411,7 @@ "Offline Machines": "離線機台", "Old": "舊值", "Old Value": "舊資料", + "On Sale": "販售中", "Once": "單次使用", "Once your account is deleted, all of its resources and data will be permanently deleted. Before deleting your account, please download any data or information that you wish to retain.": "一旦您的帳號被刪除，其所有資源和數據將被永久刪除。在刪除帳號之前，請下載您希望保留的任何數據或資訊。", "Once your account is deleted, all of its resources and data will be permanently deleted. Please enter your password to confirm you would like to permanently delete your account.": "帳號一旦刪除，所有關連數據將被永久移除。請輸入您的密碼以確認您希望永久刪除此帳號。", @@ -1806,6 +1809,7 @@ "SYSTEM": "系統層級", "Safety Stock": "安全庫存", "Sale Price": "售價", + "Sale Status": "銷售狀態", "Sales": "銷售管理", "Sales Activity": "銷售活動", "Sales Amount": "銷售金額", diff --git a/resources/views/admin/remote/stock.blade.php b/resources/views/admin/remote/stock.blade.php index 3ed8ea3..73afda6 100644 --- a/resources/views/admin/remote/stock.blade.php +++ b/resources/views/admin/remote/stock.blade.php @@ -388,6 +388,14 @@ details += `{{ __('Batch') }} ${p.old.batch_no || 'N/A'} → ${p.new.batch_no || 'N/A'}`; } + // 鎖定/解鎖（暫停販售）切換：old/new 僅 is_locked 不同時，避免顯示空白徽章 + if ((p.old.is_locked ?? false) !== (p.new.is_locked ?? false)) { + if (details !== `{{ __('Slot') }} ${p.slot_no}: `) details += ', '; + details += p.new.is_locked + ? `{{ __('Lock (Pause Sale)') }}` + : `{{ __('Unlock') }}`; + } + return details; } return '';