diff --git a/app/Http/Controllers/Admin/InformationController.php b/app/Http/Controllers/Admin/InformationController.php new file mode 100644 index 0000000..432689d --- /dev/null +++ b/app/Http/Controllers/Admin/InformationController.php @@ -0,0 +1,44 @@ +input('period', 'month'); // デフォルト: 最新1ヵ月 + + $query = DB::table('bat_job_log') + ->leftJoin('device', 'bat_job_log.device_id', '=', 'device.device_id') + ->select( + 'bat_job_log.job_log_id', + 'bat_job_log.process_name', + 'bat_job_log.job_name', + 'bat_job_log.device_id', + 'device.park_id', + 'bat_job_log.status_comment', + 'bat_job_log.status', + 'bat_job_log.status_comment as comment', + 'bat_job_log.created_at', + 'bat_job_log.updated_at' + ); + + // 期間フィルター + if ($period === 'month') { + $query->where('bat_job_log.updated_at', '>=', now()->subMonth()); + } + // 'all'の場合はフィルターなし + + $jobs = $query->orderByDesc('bat_job_log.job_log_id')->limit(50)->get(); + + return view('admin.information.list', [ + 'jobs' => $jobs, + 'period' => $period, + ]); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Admin/OpesController.php b/app/Http/Controllers/Admin/OpesController.php new file mode 100644 index 0000000..f9e182b --- /dev/null +++ b/app/Http/Controllers/Admin/OpesController.php @@ -0,0 +1,230 @@ +filled('user_id')) { + $query->where('user_id', $request->input('user_id')); + } + + $users = $query->paginate(20); + + return view('admin.personal.list', [ + 'users' => $users, + 'request' => $request, + ]); + } + + /** + * 本人確認手動処理 編集画面 + */ + public function edit(Request $request, $id) + { + // 利用者情報取得 + $user = User::where('user_id', $id)->firstOrFail(); + + // 利用者分類マスタ取得(ラジオボタン用) + $usertypes = Usertype::orderBy('sort_order')->get(); + + // POST時の処理 + if ($request->isMethod('post')) { + // 利用者分類IDの更新 + $user->user_categoryid = $request->input('user_categoryid', $user->user_categoryid); + + // 本人確認チェックOK/NG + if ($request->input('check') === 'ok') { + $user->user_idcard_chk_flag = 1; + } elseif ($request->input('check') === 'ng') { + $user->user_idcard_chk_flag = 0; + // 備考欄も更新(NG理由) + $user->user_remarks = $request->input('user_remarks', $user->user_remarks); + } + + $user->save(); + + return redirect()->route('personal')->with('success', '更新しました'); + } + + return view('admin.personal.edit', [ + 'user' => $user, + 'usertypes' => $usertypes, + ]); + } +} + +class OpesController extends Controller +{ + /** + * オペレータ一覧画面 + */ + public function list(Request $request) + { + $sort = $request->input('sort', 'ope_id'); // デフォルト値を設定 + $sort_type = $request->input('sort_type', 'asc'); // デフォルト値を設定 + + $query = Ope::query(); + + // 並び替え + $query->orderBy($sort, $sort_type); + + $list = $query->paginate(20); + + return view('admin.opes.list', [ + 'list' => $list, + 'sort' => $sort, + 'sort_type' => $sort_type, + 'request' => $request, + ]); + } + + /** + * オペレータ編集画面 + */ + public function edit(Request $request, $id) + { + $ope = \App\Models\Ope::findOrFail($id); + + if ($request->isMethod('post')) { + // バリデーション&更新処理 + // ... + } + + // 各項目を配列で渡す + return view('admin.opes.edit', [ + 'ope_id' => $ope->ope_id, + 'ope_name' => $ope->ope_name, + 'login_id' => $ope->login_id, + 'ope_pass' => '', // パスワードは空で + 'ope_belong' => $ope->ope_belong, + 'ope_type' => $ope->ope_type, + 'ope_mail' => $ope->ope_mail, + 'ope_phone' => $ope->ope_phone, + 'ope_sendalart_que1' => $ope->ope_sendalart_que1, + 'ope_sendalart_que2' => $ope->ope_sendalart_que2, + 'ope_sendalart_que3' => $ope->ope_sendalart_que3, + 'ope_sendalart_que4' => $ope->ope_sendalart_que4, + 'ope_sendalart_que5' => $ope->ope_sendalart_que5, + 'ope_sendalart_que6' => $ope->ope_sendalart_que6, + 'ope_sendalart_que7' => $ope->ope_sendalart_que7, + 'ope_sendalart_que8' => $ope->ope_sendalart_que8, + 'ope_sendalart_que9' => $ope->ope_sendalart_que9, + 'ope_sendalart_que10' => $ope->ope_sendalart_que10, + 'ope_sendalart_que11' => $ope->ope_sendalart_que11, + 'ope_sendalart_que12' => $ope->ope_sendalart_que12, + 'ope_sendalart_que13' => $ope->ope_sendalart_que13, + 'ope_auth1' => $ope->ope_auth1, + 'ope_auth2' => $ope->ope_auth2, + 'ope_auth3' => $ope->ope_auth3, + 'ope_auth4' => $ope->ope_auth4, + 'ope_quit_flag' => $ope->ope_quit_flag, + 'ope_quitday' => $ope->ope_quitday, + ]); + } + + /** + * オペレータ一覧のエクスポート + */ + public function export(Request $request) + { + $filename = 'ope_export_' . date('Ymd_His') . '.csv'; + $columns = [ + 'ope_id', 'ope_belong', 'login_id', 'ope_name', 'ope_pass', 'ope_type', 'ope_mail', 'ope_phone', + 'ope_sendalart_que1', 'ope_sendalart_que2', 'ope_sendalart_que3', 'ope_sendalart_que4', 'ope_sendalart_que5', + 'ope_sendalart_que6', 'ope_sendalart_que7', 'ope_sendalart_que8', 'ope_sendalart_que9', 'ope_sendalart_que10', + 'ope_sendalart_que11', 'ope_sendalart_que12', 'ope_sendalart_que13', + 'ope_auth1', 'ope_auth2', 'ope_auth3', 'ope_auth4', + 'ope_quit_flag', 'ope_quitday', 'created_at', 'updated_at' + ]; + + $ids = $request->input('pk', []); + if (!empty($ids)) { + $list = \App\Models\Ope::whereIn('ope_id', $ids)->select($columns)->get(); + } else { + $list = \App\Models\Ope::select($columns)->get(); + } + + $callback = function() use ($list, $columns) { + $file = fopen('php://output', 'w'); + // ヘッダー + fputcsv($file, $columns); + + foreach ($list as $row) { + $data = []; + foreach ($columns as $col) { + $data[] = $row->$col; + } + fputcsv($file, $data); + } + fclose($file); + }; + + return response()->stream($callback, 200, [ + "Content-Type" => "text/csv", + "Content-Disposition" => "attachment; filename={$filename}", + ]); + } + + /** + * オペレータの削除 + */ + public function delete(Request $request) + { + // チェックされたIDの配列を受け取る想定 + $ids = $request->input('pk', []); + if (!empty($ids)) { + \App\Models\Ope::whereIn('ope_id', $ids)->delete(); + return redirect()->route('opes')->with('success', '削除しました'); + } + return redirect()->route('opes')->with('error', '削除対象が選択されていません'); + } + + /** + * オペレータの追加 + */ + public function add(Request $request) + { + if ($request->isMethod('post')) { + $validated = $request->validate([ + 'ope_name' => 'required|string|max:255', + 'login_id' => 'required|string|max:255|unique:ope,login_id', + 'password' => 'required|string|min:6|confirmed', + 'ope_type' => 'required', + 'ope_mail' => 'required|email', + ]); + $ope = new \App\Models\Ope(); + $ope->ope_name = $request->ope_name; + $ope->login_id = $request->login_id; + $ope->ope_pass = bcrypt($request->password); + $ope->ope_type = $request->ope_type; + $ope->ope_mail = $request->ope_mail; + $ope->ope_phone = $request->ope_phone; + for ($i = 1; $i <= 13; $i++) { + $field = "ope_sendalart_que{$i}"; + $ope->$field = $request->$field ?? 0; + } + for ($i = 1; $i <= 4; $i++) { + $field = "ope_auth{$i}"; + $ope->$field = $request->$field ?? ''; + } + $ope->ope_quit_flag = $request->ope_quit_flag ?? 0; + $ope->ope_quitday = $request->ope_quitday ?? null; + $ope->save(); + return redirect()->route('opes')->with('success', '登録しました'); + } + return view('admin.opes.add'); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Admin/PersonalController.php b/app/Http/Controllers/Admin/PersonalController.php new file mode 100644 index 0000000..72641d5 --- /dev/null +++ b/app/Http/Controllers/Admin/PersonalController.php @@ -0,0 +1,66 @@ +filled('user_id')) { + $query->where('user_id', $request->input('user_id')); + } + + $users = $query->paginate(20); + + return view('admin.personal.list', [ + 'users' => $users, + 'request' => $request, + ]); + } + + /** + * 本人確認手動処理 編集画面 + */ + public function edit(Request $request, $id) + { + // 利用者情報取得 + $user = User::where('user_id', $id)->firstOrFail(); + + // 利用者分類マスタ取得(ラジオボタン用) + $usertypes = Usertype::orderBy('sort_order')->get(); + + // POST時の処理 + if ($request->isMethod('post')) { + // 利用者分類IDの更新 + $user->user_categoryid = $request->input('user_categoryid', $user->user_categoryid); + + // 本人確認チェックOK/NG + if ($request->input('check') === 'ok') { + $user->user_idcard_chk_flag = 1; + } elseif ($request->input('check') === 'ng') { + $user->user_idcard_chk_flag = 0; + // 備考欄も更新(NG理由) + $user->user_remarks = $request->input('user_remarks', $user->user_remarks); + } + + $user->save(); + + return redirect()->route('personal')->with('success', '更新しました'); + } + + return view('admin.personal.edit', [ + 'user' => $user, + 'usertypes' => $usertypes, + ]); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Admin/SealsController.php b/app/Http/Controllers/Admin/SealsController.php new file mode 100644 index 0000000..43a770c --- /dev/null +++ b/app/Http/Controllers/Admin/SealsController.php @@ -0,0 +1,28 @@ +input('sort', 'seal_issueid'); + $sort_type = $request->input('sort_type', 'desc'); + + // sealテーブルを参照し、ソート + $list = DB::table('seal') + ->orderBy($sort, $sort_type) + ->paginate(20); + + return view('admin.seals.list', [ + 'list' => $list, + 'sort' => $sort, + 'sort_type' => $sort_type, + ]); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Admin/TagissueController.php b/app/Http/Controllers/Admin/TagissueController.php new file mode 100644 index 0000000..6f1cbca --- /dev/null +++ b/app/Http/Controllers/Admin/TagissueController.php @@ -0,0 +1,41 @@ +select( + 'user_seq', + 'user_tag_serial', + 'user_tag_serial_64', + 'user_tag_issue', + 'user_name', + 'user_mobile', + 'user_homephone', + 'user_regident_zip', + 'user_regident_pre', + 'user_regident_city', + 'user_regident_add' + ) + ->orderByDesc('user_seq'); + + // 必要に応じてフィルタ追加 + // if ($request->filled('user_tag_issue')) { + // $query->where('user_tag_issue', $request->input('user_tag_issue')); + // } + + $users = $query->paginate(20); + + return view('admin.tag_issue.list', [ + 'users' => $users, + ]); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php new file mode 100644 index 0000000..c764940 --- /dev/null +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -0,0 +1,61 @@ +validate([ + 'email' => 'required|email', + 'email_confirmation' => 'required|email|same:email', + ], [ + 'email.required' => 'メールアドレスを入力してください。', + 'email.email' => '正しいメールアドレス形式で入力してください。', + 'email_confirmation.required' => '確認用メールアドレスを入力してください。', + 'email_confirmation.email' => '正しいメールアドレス形式で入力してください。', + 'email_confirmation.same' => 'メールアドレスが一致しません。', + ]); + + // ope_mailでユーザーを検索 + $user = \App\Models\Ope::where('ope_mail', $request->input('email'))->first(); + + if (!$user) { + return back()->withErrors(['email' => '該当するユーザーが見つかりません。']); + } + + // トークン生成 + $token = Str::random(60); + + // トークン保存(既存レコードがあれば更新) + DB::table('password_reset_tokens')->updateOrInsert( + ['ope_mail' => $user->ope_mail], + [ + 'token' => $token, + 'created_at' => now(), + ] + ); + + // メール送信 + $resetUrl = url('/reset-password?token=' . $token . '&email=' . urlencode($user->ope_mail)); + Mail::raw("下記URLからパスワード再設定を行ってください。\n\n{$resetUrl}", function ($message) use ($user) { + $message->to($user->ope_mail) + ->subject('パスワード再設定のご案内'); + }); + + return back()->with('status', 'パスワード再設定メールを送信しました。'); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php new file mode 100644 index 0000000..6e1a896 --- /dev/null +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -0,0 +1,51 @@ +query('token'); + $email = $request->query('email'); + return view('auth.reset-password', compact('token', 'email')); + } + + public function reset(Request $request) + { + $request->validate([ + 'email' => 'required|email', + 'token' => 'required', + 'password' => 'required|confirmed|min:8', + ]); + + // トークンチェック + $record = DB::table('password_reset_tokens') + ->where('ope_mail', $request->email) + ->where('token', $request->token) + ->first(); + + if (!$record) { + return back()->withErrors(['email' => '無効なトークンまたはメールアドレスです。']); + } + + // パスワード更新 + $user = Ope::where('ope_mail', $request->email)->first(); + if (!$user) { + return back()->withErrors(['email' => 'ユーザーが見つかりません。']); + } + $user->password = Hash::make($request->password); + $user->save(); + + // トークン削除 + DB::table('password_reset_tokens')->where('ope_mail', $request->email)->delete(); + + return redirect()->route('login')->with('status', 'パスワードを再設定しました。'); + } +} \ No newline at end of file diff --git a/resources/views/admin/information/list.blade.php b/resources/views/admin/information/list.blade.php new file mode 100644 index 0000000..8264b6e --- /dev/null +++ b/resources/views/admin/information/list.blade.php @@ -0,0 +1,228 @@ +@extends('layouts.app') +@section('title', '常時表示インフォメーション') + +@section('content') +
+
+
+

{{__('常時表示インフォメーション')}}

+
+ +
+ + +
+
+
絞り込み
+ +
+
表示期間フィルター
+ +
+ +
+
種別フィルター
+ +
+ + + +
+
ステータス変更
+
+ +
+
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + @foreach($jobs as $job) + + + + + + + + + + + + + + + + @endforeach + +
キューIDキュー種別利用者定期契約ID駐輪場キューコメントキューステータスコメント登録日時更新日時更新オペレータリンク
{{ $job->job_log_id }}{{ $job->process_name }}{{ $job->job_name }}{{ $job->device_id }}{{ $job->park_id }}{{ $job->status_comment }}{{ $job->status }}{{ $job->comment }}{{ $job->created_at }}{{ $job->updated_at }}-詳細
+
+
+ +@push('scripts') + +@endpush +@endsection \ No newline at end of file diff --git a/resources/views/admin/opes/_form.blade.php b/resources/views/admin/opes/_form.blade.php index 5b8a564..efdcbf1 100644 --- a/resources/views/admin/opes/_form.blade.php +++ b/resources/views/admin/opes/_form.blade.php @@ -1,523 +1,167 @@ -@if(Session::has('success')) - -@elseif(Session::has('error')) -
- -

{{__('誤差')}}:

- {!! Session::get('error') !!} -
-@elseif(isset($errorMsg)) -
- -

{{__('誤差')}}:

- {!! $errorMsg !!} -
-@endif -
- @if($isInfo) - {{__('登録')}} - {{__('編集')}} - @else - - @endIf -
- @if($isInfo || $isEdit) - + + @if(isset($ope_id))
- +
-
- -
+
- @endif + @endif +
- +
-
- -
+
- - @if(!$isInfo) -
- -
-
-
- -
-
-
- -
-
-
- -
-
- @endif - - +
- +
-
- -
+ +
+ + +
+ +
+
+ +
+ + +
+ +
+
+ +
+ + +
+ +
+
+
-
- +
-
- -
+
-
-
- -
-
- - - -
- -
-
-
-
- - -
-
- - -
-
-
- - - -
- -
-
-
-
- - -
-
- - -
-
-
- - - -
- -
-
-
-
- - -
-
- - -
-
-
- - - -
- -
-
-
-
- - -
-
- - -
-
-
- - - -
- -
-
-
-
- - -
-
- - -
-
-
- - - -
- -
-
-
-
- - -
-
- - -
-
-
- - - -
- -
-
-
-
- - -
-
- - -
-
-
- - - -
- -
-
-
-
- - -
-
- - -
-
+
- -
- -
-
-
-
- - -
-
- - -
+ + @for($i=1;$i<=13;$i++) + @if($i == 1 || ($i-1)%3 == 0) +
+ @endif +
+
-
+
+ + +
+
+ + +
+ @endfor - -
- -
-
-
-
- - -
-
- - -
+ + @foreach([1=>'管理者権限付与',2=>'エリアマネージャー権限付与',3=>'エリアオペレーター権限付与',4=>'オペレーター権限付与'] as $n=>$label) + @if($n == 1 || $n == 3) +
+ @endif +
+
-
- - -
- -
-
-
-
- - -
-
- - -
+
+ +
-
- - -
- -
-
-
-
- - -
-
- - -
+
+ +
-
- - -
- -
-
-
-
- - -
-
- - -
-
-
- - -
- -
-
-
-
- - -
-
- - -
-
-
- - -
- -
-
-
-
- - -
-
- - -
-
-
- - -
- -
-
-
-
- - -
-
- - -
-
-
- - -
- -
-
-
-
- - -
-
- - -
-
-
+ @endforeach
-
-
-
- - -
-
- - -
-
+
+ + +
+
+ +
-
-
- -
+
-
- @if($isInfo) - {{__('登録')}} - {{__('編集')}} - @else - - @endIf +
+ @if($isInfo) + {{__('登録')}} + {{__('編集')}} + @else + + @if(isset($isEdit) && $isEdit) + + @endif + @endif +
diff --git a/resources/views/admin/opes/add.blade.php b/resources/views/admin/opes/add.blade.php index 24fa5eb..ce687a6 100644 --- a/resources/views/admin/opes/add.blade.php +++ b/resources/views/admin/opes/add.blade.php @@ -1,53 +1,51 @@ - @extends('layouts.app') @section('title', '[東京都|〇〇駐輪場] オペレータマスタ') @section('content') - -
-
-
-
-

[東京都|〇〇駐輪場] オペレータマスタ

-
-
- -
-
-
-
- - - -
-
- - -
-
-
-
- - - - @include('admin.opes._form',['isEdit'=>0,'isInfo'=>0]) -
-
-
-
- -
- - - -
+
+
+ @if ($errors->any()) +
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
  • + @endforeach +
-
- - + @endif +
+ @csrf + @include('admin.opes._form', [ + 'isEdit' => 0, + 'isInfo' => 0, + // 必要な初期値を空で渡す + 'ope_name' => '', + 'login_id' => '', + 'ope_pass' => '', + 'ope_belong' => '', + 'ope_type' => '', + 'ope_mail' => '', + 'ope_phone' => '', + 'ope_sendalart_que1' => '', + 'ope_sendalart_que2' => '', + 'ope_sendalart_que3' => '', + 'ope_sendalart_que4' => '', + 'ope_sendalart_que5' => '', + 'ope_sendalart_que6' => '', + 'ope_sendalart_que7' => '', + 'ope_sendalart_que8' => '', + 'ope_sendalart_que9' => '', + 'ope_sendalart_que10' => '', + 'ope_sendalart_que11' => '', + 'ope_sendalart_que12' => '', + 'ope_sendalart_que13' => '', + 'ope_auth1' => '', + 'ope_auth2' => '', + 'ope_auth3' => '', + 'ope_auth4' => '', + 'ope_quit_flag' => '', + 'ope_quitday' => '', + ]) +
+
@endsection diff --git a/resources/views/admin/opes/edit.blade.php b/resources/views/admin/opes/edit.blade.php index d674d1d..20d9781 100644 --- a/resources/views/admin/opes/edit.blade.php +++ b/resources/views/admin/opes/edit.blade.php @@ -14,8 +14,7 @@
@@ -40,12 +39,6 @@
- -
- - - -
diff --git a/resources/views/admin/opes/info.blade.php b/resources/views/admin/opes/info.blade.php index bafc1b1..ed54b95 100644 --- a/resources/views/admin/opes/info.blade.php +++ b/resources/views/admin/opes/info.blade.php @@ -14,8 +14,7 @@ @@ -40,12 +39,6 @@ - -
- - - -
diff --git a/resources/views/admin/opes/list.blade.php b/resources/views/admin/opes/list.blade.php index 686d2fa..aceafa4 100644 --- a/resources/views/admin/opes/list.blade.php +++ b/resources/views/admin/opes/list.blade.php @@ -1,322 +1,132 @@ @extends('layouts.app') @section('title', '[東京都|〇〇駐輪場] オペレータマスタ') + @section('content') -
-
-
-
-

{{__('オペレータマスタ')}}

-
-
- -
-
-
-
- - - -
-
- - - -
-
- - - -
- -
- - - - {{ $list->appends(['sort' => $sort,'sort_type'=>$sort_type])->links('pagination') }} -
-
- @if(Session::has('success')) - - @elseif(Session::has('error')) -
- -

{{__('誤差')}}:

- {!! Session::get('error') !!} -
- @elseif(isset($errorMsg)) -
- -

{{__('誤差')}}:

- {!! $errorMsg !!} -
- @endif -
-
-
-
- - - - - - - - - @foreach($list as $item) - - - - - @endforeach - -
- -
- -
- {{--詳細--}} - {{__('編集')}} -
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @foreach($list as $item) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @endforeach - -
{{__('validation.attributes.ope_id')}} - {{__('validation.attributes.ope_name')}} - {{__('validation.attributes.password')}}{{__('validation.attributes.ope_type')}} - {{__('validation.attributes.ope_mail')}} - {{__('validation.attributes.ope_phone')}} - - {{__('validation.attributes.ope_sendalart_que1')}} - - {{__('validation.attributes.ope_sendalart_que2')}} - - {{__('validation.attributes.ope_sendalart_que3')}} - - {{__('validation.attributes.ope_sendalart_que4')}} - - {{__('validation.attributes.ope_sendalart_que5')}} - - {{__('validation.attributes.ope_sendalart_que6')}} - - {{__('validation.attributes.ope_sendalart_que7')}} - - {{__('validation.attributes.ope_sendalart_que8')}} - - {{__('validation.attributes.ope_sendalart_que9')}} - - {{__('validation.attributes.ope_sendalart_que10')}} - - {{__('validation.attributes.ope_sendalart_que11')}} - - {{__('validation.attributes.ope_sendalart_que12')}} - - {{__('validation.attributes.ope_sendalart_que13')}} - - {{__('validation.attributes.ope_auth1')}} - - {{__('validation.attributes.ope_auth1')}} - - {{__('validation.attributes.ope_auth1')}} - - {{__('validation.attributes.ope_auth1')}} - {{__('validation.attributes.ope_quit_flag')}} - {{__('validation.attributes.ope_quitday')}} -
{{mb_substr($item->ope_id, 0, 10)}} - {{mb_substr($item->ope_name, 0, 10)}} - {{mb_substr($item->ope_pass, 0, 10)}} - {{__(\App\Ope::OPE_TYPE[$item->ope_type])}} - {{mb_substr($item->ope_mail, 0, 10)}} - - {{mb_substr($item->ope_phone, 0, 15)}} - {{$item->ope_sendalart_que1?__("はい"):__("いいえ")}} - {{$item->ope_sendalart_que2?__("はい"):__("いいえ")}} - {{$item->ope_sendalart_que3?__("はい"):__("いいえ")}} - {{$item->ope_sendalart_que4?__("はい"):__("いいえ")}} - {{$item->ope_sendalart_que5?__("はい"):__("いいえ")}} - {{$item->ope_sendalart_que6?__("はい"):__("いいえ")}} - {{$item->ope_sendalart_que7?__("はい"):__("いいえ")}} - {{$item->ope_sendalart_que8?__("はい"):__("いいえ")}} - {{$item->ope_sendalart_que9?__("はい"):__("いいえ")}} - {{$item->ope_sendalart_que10?__("はい"):__("いいえ")}} - {{$item->ope_sendalart_que11?__("はい"):__("いいえ")}} - {{$item->ope_sendalart_que12?__("はい"):__("いいえ")}} - {{$item->ope_sendalart_que13?__("はい"):__("いいえ")}} - {{$item->ope_auth1}} - {{$item->ope_auth2}} - {{$item->ope_auth3}} - {{$item->ope_auth4}}{{$item->ope_quit_flag?__("退職"):__("退職しない")}} - - @if($item->ope_quitday) - - {{mb_substr($item->ope_quitday, 0, 10)}} - - @endif -
-
-
-
- +
+
+
+
+

{{__('オペレータマスタ')}}

- -
-
- +
+ +
+ + + +
+
+
+ + +
+ @csrf + + +
+
+ @csrf + +
+
+ +
+ {{ $list->appends(['sort' => $sort, 'sort_type' => $sort_type])->links('pagination') }} +
+ +
+ @if(Session::has('success')) + + @elseif(Session::has('error')) +
+ +

{{__('誤差')}}:

+ {!! Session::get('error') !!} +
+ @elseif(isset($errorMsg)) +
+ +

{{__('誤差')}}:

+ {!! $errorMsg !!} +
+ @endif +
+ +
+ @csrf +
+ + + + + + + + + + @for($i=1;$i<=13;$i++) + + @endfor + + + + + + + + + + @foreach($list as $item) + + + + + + + + @for($i=1;$i<=13;$i++) + @php $field = "ope_sendalart_que{$i}"; @endphp + + @endfor + + + + + + + + @endforeach + +
+ + オペレータIDオペレータ名オペレータ種別メールアドレス電話番号キュー{{$i}}アラート送信管理者権限付与エリアマネージャー権限付与エリアオペレーター権限付与オペレーター権限付与退職フラグ退職日
+ + {{__('編集')}} + {{ $item->ope_id }}{{ $item->ope_name }}{{ \App\Models\Ope::OPE_TYPE[$item->ope_type] ?? $item->ope_type }}{{ $item->ope_mail }}{{ $item->ope_phone }}{{ $item->$field ? 'はい' : 'いいえ' }}{{ $item->ope_auth1 ? '○' : '' }}{{ $item->ope_auth2 ? '○' : '' }}{{ $item->ope_auth3 ? '○' : '' }}{{ $item->ope_auth4 ? '○' : '' }}{{ $item->ope_quit_flag ? "退職" : "在職" }}{{ $item->ope_quitday }}
+
+
+ {{ $list->appends(['sort' => $sort, 'sort_type' => $sort_type])->links('pagination') }} +
+
+
+
+ + @endsection \ No newline at end of file diff --git a/resources/views/admin/parks/info.blade.php b/resources/views/admin/parks/info.blade.php deleted file mode 100644 index d7a2532..0000000 --- a/resources/views/admin/parks/info.blade.php +++ /dev/null @@ -1,53 +0,0 @@ - -@extends('layouts.app') -@section('title', '[東京都|〇〇駐輪場] 駐輪場マスタ') - -@section('content') - -
-
-
-
-

[東京都|〇〇駐輪場] 駐輪場マスタ

-
-
- -
-
-
-
- - - -
-
- - -
-
-
-
- - - - @include('admin.parks._form',['isEdit'=>0,'isInfo'=>1]) -
-
-
-
- -
- - - -
-
-
- - -@endsection diff --git a/resources/views/admin/personal/edit.blade.php b/resources/views/admin/personal/edit.blade.php new file mode 100644 index 0000000..d4ddc87 --- /dev/null +++ b/resources/views/admin/personal/edit.blade.php @@ -0,0 +1,196 @@ +@extends('layouts.app') +@section('title', '本人確認手動処理 編集') + +@section('content') +
+
+
+
+

編集

+
+
+ +
+
+
+
+ +
+
+ +
+ @csrf + +
+
+ + {{-- 上段:本人確認写真1/本人確認写真2 --}} +
+
+
本人確認写真ファイル名1
+
+ @if($user->photo_filename1) + + @endif +
+
+
+
本人確認写真ファイル名2
+
+ @if($user->photo_filename2) + + @endif +
+
+
+ + {{-- 利用者ID+利用者分類ID --}} +
+ {{-- 利用者ID --}} +
+
利用者ID
+
+
利用者ID
+
{{ $user->user_id }}
+
+
+ {{-- 利用者分類ID --}} +
+
利用者分類ID
+
+ @foreach($usertypes as $type) + + @endforeach +
+
+
+ + {{-- 情報テーブル:見た目を目標画像に寄せる(左セル薄ベージュ、罫線、行間) --}} +
+ + + + + + + + + + + + + + + + + + {{-- 居住所 --}} + + + + + + + + + + + + {{-- 関連住所 --}} + + + + + + + + + + + + + + + + + + + + + + + + + + + +
利用者名{{ $user->user_name }}フリガナ{{ $user->user_phonetic }}携帯電話番号{{ $user->user_mobile }}
自宅電話番号{{ $user->user_homephone }}生年月日{{ $user->user_birthdate }}メールアドレス{{ $user->user_primemail }}
契約予定駐輪場名{{ $user->user_park_number }}
居住所郵便番号{{ $user->user_regident_zip }}都道府県{{ $user->user_regident_pre }}
市区群{{ $user->user_regident_city }}住所{{ $user->user_regident_add }}
関連住所郵便番号{{ $user->user_relate_zip }}都道府県{{ $user->user_relate_pre }}
市区群{{ $user->user_relate_city }}住所{{ $user->user_relate_add }}
学校{{ $user->user_school }}卒業予定{{ $user->user_graduate }}区民{{ $user->ward_residents }}
備考{{ $user->user_remarks }}
本人確認書類{{ $user->user_idcard }}
+
+ + {{-- 注意文&アクション --}} +
+ 本人確認書類写真と登録情報を比較して問題なければ、「本人確認チェックOK」ボタンを押下してください。
+ 問題がある場合は「備考」にNG理由を記載のうえ、「本人確認チェックNG」ボタンを押下してください。 +
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+ +{{-- 専用スタイル(目標画像の見た目に寄せる) --}} + +@endsection diff --git a/resources/views/admin/personal/list.blade.php b/resources/views/admin/personal/list.blade.php new file mode 100644 index 0000000..81eb8a8 --- /dev/null +++ b/resources/views/admin/personal/list.blade.php @@ -0,0 +1,108 @@ +@extends('layouts.app') + +@section('title', '本人確認手動処理') + +@section('content') +
+
+
+
+

本人確認手動処理

+
+
+ +
+
+
+
+ +
+
+ + {{-- フィルター(必要なら追加) --}} + {{--
+
+
+ +
+
+ +
+
+
--}} + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @forelse($users as $user) + + + + + + + + + + + + + + + + + + + + + + + + + @empty + + + + @endforelse + +
操作利用者ID利用者分類ID利用者名フリガナ性別生年月日携帯電話番号自宅電話番号メールアドレス居住所:郵便番号居住所:都道府県居住所:市区群居住所:住所関連住所:郵便番号関連住所:都道府県関連住所:市区群関連住所:住所学校卒業予定備考本人確認書類
+ 編集 + {{ $user->user_id }}{{ $user->user_categoryid }}{{ $user->user_name }}{{ $user->user_phonetic }}{{ $user->user_gender }}{{ $user->user_birthdate }}{{ $user->user_mobile }}{{ $user->user_homephone }}{{ $user->user_primemail }}{{ $user->user_regident_zip }}{{ $user->user_regident_pre }}{{ $user->user_regident_city }}{{ $user->user_regident_add }}{{ $user->user_relate_zip }}{{ $user->user_relate_pre }}{{ $user->user_relate_city }}{{ $user->user_relate_add }}{{ $user->user_school }}{{ $user->user_graduate }}{{ $user->user_remarks }}{{ $user->user_idcard }}
データがありません。
+
+ {{ $users->links('pagination') }} +
+
+
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/admin/tag_issue/list.blade.php b/resources/views/admin/tag_issue/list.blade.php new file mode 100644 index 0000000..3f7f607 --- /dev/null +++ b/resources/views/admin/tag_issue/list.blade.php @@ -0,0 +1,130 @@ +@extends('layouts.app') +@section('title', 'タグ発行キュー処理、履歴表示') + +@section('content') +
+
+

タグ発行キュー処理、履歴表示

+ +
+ + +
+
+ +
+
印刷処理
+
+
+
+ +
+
+
+
+
+ +
+
絞り込みフィルター
+
+
+
+ +
+
+ +
+
+
+
+ +
+
タグシリアルフィルター
+
+
+
タグシリアル
+
+ +
+
タグシリアル64進
+
+ +
+
+ + +
+
+
+
+ +
+
タグ発送ステータス変更
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + @foreach($users as $user) + + + + + + + + + + + + + + + @endforeach + +
キューIDタグシリアルタグシリアル64進タグ発送ステータス利用者名携帯電話番号自宅電話番号居住所:郵便番号居住所:都道府県居住所:市区郡居住所:住所
{{ $user->user_seq }}{{ $user->user_tag_serial }}{{ $user->user_tag_serial_64 }}{{ $user->user_tag_issue }} + {{ $user->user_name }} + {{ $user->user_mobile }}{{ $user->user_homephone }}{{ $user->user_regident_zip }}{{ $user->user_regident_pre }}{{ $user->user_regident_city }}{{ $user->user_regident_add }}
+
+
+ {{ $users->appends(request()->except('page'))->links('pagination') }} +
+
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/admin/users/_form.blade.php b/resources/views/admin/users/_form.blade.php deleted file mode 100644 index 11e0970..0000000 --- a/resources/views/admin/users/_form.blade.php +++ /dev/null @@ -1,652 +0,0 @@ -@if(Session::has('success')) - -@elseif(Session::has('error')) -
- -

{{__('誤差')}}:

- {!! Session::get('error') !!} -
-@elseif(isset($errorMsg)) -
- -

{{__('誤差')}}:

- {!! $errorMsg !!} -
-@endif -
- @if($isInfo) - {{__('登録')}} - {{__('編集')}} - @else - - @endIf -
-
-
- @if($isInfo || $isEdit) -
- -
-
-
- -
-
- @endif -
- -
-
-
- -
-
-
- -
-
-
- -
-
- -
- -
-
-
- -
-
- @if(!$isInfo) -
- -
-
-
- -
-
- @endif -
- -
-
-
-
- - -
-
- - -
-
-
-
- -
-
-
-
- - -
-
- - -
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
- -
- -
-
-
-
- - -
-
- - -
-
-
-
- -
-
-
- -
-
- -
- -
-
-
- -
-
- -
- -
-
-
- -
-
- -
- -
-
- {{----}} - -
- -
- -
-
-
- -
-
-
- -
-
-
- -
-
- - -
- -
-
-
-
- - -
-
- - -
-
-
- -
- -
-
-
- -
-
- - -
- -
-
-
- -
-
- - -
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
- -
- -
-
-
- -
-
-
- -
-
-
- -
-
- -
- -
-
- -
- -
- -
-
-
- -
-
-
- -
-
-
- -
-
- -
- -
-
-
- -
-
-
- -
-
- -
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
- -
- -
-
-
- -
-
-
- -
-
-
- @foreach(\App\User::USER_ID_CARD_CHK_FLG as $key => $item) -
- - -
- @endforeach -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
- - -
-
- - -
-
-
-
- -
-
-
-
- - -
-
- - -
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
- @if(!$isInfo) -
- -
-
-
- - {{--

{{__('note')}}

--}} -
-
- @endif - @if($photo_filename1 != '') -
- @if($isInfo)@endif -
-
- -
- @endif - @if(!$isInfo) -
- -
-
-
- - {{--

{{__('note')}}

--}} -
-
- @endif - @if($photo_filename2 != '') -
- @if($isInfo)@endif -
-
- -
- @endif - - -
- @if($isInfo) - {{__('登録')}} - {{__('編集')}} - @else - - @endIf -
- diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php deleted file mode 100644 index e8cb026..0000000 --- a/resources/views/admin/users/edit.blade.php +++ /dev/null @@ -1,51 +0,0 @@ -@extends('layouts.app') - -@section('content') - -
-
-
-
-

[東京都|〇〇駐輪場] 利用者マスタ

-
-
- -
-
-
-
- - - -
-
- - -
-
-
-
- - - - @include('admin.users._form',['isEdit'=>1,'isInfo'=>0]) -
-
-
-
- -
- - - -
-
-
- - -@endsection diff --git a/resources/views/admin/users/info.blade.php b/resources/views/admin/users/info.blade.php deleted file mode 100644 index 4b05c06..0000000 --- a/resources/views/admin/users/info.blade.php +++ /dev/null @@ -1,52 +0,0 @@ -@extends('layouts.app') - -@section('content') - - -
-
-
-
-

[東京都|〇〇駐輪場] 利用者マスタ

-
-
- -
-
-
-
- - - -
-
- - -
-
-
-
- - - - @include('admin.users._form',['isEdit'=>0,'isInfo'=>1]) -
-
-
-
- -
- - - -
-
-
- - -@endsection diff --git a/resources/views/admin/usertypes/delete.blade.php b/resources/views/admin/usertypes/delete.blade.php new file mode 100644 index 0000000..e36674a --- /dev/null +++ b/resources/views/admin/usertypes/delete.blade.php @@ -0,0 +1,55 @@ +@extends('layouts.app') +@section('title', '削除確認 | 利用者分類マスタ') + +@section('content') +
+
+
+
+

削除確認

+
+
+ +
+
+
+
+ +
+
+
+ 本当にこの利用者分類を削除しますか? +
+
+
+
+ @csrf +
+ +
{{ $user_categoryid }}
+
+
+ +
{{ $print_name ?? '' }}
+
+
+ +
{{ $usertype_money ?? '' }}
+
+
+ +
{{ $usertype_remarks ?? '' }}
+
+ + キャンセル +
+
+
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php new file mode 100644 index 0000000..f677172 --- /dev/null +++ b/resources/views/auth/forgot-password.blade.php @@ -0,0 +1,57 @@ +@extends('layouts.login') + +@section('content') +
+ +
+ +
+
+@endsection \ No newline at end of file diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 7423abf..7e2fb3b 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -47,15 +47,14 @@ - {{-- - Laravel 12移行時に一時的にコメントアウト:パスワードリセット機能は後で実装

{{ __('パスワードを忘れた方はこちら') }}

- --}} + {{-- 「オペレータマスタ」で管理かつ設計書ない為、一時的に新規オペレーター登録をコメントアウト

{{ __('新規オペレーター登録') }}

+ --}} diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php new file mode 100644 index 0000000..57e36ba --- /dev/null +++ b/resources/views/auth/reset-password.blade.php @@ -0,0 +1,46 @@ +@extends('layouts.login') + +@section('content') +
+ +
+ +
+
+@endsection \ No newline at end of file diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index fbbcae5..ebb8c75 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -160,118 +160,112 @@ + + @php + // タグ・シール管理 + $tagRoutes = [ + 'tags', // 例: タグ・シール管理のroute名 + ]; + // 集計業務 + $aggregateRoutes = [ + 'aggregate', // 例: 集計業務のroute名 + ]; + // 決済マスタ + $settlementRoutes = [ + 'settlement1', + 'settlement2', // 決済マスタの各route名 + ]; + // システムマスタ + $systemRoutes = [ + 'system1', + 'system2', // システムマスタの各route名 + ]; + // チェーンロックマスタ + $chainlockRoutes = [ + 'chainlock1', + 'chainlock2', // チェーンロックマスタの各route名 + ]; + + @endphp + @@ -693,7 +624,7 @@ @stack('scripts') - +