diff --git a/app/Http/Controllers/InquiryConfirmController.php b/app/Http/Controllers/InquiryConfirmController.php index f5dfd14..9aeface 100644 --- a/app/Http/Controllers/InquiryConfirmController.php +++ b/app/Http/Controllers/InquiryConfirmController.php @@ -23,7 +23,7 @@ class InquiryConfirmController extends Controller public function index() { // 入力画面に遷移 - return view('general.swo7_1',['form_data' => $this->form_data ]); + return view('general.inquiry_input',['form_data' => $this->form_data ]); } // お問い合わせ入力⇒お問い合わせ確認 @@ -50,7 +50,7 @@ class InquiryConfirmController extends Controller // バリデーションチェック $validator = Validator::make($request->all(), $rules, $message); if ($validator->fails()) { - return redirect('swo7_1') + return redirect('inquiry_input') ->withErrors($validator) ->withInput() ->with('before_subject', implode(',', (array) $request->input('subject', []))); @@ -67,7 +67,7 @@ class InquiryConfirmController extends Controller ]; // 確認画面に遷移 - return view('general.swo7_2', ['input_data' => $input_data]); + return view('general.inquiry_confirm', ['input_data' => $input_data]); } // お問い合わせ確認⇒お問い合わせ入力(戻る)orお問い合わせ完了(送信) @@ -75,7 +75,7 @@ class InquiryConfirmController extends Controller { // 前の画面に戻る if($request->input('back') == 'back'){ - return redirect('swo7_1') + return redirect('inquiry_input') ->withInput($request->all()) ->with('before_subject', $request->input('subject')); } @@ -105,6 +105,6 @@ class InquiryConfirmController extends Controller }); // 完了画面に遷移 - return view('general.swo7_3'); + return view('general.inquiry_complete'); } } \ No newline at end of file diff --git a/app/Http/Controllers/LoginController.php b/app/Http/Controllers/LoginController.php index c15f3a1..2246646 100644 --- a/app/Http/Controllers/LoginController.php +++ b/app/Http/Controllers/LoginController.php @@ -17,7 +17,7 @@ class LoginController extends Controller // ID・パスワードチェック $existingMember = User::where('user_primemail', $request->input('login_id'))->where('user_quit_flag', 0)->first(); if (!$existingMember || !CommonFunction::verifyPassword($existingMember->user_seq, $request->input('password'), $existingMember->user_pass)) { - return redirect("{$management_code}/swo8_1") + return redirect("{$management_code}/login") ->withErrors(['login' => 'ID/パスワードが間違っています']) ->withInput(); } diff --git a/app/Http/Controllers/MemberRegistrationController.php b/app/Http/Controllers/MemberRegistrationController.php index b166d22..6a7c15b 100644 --- a/app/Http/Controllers/MemberRegistrationController.php +++ b/app/Http/Controllers/MemberRegistrationController.php @@ -184,7 +184,7 @@ class MemberRegistrationController extends Controller public function complete(Request $request, $management_code) { // 前の画面に戻る - if($request->input('back') == 'back'){ + if($request->input('submit') == 'back'){ return redirect("{$management_code}/member_regist_input_back")->withInput(); } @@ -208,8 +208,8 @@ class MemberRegistrationController extends Controller $user->tag_qr_flag = 1; $user->user_name = $request->input('name'); $user->user_phonetic = $request->input('kana'); - $user->user_homephone = is_array($request->input('phone')) ? implode('-', $request->input('phone')) : $request->input('phone'); - $user->user_mobile = is_array($request->input('mobile')) ? implode('-', $request->input('mobile')) : $request->input('mobile'); + $user->user_homephone = is_array($request->input('phone')) ? implode('-', $request->input('phone')) : null; + $user->user_mobile = is_array($request->input('mobile')) ? implode('-', $request->input('mobile')) : null; $user->user_birthdate = $request->input('birthdate'); $user->user_primemail = session('email'); $user->user_quit_flag = 0; @@ -217,6 +217,9 @@ class MemberRegistrationController extends Controller $user->updated_at = now(); $user->save(); + // セッション削除 + session()->forget('email'); + // 登録完了メール送信 Mail::send(["text" => 'emails.member_regist_complete'], [ 'user_name' => $request->input('name'), @@ -225,9 +228,6 @@ class MemberRegistrationController extends Controller $message->to($user->user_primemail)->subject('【So-Manager】ユーザー登録完了のご連絡'); }); - // セッション削除 - session()->forget('email'); - // 完了画面に遷移 return view('general.member_regist_complete'); } diff --git a/app/Http/Controllers/ParkingSearchController.php b/app/Http/Controllers/ParkingSearchController.php index c09f153..e063b03 100644 --- a/app/Http/Controllers/ParkingSearchController.php +++ b/app/Http/Controllers/ParkingSearchController.php @@ -25,7 +25,7 @@ class ParkingSearchController extends Controller $request->input('conditions_park') ); - return view('general.swo5_1', $result); + return view('general.search', $result); } // 検索処理 diff --git a/app/Http/Controllers/PasswordReminderController.php b/app/Http/Controllers/PasswordReminderController.php index 29038da..7310026 100644 --- a/app/Http/Controllers/PasswordReminderController.php +++ b/app/Http/Controllers/PasswordReminderController.php @@ -30,7 +30,7 @@ class PasswordReminderController extends Controller // バリデーションチェック $validator = Validator::make($request->all(), $rules, $message); if ($validator->fails()) { - return redirect('swo8_2') + return redirect(route('password_reminder', ['management_code' => request()->route('management_code')])) ->withErrors($validator) ->withInput(); } @@ -44,7 +44,7 @@ class PasswordReminderController extends Controller $query->where('user_mobile', $phone)->orWhere('user_homephone', $phone); })->first(); if (!$existingMember) { - return redirect('swo8_2') + return redirect(route('password_reminder', ['management_code' => request()->route('management_code')])) ->withErrors(['nodata' => '該当する会員情報が見つかりませんでした']) ->withInput(); } @@ -66,6 +66,6 @@ class PasswordReminderController extends Controller }); // 完了画面遷移 - return view('general.swo8_3'); + return view('general.password_reminder_complete'); } } \ No newline at end of file diff --git a/resources/views/general/swo10_1.blade.php b/resources/views/general/company.blade.php similarity index 100% rename from resources/views/general/swo10_1.blade.php rename to resources/views/general/company.blade.php diff --git a/resources/views/general/swo15_1.blade.php b/resources/views/general/disclosure_matters.blade.php similarity index 100% rename from resources/views/general/swo15_1.blade.php rename to resources/views/general/disclosure_matters.blade.php diff --git a/resources/views/general/swo6_1.blade.php b/resources/views/general/faq.blade.php similarity index 100% rename from resources/views/general/swo6_1.blade.php rename to resources/views/general/faq.blade.php diff --git a/resources/views/general/swo16_1.blade.php b/resources/views/general/guide.blade.php similarity index 100% rename from resources/views/general/swo16_1.blade.php rename to resources/views/general/guide.blade.php diff --git a/resources/views/general/swo7_3.blade.php b/resources/views/general/inquiry_complete.blade.php similarity index 76% rename from resources/views/general/swo7_3.blade.php rename to resources/views/general/inquiry_complete.blade.php index ebd8953..233bef8 100644 --- a/resources/views/general/swo7_3.blade.php +++ b/resources/views/general/inquiry_complete.blade.php @@ -5,7 +5,7 @@
お問い合わせありがとうございます。送信は正常に完了しました。
- トップページへ戻る>>
以下の内容で間違いがなければ、「送信する」ボタンを押してください。
-