From a85f96cc017e0caf37db1534001ba609e198abe0 Mon Sep 17 00:00:00 2001
From: Yuka Higashide <higashide@s-force.co.jp>
Date: Mon, 22 Sep 2025 12:10:03 +0900
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=A6=8F=E5=AE=9A=E6=9C=9F=E5=A5=91?=
 =?UTF-8?q?=E7=B4=84=20=E5=85=88=E7=A5=96=E8=BF=94=E3=82=8A=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RegularContractCreateController.php       | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/RegularContractCreateController.php b/app/Http/Controllers/RegularContractCreateController.php
index f6a408f..cae79ed 100644
--- a/app/Http/Controllers/RegularContractCreateController.php
+++ b/app/Http/Controllers/RegularContractCreateController.php
@@ -16,7 +16,7 @@ use function redirect;
 class RegularContractCreateController extends Controller
 {
     // 新規作成画面表示
-    public function show()
+    public function show(Request $request)
     {
         $user_id = session('user_id');
         if (!$user_id) {
@@ -111,12 +111,24 @@ class RegularContractCreateController extends Controller
             ->get()
             ->groupBy('park_id');
 
-        \Log::info('新規定期契約-駐輪場選択画面にアクセス', [
-            'user_id' => $user_id,
-        ]);
+        // ルート名で画面表示を切り替え（新規定期契約 or 駐輪場検索）
+        $isRegularContract = $request->route()->getName() === 'regular_contract.create';
+
+        // ヘッダーの選択状態を分岐
+        $active_menu = $isRegularContract ? 'SWC-8-1' : 'SWC-10-1';
+
+        if ($isRegularContract) {
+            \Log::info('新規定期契約-駐輪場選択画面にアクセス', [
+                'user_id' => $user_id,
+            ]);
+        } else {
+            \Log::info('駐輪場検索-駐輪場選択画面にアクセス', [
+                'user_id' => $user_id,
+            ]);
+        }
 
         return view('regular_contract.create', [
-            'active_menu' => 'SWC-8-1', // この画面のID
+            'active_menu' => $active_menu, // 画面ID
             'user_name' => $user ? $user->user_name : '', // ユーザー名（ヘッダー用）
             'cities' => $cities,
             'stations' => $stations,
@@ -128,6 +140,7 @@ class RegularContractCreateController extends Controller
             'zones' => $zones,
             'city_grace_periods' => $city_grace_periods,
             'reserve' => $reserve,
+            'isRegularContract' => $isRegularContract
         ]);
     }
 
@@ -636,16 +649,16 @@ class RegularContractCreateController extends Controller
 
         // おもて画像保存（Laravel Storageを使用）
         $front = $request->file('user_idcard');
-        $filename_front = uniqid('photo1_') . '.' . $front->getClientOriginalExtension();   
+        $filename_front = uniqid('photo1_') . '.' . $front->getClientOriginalExtension();
         $front->storeAs('photo', $filename_front, 'public');
-        
+
         // userテーブルに保存（チェック済フラグはSHJ-1処理後に設定）
         $updateData = [
             'photo_filename1' => $filename_front,
             'user_idcard' => $request->idcard_type,
             'updated_at' => now(),
         ];
-        
+
         // ウラ画像がある場合保存し更新項目に追加
         if ($request->hasFile('user_idcard2')) {
             $back = $request->file('user_idcard2');
@@ -654,7 +667,7 @@ class RegularContractCreateController extends Controller
             $updateData['photo_filename2'] = $filename_back;
         }
         DB::table('user')->where('user_id', $user_id)->update($updateData);
-        
+
         // SHJ-1 本人確認自動処理を実行
         $user = DB::table('user')->where('user_id', $user_id)->first();
         $park = DB::table('park')->where('park_id', $request->park_id)->first();
@@ -685,17 +698,12 @@ class RegularContractCreateController extends Controller
                 'user_seq' => $user_seq,
                 'park_id' => $park_id
             ]);
-
-            
-
         } catch (\Exception $e) {
             \Log::error('SHJ-1バッチ処理でエラー発生', [
                 'error' => $e->getMessage(),
                 'user_seq' => $user_seq,
                 'park_id' => $park_id
             ]);
-            
-           
         }
 
         // 処理結果に基づいて遷移
@@ -708,7 +716,6 @@ class RegularContractCreateController extends Controller
             'user_name' => $user->user_name,
             'active_menu' => 'SWC-8-1'
         ]);
-
     }
 
     public function createConfirmNext($contract_id)
@@ -827,9 +834,4 @@ class RegularContractCreateController extends Controller
         // 完了後はウェルネット決済画面（仮）へリダイレクト
         return redirect()->route('wellnet.payment');
     }
-
-
-
-    
-    
 }