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

[FEAT] 副櫃系統(格子櫃功能)授權開關

Browse Source 
機台設定-基礎版新增「副櫃系統/格子櫃功能」開關，存 settings.subcabinet_enabled(僅basic)；B014 FunctionSet 新增 Subcabinet 下發給 app 控制副櫃分頁/鎖控板設定顯示；啟用功能摘要列出副櫃系統。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
twsystem1004 2026-06-25 08:09:39 +00:00
parent 16a8ee7986
commit 7ba6d9ebe6
4 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Admin/BasicSettings/MachineSettingController.php
View File

@ -409,6 +409,9 @@ class MachineSettingController extends AdminController
$jsonSettings['pickup_code_enabled'] = false; $jsonSettings['pickup_code_enabled'] = false;
$jsonSettings['pass_code_enabled'] = false; $jsonSettings['pass_code_enabled'] = false;
// 副櫃系統（格子櫃功能）僅基礎版可用，非基礎版一律關閉
$jsonSettings['subcabinet_enabled'] = false;
} else { } else {
$jsonSettings['credit_card_enabled'] = isset($settings['credit_card_enabled']) ? (bool)$settings['credit_card_enabled'] : false; $jsonSettings['credit_card_enabled'] = isset($settings['credit_card_enabled']) ? (bool)$settings['credit_card_enabled'] : false;
$jsonSettings['mobile_pay_enabled'] = isset($settings['mobile_pay_enabled']) ? (bool)$settings['mobile_pay_enabled'] : false; $jsonSettings['mobile_pay_enabled'] = isset($settings['mobile_pay_enabled']) ? (bool)$settings['mobile_pay_enabled'] : false;
@ -432,6 +435,9 @@ class MachineSettingController extends AdminController
$jsonSettings['pickup_code_enabled'] = isset($settings['pickup_code_enabled']) ? (bool)$settings['pickup_code_enabled'] : false; $jsonSettings['pickup_code_enabled'] = isset($settings['pickup_code_enabled']) ? (bool)$settings['pickup_code_enabled'] : false;
$jsonSettings['pass_code_enabled'] = isset($settings['pass_code_enabled']) ? (bool)$settings['pass_code_enabled'] : false; $jsonSettings['pass_code_enabled'] = isset($settings['pass_code_enabled']) ? (bool)$settings['pass_code_enabled'] : false;
// 副櫃系統（格子櫃功能）：基礎版可設定
$jsonSettings['subcabinet_enabled'] = isset($settings['subcabinet_enabled']) ? (bool)$settings['subcabinet_enabled'] : false;
} }
foreach ($allowedFields as $field) { foreach ($allowedFields as $field) {

1
app/Http/Controllers/Api/V1/App/MachineController.php
View File

@ -508,6 +508,7 @@ class MachineController extends Controller
'MemberSystem' => (bool) ($s['member_system_enabled'] ?? false), // 會員系統 'MemberSystem' => (bool) ($s['member_system_enabled'] ?? false), // 會員系統
'AmbientTemp' => (bool) ($s['ambient_temp_monitoring_enabled'] ?? false), // 環境溫度監控 'AmbientTemp' => (bool) ($s['ambient_temp_monitoring_enabled'] ?? false), // 環境溫度監控
'PharmacyPickup' => (bool) ($s['pharmacy_pickup_enabled'] ?? false), // 領藥單(雲端建單，取物單模式下開關) 'PharmacyPickup' => (bool) ($s['pharmacy_pickup_enabled'] ?? false), // 領藥單(雲端建單，取物單模式下開關)
'Subcabinet' => (bool) ($s['subcabinet_enabled'] ?? false), // 副櫃系統(格子櫃功能，基礎版授權開關)
]; ];
// 5-4 ShoppingMode：購物方式（頂層字串） // 5-4 ShoppingMode：購物方式（頂層字串）

21
resources/views/admin/basic-settings/machines/index.blade.php
View File

@ -207,6 +207,9 @@
// 領藥單（取物單模式下的開關） // 領藥單（取物單模式下的開關）
pharmacy_pickup_enabled: settings.pharmacy_pickup_enabled === true || settings.pharmacy_pickup_enabled === 1 || settings.pharmacy_pickup_enabled === '1', pharmacy_pickup_enabled: settings.pharmacy_pickup_enabled === true || settings.pharmacy_pickup_enabled === 1 || settings.pharmacy_pickup_enabled === '1',
// 副櫃系統（格子櫃功能授權，基礎版專用）
subcabinet_enabled: settings.subcabinet_enabled === true || settings.subcabinet_enabled === 1 || settings.subcabinet_enabled === '1',
// 零售附加功能 // 零售附加功能
shopping_cart_enabled: machine.shopping_cart_enabled === true || machine.shopping_cart_enabled === 1 || machine.shopping_cart_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', welcome_gift_enabled: machine.welcome_gift_enabled === true || machine.welcome_gift_enabled === 1 || machine.welcome_gift_enabled === '1',
@ -955,6 +958,24 @@
</label> </label>
</div> </div>
</div> </div>
<!-- 副櫃系統（格子櫃功能授權；機台端據此顯示副櫃分頁/鎖控板設定/貨道管理） -->
<div class="grid grid-cols-1 md:grid-cols-4 gap-4 items-center p-4 rounded-xl bg-slate-50/50 dark:bg-slate-800/50 border border-slate-100 dark:border-slate-700/50 hover:bg-slate-50 dark:hover:bg-slate-800 transition-colors">
<div class="md:col-span-1">
<h4 class="text-sm font-black text-slate-700 dark:text-slate-200">副櫃系統</h4>
</div>
<div class="md:col-span-3 flex flex-wrap gap-x-8 gap-y-4">
<label class="flex items-center gap-3 cursor-pointer group">
<div class="relative inline-flex items-center">
<input type="hidden" name="settings[subcabinet_enabled]" value="0">
<input type="checkbox" name="settings[subcabinet_enabled]" value="1"
x-model="machineSettings.subcabinet_enabled" class="peer sr-only">
<div class="w-9 h-5 bg-slate-200 peer-focus:outline-none rounded-full peer dark:bg-slate-700 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-4 after:w-4 after:transition-all dark:border-gray-600 peer-checked:bg-cyan-500"></div>
</div>
<span class="text-sm font-bold text-slate-600 dark:text-slate-300 group-hover:text-slate-900 dark:group-hover:text-white transition-colors">格子櫃功能</span>
</label>
</div>
</div>
@if(auth()->user()->isSystemAdmin()) @if(auth()->user()->isSystemAdmin())
<!-- 顯示語系（最多 N 種，第一個為預設）。僅系統管理員可設定。 --> <!-- 顯示語系（最多 N 種，第一個為預設）。僅系統管理員可設定。 -->
<div class="p-4 rounded-xl bg-slate-50/50 dark:bg-slate-800/50 border border-slate-100 dark:border-slate-700/50"> <div class="p-4 rounded-xl bg-slate-50/50 dark:bg-slate-800/50 border border-slate-100 dark:border-slate-700/50">

2
resources/views/admin/basic-settings/machines/partials/tab-system-settings.blade.php
View File

@ -175,6 +175,7 @@
if ($machine->shopping_cart_enabled) $activeFeatures[] = __('Shopping Cart'); if ($machine->shopping_cart_enabled) $activeFeatures[] = __('Shopping Cart');
if ($machine->welcome_gift_enabled) $activeFeatures[] = __('Welcome Gift'); if ($machine->welcome_gift_enabled) $activeFeatures[] = __('Welcome Gift');
if ($machine->settings['subcabinet_enabled'] ?? false) $activeFeatures[] = '副櫃系統';
} }
if ($machine->member_system_enabled) $activeFeatures[] = __('Member System'); if ($machine->member_system_enabled) $activeFeatures[] = __('Member System');
@ -321,6 +322,7 @@
if ($machine->shopping_cart_enabled) $activeFeatures[] = __('Shopping Cart'); if ($machine->shopping_cart_enabled) $activeFeatures[] = __('Shopping Cart');
if ($machine->welcome_gift_enabled) $activeFeatures[] = __('Welcome Gift'); if ($machine->welcome_gift_enabled) $activeFeatures[] = __('Welcome Gift');
if ($machine->settings['subcabinet_enabled'] ?? false) $activeFeatures[] = '副櫃系統';
} }
if ($machine->member_system_enabled) $activeFeatures[] = __('Member System'); if ($machine->member_system_enabled) $activeFeatures[] = __('Member System');