+
+
-
{{ __('TapPay Integration') }}
-
{{ __('TapPay Integration Settings Description') }}
+
{{ __('TapPay Integration') }}
+
diff --git a/resources/views/admin/basic-settings/payment-configs/index.blade.php b/resources/views/admin/basic-settings/payment-configs/index.blade.php
index 1a49648..6bb98c5 100644
--- a/resources/views/admin/basic-settings/payment-configs/index.blade.php
+++ b/resources/views/admin/basic-settings/payment-configs/index.blade.php
@@ -1,12 +1,19 @@
@extends('layouts.admin')
@section('content')
-
+
{{ __('Payment Configuration') }}
-
{{ __('Merchant payment gateway settings management') }}
+
{{ __('Merchant payment gateway settings management') }}
+
+
+
@endsection
diff --git a/resources/views/admin/companies/index.blade.php b/resources/views/admin/companies/index.blade.php
index de6137c..938b71f 100644
--- a/resources/views/admin/companies/index.blade.php
+++ b/resources/views/admin/companies/index.blade.php
@@ -25,7 +25,9 @@
this.editing = true;
this.currentCompany = { ...company };
this.showModal = true;
- }
+ },
+ isDeleteConfirmOpen: false,
+ deleteFormAction: ''
}">
@@ -180,20 +182,15 @@
d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10" />
-
+
@@ -331,7 +328,7 @@
+
+
@endsection
\ No newline at end of file
diff --git a/resources/views/admin/data-config/accounts.blade.php b/resources/views/admin/data-config/accounts.blade.php
index 4c89cf4..f9ef3c7 100644
--- a/resources/views/admin/data-config/accounts.blade.php
+++ b/resources/views/admin/data-config/accounts.blade.php
@@ -20,6 +20,12 @@
role: '{{ old('role', '') }}',
status: {{ old('status', 1) }}
},
+ isDeleteConfirmOpen: false,
+ deleteFormAction: '',
+ confirmDelete(action) {
+ this.deleteFormAction = action;
+ this.isDeleteConfirmOpen = true;
+ },
get filteredRoles() {
if (this.currentUser.company_id === '' || this.currentUser.company_id === null) {
// 系統層級:顯示 is_system = 1 的角色
@@ -28,9 +34,9 @@
// 客戶層級:只顯示該公司的角色
let roles = this.allRoles.filter(r => r.company_id == this.currentUser.company_id);
- // 如果是系統管理員,額外允許選擇「客戶層級範本」
+ // 如果是系統管理員,額外允許選擇「系統層級的角色範本」(排除 super-admin 以免誤派)
@if(auth()->user()->isSystemAdmin())
- let templates = this.allRoles.filter(r => !r.is_system && (r.company_id === null || r.company_id === ''));
+ let templates = this.allRoles.filter(r => (r.company_id === null || r.company_id === '') && r.name !== 'super-admin');
roles = [...roles, ...templates];
@endif
@@ -59,7 +65,7 @@
}
}">
-
+
{{ $title }}
@@ -176,22 +182,20 @@
d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10" />
-
+
@else
{{ __('Protected') }}
@endif
@@ -345,6 +349,8 @@
-
+
+
+
@endsection
diff --git a/resources/views/admin/deposit-bonus-rules/index.blade.php b/resources/views/admin/deposit-bonus-rules/index.blade.php
index b9b4d59..6f4f366 100644
--- a/resources/views/admin/deposit-bonus-rules/index.blade.php
+++ b/resources/views/admin/deposit-bonus-rules/index.blade.php
@@ -4,27 +4,9 @@
@php
@endphp
-{{-- Toast 通知 --}}
-@if(session('success'))
-
-
- {{ session('success') }}
-
-@endif
-
+
+
儲值回饋設定
+
@endsection
diff --git a/resources/views/admin/gift-definitions/index.blade.php b/resources/views/admin/gift-definitions/index.blade.php
index 64713f7..122eb8d 100644
--- a/resources/views/admin/gift-definitions/index.blade.php
+++ b/resources/views/admin/gift-definitions/index.blade.php
@@ -19,27 +19,9 @@
];
@endphp
-{{-- Toast 通知 --}}
-@if(session('success'))
-
-
- {{ session('success') }}
-
-@endif
-
+
+
禮品設定
@@ -76,11 +58,7 @@
@endif
-
+ 刪除
|
@empty
@@ -154,5 +132,6 @@
+
@endsection
diff --git a/resources/views/admin/membership-tiers/index.blade.php b/resources/views/admin/membership-tiers/index.blade.php
index 5118ee6..10bbeed 100644
--- a/resources/views/admin/membership-tiers/index.blade.php
+++ b/resources/views/admin/membership-tiers/index.blade.php
@@ -4,27 +4,9 @@
@php
@endphp
-{{-- Toast 通知 --}}
-@if(session('success'))
-
-
- {{ session('success') }}
-
-@endif
-
+
+
會員等級設定
@@ -57,11 +39,7 @@
@endif
-
+ 刪除
|
@empty
@@ -116,5 +94,6 @@
+
@endsection
diff --git a/resources/views/admin/permission/roles.blade.php b/resources/views/admin/permission/roles.blade.php
index aeba1fb..1832d9b 100644
--- a/resources/views/admin/permission/roles.blade.php
+++ b/resources/views/admin/permission/roles.blade.php
@@ -12,6 +12,7 @@
roleId: '{{ old('roleId', '') }}',
roleName: '{{ old('name', '') }}',
rolePermissions: @js(old('permissions', [])),
+ currentUserRoleIds: @js($currentUserRoleIds ?? []),
isSystem: {{ old('is_system', '0') }},
modalTitle: '{{ $errors->any() && old('_method') == 'PUT' ? __('Edit Role') : ($errors->any() ? __('Create Role') : __('Create Role')) }}',
openModal(edit = false, id = '', name = '', permissions = [], isSys = false) {
@@ -22,6 +23,18 @@
this.isSystem = isSys;
this.modalTitle = edit ? '{{ __('Edit Role') }}' : '{{ __('Create Role') }}';
this.showModal = true;
+ },
+ isWarningModalOpen: false,
+ deleteWarningMsg: '',
+ triggerDeleteWarning(msg) {
+ this.deleteWarningMsg = msg;
+ this.isWarningModalOpen = true;
+ },
+ isDeleteConfirmOpen: false,
+ deleteFormAction: '',
+ confirmDelete(action) {
+ this.deleteFormAction = action;
+ this.isDeleteConfirmOpen = true;
}
}">
@@ -36,18 +49,34 @@