diff --git a/app/Http/Controllers/ApprovalController.php b/app/Http/Controllers/ApprovalController.php index 4b75d2be..0bf11120 100644 --- a/app/Http/Controllers/ApprovalController.php +++ b/app/Http/Controllers/ApprovalController.php @@ -117,15 +117,15 @@ public function completed(Request $request): View|Response private function getCardAndAccountData(): array { - $tenantId = session('selected_tenant_id'); + $tenantId = auth()->user()?->tenant_id; $cards = CorporateCard::forTenant($tenantId) ->active() ->select('id', 'card_name', 'card_company', 'card_number', 'card_holder_name') ->get(); - $accounts = BankAccount::where('tenant_id', $tenantId) - ->active() + // BankAccount는 BelongsToTenant 글로벌 스코프가 자동 적용됨 + $accounts = BankAccount::active() ->ordered() ->select('id', 'bank_name', 'account_number', 'account_holder', 'is_primary') ->get(); diff --git a/resources/views/approvals/partials/_expense-form.blade.php b/resources/views/approvals/partials/_expense-form.blade.php index c3e7da45..a5486205 100644 --- a/resources/views/approvals/partials/_expense-form.blade.php +++ b/resources/views/approvals/partials/_expense-form.blade.php @@ -42,7 +42,7 @@ class="text-blue-600 focus:ring-blue-500">
@@ -74,7 +74,7 @@ class="relative border rounded-lg p-3 cursor-pointer transition-all"
@@ -278,6 +278,30 @@ class="border-2 border-dashed rounded-lg p-4 text-center transition-colors curso
+ + {{-- 관리 페이지 안내 모달 --}} +
+
+

+

+ 새 탭에서 등록/관리 페이지를 열고, 완료 후 이 페이지를 새로고침하면 반영됩니다. +

+
+ + + + + + + +
+
+