diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index f373518..0051ad9 100644
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -11,9 +11,11 @@
我的會籍/繳費
+ @can('create_finance_documents')
建立財務申請
+ @endcan
@@ -40,6 +42,7 @@
+ @if(Auth::user()->can('create_finance_documents') || Auth::user()->can('view_finance_documents'))
@@ -49,15 +52,21 @@
💼
+ @can('create_finance_documents')
新增申請
+ @endcan
+ @can('view_finance_documents')
查看案件列表
+ @endcan
+ @endif
+ @if(Auth::user()->hasRole(['admin', 'membership_manager']) || Auth::user()->can('view_audit_logs'))
@@ -67,28 +76,35 @@
🛡️
+ @hasrole('admin|membership_manager')
會員管理
+ @endhasrole
+ @role('admin')
角色與權限
審計日誌
+ @endrole
+ @endif
+ @if(Auth::user()->hasRole(['admin', 'finance_cashier', 'payment_cashier', 'finance_accountant', 'payment_accountant', 'finance_chair', 'payment_chair']) || Auth::user()->can('create_finance_documents'))
-
待辦總覽(所有角色可見)
+
待辦總覽
依職責挑選你需要處理的事項。
+ @can('create_finance_documents')
+ @endcan
+ @hasrole('finance_cashier|payment_cashier|admin')
+ @endhasrole
+ @hasrole('finance_accountant|payment_accountant|admin')
會計
📊
@@ -119,6 +139,8 @@
建立交易分錄
+ @endhasrole
+ @hasrole('finance_chair|payment_chair|admin')
理事長/理事
✅
@@ -129,8 +151,10 @@
角色/權限檢視
+ @endhasrole
+ @endif
diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php
index edcc9a4..2067bf1 100644
--- a/resources/views/layouts/navigation.blade.php
+++ b/resources/views/layouts/navigation.blade.php
@@ -24,7 +24,7 @@
{{ __('Documents') }}
- @if(Auth::user())
+ @if(Auth::user() && (Auth::user()->hasRole(['admin', 'membership_manager', 'finance_accountant', 'staff']) || Auth::user()->canAny(['view_finance_documents', 'view_accounting_transactions', 'manage_system_settings'])))
@@ -40,33 +40,47 @@
+ @hasrole('admin|membership_manager')
{{ __('Admin: Members') }}
+ @endhasrole
+ @role('admin')
{{ __('Admin: Roles') }}
+ @endrole
+ @can('view_finance_documents')
{{ __('Admin: Finance') }}
+ @endcan
+ @hasrole('admin|finance_accountant')
{{ __('Admin: Budgets') }}
+ @endhasrole
+ @can('view_accounting_transactions')
{{ __('Admin: Transactions') }}
+ @endcan
{{ __('Admin: Issues') }}
+ @role('admin')
{{ __('Admin: Audit Logs') }}
{{ __('Admin: Document Categories') }}
+ @endrole
+ @hasrole('admin|staff')
{{ __('Admin: Documents') }}
+ @endhasrole
@can('manage_system_settings')
{{ __('Admin: System Settings') }}
@@ -156,39 +170,53 @@
{{ __('Documents') }}
- @if(Auth::user())
+ @if(Auth::user() && (Auth::user()->hasRole(['admin', 'membership_manager', 'finance_accountant', 'staff']) || Auth::user()->canAny(['view_finance_documents', 'view_accounting_transactions', 'manage_system_settings'])))
+ @hasrole('admin|membership_manager')
{{ __('Admin: Members') }}
+ @endhasrole
+ @role('admin')
{{ __('Admin: Roles') }}
+ @endrole
+ @can('view_finance_documents')
{{ __('Admin: Finance') }}
+ @endcan
+ @hasrole('admin|finance_accountant')
{{ __('Admin: Budgets') }}
+ @endhasrole
+ @can('view_accounting_transactions')
{{ __('Admin: Transactions') }}
+ @endcan
{{ __('Admin: Issues') }}
+ @role('admin')
{{ __('Admin: Audit Logs') }}
{{ __('Admin: Document Categories') }}
+ @endrole
+ @hasrole('admin|staff')
{{ __('Admin: Documents') }}
+ @endhasrole
@can('manage_system_settings')
{{ __('Admin: System Settings') }}