From 5c652e6b21b3487aa3de638155ce2f729fb689d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EA=B3=A4?=
 <lightone2017@codebridge-x.com>
Date: Wed, 4 Mar 2026 21:00:28 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20[approval]=20=EA=B3=84=EC=A2=8C=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20tenant=20=EC=A4=91=EB=B3=B5=EC=A1=B0?=
 =?UTF-8?q?=EA=B1=B4=20=EC=A0=9C=EA=B1=B0,=20=EA=B4=80=EB=A6=AC=EB=A7=81?=
 =?UTF-8?q?=ED=81=AC=20=EB=AA=A8=EB=8B=AC=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/ApprovalController.php   |  6 ++--
 .../partials/_expense-form.blade.php          | 35 +++++++++++++++++--
 2 files changed, 36 insertions(+), 5 deletions(-)

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">
             <template x-if="cards.length === 0">
                 <div class="text-sm text-gray-500 text-center py-4">
                     등록된 법인카드가 없습니다.
-                    <a href="{{ route('finance.corporate-cards') }}" class="text-blue-600 hover:underline ml-1">카드 관리</a>
+                    <button type="button" @click="showManageModal('카드 관리', '{{ route('finance.corporate-cards') }}')" class="text-blue-600 hover:underline ml-1">카드 관리</button>
                 </div>
             </template>
             <div class="flex flex-wrap gap-3" x-show="cards.length > 0">
@@ -74,7 +74,7 @@ class="relative border rounded-lg p-3 cursor-pointer transition-all"
             <template x-if="accounts.length === 0">
                 <div class="text-sm text-gray-500 text-center py-4">
                     등록된 계좌가 없습니다.
-                    <a href="{{ route('finance.accounts.index') }}" class="text-blue-600 hover:underline ml-1">계좌 관리</a>
+                    <button type="button" @click="showManageModal('계좌 관리', '{{ route('finance.accounts.index') }}')" class="text-blue-600 hover:underline ml-1">계좌 관리</button>
                 </div>
             </template>
             <div class="flex flex-wrap gap-3" x-show="accounts.length > 0">
@@ -278,6 +278,30 @@ class="border-2 border-dashed rounded-lg p-4 text-center transition-colors curso
             </template>
         </div>
     </div>
+
+    {{-- 관리 페이지 안내 모달 --}}
+    <div x-show="manageModal.open" x-transition:enter="transition ease-out duration-200" x-transition:enter-start="opacity-0" x-transition:enter-end="opacity-100"
+         class="fixed inset-0 z-50 flex items-center justify-center bg-black/40" @click.self="manageModal.open = false">
+        <div class="bg-white rounded-xl shadow-xl p-6" style="width: 400px; max-width: 90vw;">
+            <h3 class="text-lg font-semibold text-gray-800 mb-2" x-text="manageModal.title"></h3>
+            <p class="text-sm text-gray-600 mb-4">
+                새 탭에서 등록/관리 페이지를 열고, 완료 후 이 페이지를 <strong>새로고침</strong>하면 반영됩니다.
+            </p>
+            <div class="flex gap-2 justify-end">
+                <button type="button" @click="manageModal.open = false"
+                        class="px-4 py-2 text-sm text-gray-600 bg-gray-100 hover:bg-gray-200 rounded-lg transition">
+                    닫기
+                </button>
+                <a :href="manageModal.url" target="_blank" @click="manageModal.open = false"
+                   class="px-4 py-2 text-sm text-white bg-blue-600 hover:bg-blue-700 rounded-lg transition inline-flex items-center gap-1">
+                    <span x-text="manageModal.title"></span>
+                    <svg class="w-3.5 h-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14"/>
+                    </svg>
+                </a>
+            </div>
+        </div>
+    </div>
 </div>
 
 <script>
@@ -329,6 +353,9 @@ function makeItem(data) {
             selected_account: initialData?.selected_account || null,
         },
 
+        // 관리 페이지 모달
+        manageModal: { open: false, title: '', url: '' },
+
         // 파일 업로드 상태
         isDragging: false,
         fileUploading: false,
@@ -379,6 +406,10 @@ function makeItem(data) {
             }
         },
 
+        showManageModal(title, url) {
+            this.manageModal = { open: true, title, url };
+        },
+
         formatMoney(value) {
             const num = parseInt(value) || 0;
             return num === 0 ? '0' : num.toLocaleString('ko-KR');