Merge pull request '新規定期契約 先祖返り部分修正' (#26) from main_higashide into main

Reviewed-on: #26

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('新規定期契約-駐輪場選択画面にアクセス', [
+        // ルート名で画面表示を切り替え（新規定期契約 or 駐輪場検索）
-            'user_id' => $user_id,
+        $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
         ]);
     }
 
@@ -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');
     }
-
-
-
-    
-    
 }