so-manager/krgm.so-manager-dev.com
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

画面構造・ボタン処理の統一
All checks were successful
Deploy main / deploy (push) Successful in 23s
Details

Browse Source
This commit is contained in:
kin.rinzen 2025-09-05 22:32:43 +09:00
parent 277631c23a
commit af44534048
33 changed files with 273 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/Http/Controllers/Admin/MailTemplateController.php
View File

@ -11,15 +11,46 @@ class MailTemplateController extends Controller
/** /**
* 一覧表示 * 一覧表示
*/ */
public function list(Request $request) public function list(Request $request)
{ {
if ($request->input('action') === 'reset') { if ($request->input('action') === 'reset') {
return redirect()->route('mail_templates'); return redirect()->route('mail_templates');
} }
// 許可されたソートカラム一覧
$allowedSorts = [
'mail_template_id',
'pg_id',
'internal_id',
'mgr_cc_flag',
'bcc_adrs',
'use_flag',
'memo',
'subject',
'text',
'created_at',
'updated_at',
'operator_id',
];
$sort = $request->input('sort', 'mail_template_id'); $sort = $request->input('sort', 'mail_template_id');
$sort_type = $request->input('sort_type', 'desc'); $sort_type = $request->input('sort_type', 'desc');
$allowedSorts = [
'mail_template_id', 'pg_id', 'internal_id', 'mgr_cc_flag',
'bcc_adrs', 'use_flag', 'memo', 'subject', 'text',
'created_at', 'updated_at', 'operator_id'
];
if (!in_array($sort, $allowedSorts)) {
$sort = 'mail_template_id';
}
if (!in_array($sort_type, ['asc', 'desc'])) {
$sort_type = 'desc';
}
$query = MailTemplate::query(); $query = MailTemplate::query();
// 絞り込み // 絞り込み
@ -46,6 +77,7 @@ class MailTemplateController extends Controller
)); ));
} }
/** /**
* 新規登録 * 新規登録
*/ */

17
app/Http/Controllers/Admin/OperatorQueController.php
View File

@ -24,20 +24,31 @@ class OperatorQueController extends Controller
$sort = $request->input('sort', 'que_id'); $sort = $request->input('sort', 'que_id');
$sort_type = $request->input('sort_type', 'desc'); $sort_type = $request->input('sort_type', 'desc');
// 許可されたカラム名のリスト（DB定義に合わせて）
$allowedSorts = ['que_id', 'ope_id', 'que_status', 'created_at', 'updated_at'];
if (!in_array($sort, $allowedSorts)) {
$sort = 'que_id';
}
if (!in_array($sort_type, ['asc', 'desc'])) {
$sort_type = 'desc';
}
$query = OperatorQue::query(); $query = OperatorQue::query();
// フィルタリング（絞り込み）
if ($request->filled('que_status')) { if ($request->filled('que_status')) {
$query->where('que_status', $request->input('que_status')); $query->where('que_status', $request->input('que_status'));
} }
$list = $query->orderBy($sort, $sort_type) $list = $query->orderBy($sort, $sort_type)
->paginate(\App\Utils::item_per_page ?? 20); ->paginate(\App\Utils::item_per_page ?? 20);
$que_status = $request->input('que_status');
return view('admin.operator_ques.list', compact('list', 'sort', 'sort_type')); return view('admin.operator_ques.list', compact('list', 'sort', 'sort_type'));
} }
/** /**
* 新規登録（画面/処理） * 新規登録（画面/処理）
*/ */

22
app/Http/Controllers/Admin/SettingController.php
View File

@ -16,15 +16,31 @@ class SettingController extends Controller
public function list(Request $request) public function list(Request $request)
{ {
$perPage = \App\Utils::item_per_page ?? 20; $perPage = \App\Utils::item_per_page ?? 20;
$list = Setting::orderBy('setting_id', 'desc')->paginate($perPage);
// リクエストから取得
$sort = $request->input('sort', 'setting_id');
$sort_type = $request->input('sort_type', 'desc');
// 許可されたカラムのみソート（安全対策）
$allowedSorts = ['setting_id', 'setting_key', 'setting_value']; // ← 必要に応じて増やす
if (!in_array($sort, $allowedSorts)) {
$sort = 'setting_id';
}
if (!in_array($sort_type, ['asc', 'desc'])) {
$sort_type = 'desc';
}
$list = Setting::orderBy($sort, $sort_type)->paginate($perPage);
return view('admin.settings.list', [ return view('admin.settings.list', [
'list' => $list, 'list' => $list,
'sort' => 'setting_id', 'sort' => $sort,
'sort_type' => 'desc', 'sort_type' => $sort_type,
]); ]);
} }
/** /**
* 追加（GET: 画面 / POST: 登録）: /settings/add * 追加（GET: 画面 / POST: 登録）: /settings/add
*/ */

28
resources/views/admin/devices/_form.blade.php
View File

@ -18,16 +18,7 @@
</div> </div>
@endif @endif
{{-- ===== ボタン区（上部） ===== --}} {{-- ===== フォーム ===== --}}
<div class="card-header">
@if(!empty($isInfo) && !empty($device?->device_id))
<a href="{{ route('devices_add') }}" class="btn btn-lg btn-success">{{ __('登録') }}</a>
<a href="{{ route('devices_edit', ['id' => $device->device_id]) }}" class="btn btn-lg btn-danger">{{ __('編集') }}</a>
@else
<button type="submit" class="btn btn-lg btn-danger register">{{ __('保存') }}</button>
@endif
</div>
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
@ -170,12 +161,11 @@
</div> </div>
</div> </div>
{{-- ===== ボタン区（下部） ===== --}} {{-- 下部ボタン --}}
<div class="card-header"> @if($isEdit)
@if(!empty($isInfo) && !empty($device?->device_id)) <button type="submit" class="btn btn-lg btn-success register">{{ __('保存') }}</button>
<a href="{{ route('devices_add') }}" class="btn btn-lg btn-success">{{ __('登録') }}</a> <button type="submit" class="btn btn-lg btn-secondary register">{{ __('戻る') }}</button>
<a href="{{ route('devices_edit', ['id' => $device->device_id]) }}" class="btn btn-lg btn-danger">{{ __('編集') }}</a> @else
@else <button type="submit" class="btn btn-lg btn-success register">{{ __('登録') }}</button>
<button type="submit" class="btn btn-lg btn-danger register">{{ __('保存') }}</button> <button type="submit" class="btn btn-lg btn-danger register">{{ __('削除') }}</button>
@endif @endif
</div>

10
resources/views/admin/devices/add.blade.php
View File

@ -6,14 +6,14 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row mb-2"> <div class="row mb-2">
<div class="col-lg-6"> <div class="col-lg-6">
<h1 class="m-0 text-dark">新規</h1> <h1 class="m-0 text-dark">新規登録</h1>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="./index2.html">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item"><a href="./index3.html">[東京都|〇〇駐輪場]</a></li> <li class="breadcrumb-item"><a href="{{ route('devices') }}">デバイス管理マスタ</a></li>
<li class="breadcrumb-item">デバイス管理マスタ</li> <li class="breadcrumb-item">新規登録</li>
<li class="breadcrumb-item active">[東京都|〇〇駐輪場] デバイス管理マスタ</li>
</ol> </ol>
</div> </div>
</div> </div>

5
resources/views/admin/devices/edit.blade.php
View File

@ -10,9 +10,8 @@
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="./index2.html">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item"><a href="./index3.html">[東京都|〇〇駐輪場]</a></li> <li class="breadcrumb-item"><a href="{{ route('devices') }}">デバイス管理マスタ</a></li>
<li class="breadcrumb-item">デバイス管理マスタ</li>
<li class="breadcrumb-item active">編集</li> <li class="breadcrumb-item active">編集</li>
</ol> </ol>
</div> </div>

17
resources/views/admin/devices/list.blade.php
View File

@ -70,11 +70,11 @@
$WORK = ['1'=>'稼働', '0'=>'停止', 1=>'稼働', 0=>'停止']; $WORK = ['1'=>'稼働', '0'=>'停止', 1=>'稼働', 0=>'停止'];
@endphp @endphp
<table class="table table-bordered table-striped dataTable text-nowrap"> <table class="table table-bordered dataTable text-nowrap">
<thead> <thead>
<tr> <tr>
<th style="width:120px;" class="text-left"> <th style="width:120px;" class="text-left">
<input type="checkbox" class="minimal m-0" id="checkbox_all"> <input type="checkbox" onclick="$('input[name*=\'pk\']').prop('checked', this.checked);">
</th> </th>
<th class="sorting @if($sort=='device_id'){{ $sort_type=='asc'?'sorting_asc':'sorting_desc' }}@endif text-right" <th class="sorting @if($sort=='device_id'){{ $sort_type=='asc'?'sorting_asc':'sorting_desc' }}@endif text-right"
sort="device_id"><span>{{ __('デバイスID') }}</span></th> sort="device_id"><span>{{ __('デバイスID') }}</span></th>
@ -92,15 +92,16 @@
<th class="text-left"><span>{{ __('備考') }}</span></th> <th class="text-left"><span>{{ __('備考') }}</span></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody class="bg-white">
@foreach($list as $item) @foreach($list as $item)
<tr> <tr>
<td class="table-warning align-middle"> <td class="align-middle" style="background-color:#faebd7;">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<input type="checkbox" class="minimal m-0 checkbox" name="ids[]" value="{{ $item->device_id }}"> <input type="checkbox" class="m-0 checkbox" name="pk[]" value="{{ $item->device_id }}">
<a href="{{ route('devices_edit',['id'=>$item->device_id]) }}" class="btn btn-sm btn-default ml-2">{{ __('編集') }}</a> <a href="{{ route('devices_edit', ['id' => $item->device_id]) }}" class="btn btn-sm btn-default ml-2">{{ __('編集') }}</a>
</div> </div>
</td> </td>
<td class="sm-item text-right">{{ $item->device_id }}</td> <td class="sm-item text-right">{{ $item->device_id }}</td>
<td class="sm-item text-left"> <td class="sm-item text-left">
{{ $item->park_id }} {{ $item->park_id }}

26
resources/views/admin/mail_templates/_form.blade.php
View File

@ -11,14 +11,6 @@
</div> </div>
@endif @endif
<div class="card-header">
@if($isInfo)
<a href="{{ route('mail_templates_add') }}" class="btn btn-lg btn-success">登録</a>
<a href="{{ route('mail_templates_edit', ['id' => $mailTemplate->mail_template_id]) }}" class="btn btn-lg btn-danger">編集</a>
@else
<button type="submit" class="btn btn-lg btn-danger register">保存</button>
@endif
</div>
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
@ -134,11 +126,15 @@
</div> </div>
</div> </div>
{{-- 下部ボタン --}} {{-- ===== 下部ボタン領域 ===== --}}
@if($isInfo)
<a href="{{ route('mail_templates_add') }}" class="btn btn-lg btn-success">登録</a> {{-- 下部ボタン --}}
<a href="{{ route('mail_templates_edit', ['id' => $mailTemplate->mail_template_id]) }}" class="btn btn-lg btn-danger">編集</a> @if($isEdit)
@else <button type="submit" class="btn btn-lg btn-success register">{{ __('保存') }}</button>
<button type="submit" class="btn btn-lg btn-danger register">保存</button> <button type="submit" class="btn btn-lg btn-secondary register">{{ __('戻る') }}</button>
@endif @else
<button type="submit" class="btn btn-lg btn-success register">{{ __('登録') }}</button>
<button type="submit" class="btn btn-lg btn-danger register">{{ __('削除') }}</button>
@endif
</div> </div>

10
resources/views/admin/mail_templates/add.blade.php
View File

@ -7,14 +7,14 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row mb-2"> <div class="row mb-2">
<div class="col-lg-6"> <div class="col-lg-6">
<h1 class="m-0 text-dark">新規</h1> <h1 class="m-0 text-dark">新規登録</h1>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="{{ route('home') }}">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li> <!-- <li class="breadcrumb-item"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li> -->
<li class="breadcrumb-item">メール送信テンプレート</li> <li class="breadcrumb-item"><a href="{{ route('mail_templates') }}">メール送信テンプレート</a></li>
<li class="breadcrumb-item active">[東京都|〇〇駐輪場] メール送信テンプレート新規登録</li> <li class="breadcrumb-item active">新規登録</li>
</ol> </ol>
</div> </div>
</div> </div>

23
resources/views/admin/mail_templates/edit.blade.php
View File

@ -2,11 +2,26 @@
@section('title', '[東京都|〇〇駐輪場] メール送信テンプレート') @section('title', '[東京都|〇〇駐輪場] メール送信テンプレート')
@section('content') @section('content')
<div class="content-header">
<div class="container-fluid"> <!-- Content Header (Page header) -->
<h1 class="m-0 text-dark">メール送信テンプレート編集</h1> <div class="content-header">
<div class="container-fluid">
<div class="row mb-2">
<div class="col-lg-6">
<h1 class="m-0 text-dark">編集</h1>
</div>
<div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<!-- <li class="breadcrumb-item"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li> -->
<li class="breadcrumb-item"><a href="{{ route('mail_templates') }}">メール送信テンプレート</a></li>
<li class="breadcrumb-item active">編集</li>
</ol>
</div>
</div>
</div>
</div> </div>
</div> <!-- /.content-header -->
<section class="content"> <section class="content">
<div class="container-fluid"> <div class="container-fluid">
<div class="card"> <div class="card">

71
resources/views/admin/mail_templates/list.blade.php
View File

@ -11,7 +11,7 @@
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="{{ route('home') }}">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item active">メール送信テンプレート</li> <li class="breadcrumb-item active">メール送信テンプレート</li>
</ol> </ol>
</div> </div>
@ -114,15 +114,17 @@
<div class="table-responsive"> <div class="table-responsive">
<form action="{{ route('mail_templates_delete') }}" method="POST" id="form_delete"> <form action="{{ route('mail_templates_delete') }}" method="POST" id="form_delete">
@csrf @csrf
<table class="table table-bordered table-striped dataTable text-nowrap"> <table class="table table-bordered dataTable text-nowrap">
<thead> <thead>
<tr> <tr>
<th style="width:120px;" class="text-left"> {{-- チェック + 編集ボタン --}}
<input type="checkbox" class="minimal m-0" id="checkbox_all"> <th style="width:140px;" class="text-left">
<input type="checkbox" onclick="$('input[name*=\'pk\']').prop('checked', this.checked);">
</th> </th>
{{-- ソート --}}
<th class="sorting {{ ($sort=='mail_template_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="mail_template_id"><span>メールテンプレートID</span></th> <th class="sorting {{ ($sort=='mail_template_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="mail_template_id"><span>メールテンプレートID</span></th>
<th class="sorting {{ ($sort=='pg_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="pg_id"><span>使用プログラムID</span></th> <th class="sorting {{ ($sort=='pg_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="pg_id"><span>使用プログラムID</span></th>
<th class="sorting {{ ($sort=='internal_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="internal_id"><span>内部ID</span></th> <th><span>内部ID</span></th>
<th><span>エリアマネージャー同報</span></th> <th><span>エリアマネージャー同報</span></th>
<th><span>BCCアドレス</span></th> <th><span>BCCアドレス</span></th>
<th class="sorting {{ ($sort=='use_flag') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="use_flag"><span>使用フラグ</span></th> <th class="sorting {{ ($sort=='use_flag') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="use_flag"><span>使用フラグ</span></th>
@ -131,13 +133,14 @@
<th><span>本文</span></th> <th><span>本文</span></th>
</tr> </tr>
</thead> </thead>
<tbody>
<tbody class="bg-white">
@foreach($templates as $item) @foreach($templates as $item)
<tr> <tr>
<td class="table-warning align-middle"> <td class="align-middle" style="background-color:#faebd7;">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<input type="checkbox" class="minimal m-0 checkbox" name="pk[]" value="{{ $item->mail_template_id }}"> <input type="checkbox" class="m-0 checkbox" name="pk[]" value="{{ $item->mail_template_id }}">
<a href="{{ route('mail_templates_info', ['id' => $item->mail_template_id]) }}" class="btn btn-sm btn-default ml-2">編集</a> <a href="{{ route('mail_templates_edit', ['id' => $item->mail_template_id]) }}" class="btn btn-sm btn-default ml-2">編集</a>
</div> </div>
</td> </td>
<td class="sm-item text-left align-middle">{{ $item->mail_template_id }}</td> <td class="sm-item text-left align-middle">{{ $item->mail_template_id }}</td>
@ -161,41 +164,23 @@
<form action="{{ route('mail_templates_export') }}" method="GET" id="form_export"></form> <form action="{{ route('mail_templates_export') }}" method="GET" id="form_export"></form>
@push('scripts') <script>
<script> document.addEventListener('DOMContentLoaded', function () {
// 全選択・全解除 document.querySelectorAll('th.sorting').forEach(function (th) {
document.getElementById('checkbox_all')?.addEventListener('change', function(e){ th.addEventListener('click', function () {
document.querySelectorAll('.checkbox').forEach(cb => cb.checked = e.target.checked); const sort = this.getAttribute('sort');
}); const url = new URL(window.location.href);
const currentSort = url.searchParams.get('sort');
const currentType = url.searchParams.get('sort_type') || 'asc';
// 削除確認 const newType = (currentSort === sort && currentType === 'asc') ? 'desc' : 'asc';
document.getElementById('delete')?.addEventListener('click', function(){ url.searchParams.set('sort', sort);
const anyChecked = Array.from(document.querySelectorAll('.checkbox')).some(cb => cb.checked); url.searchParams.set('sort_type', newType);
if (!anyChecked) {
alert('削除対象が選択されていません。');
return;
}
if (confirm('削除してよろしいですか？')) {
document.getElementById('form_delete').submit();
}
});
// ソート window.location.href = url.toString();
document.querySelectorAll('th.sorting').forEach(th => { });
th.addEventListener('click', function(){ });
const form = document.getElementById('list-form');
const current = "{{ $sort ?? '' }}";
const currentType = "{{ $sort_type ?? '' }}";
const nextCol = this.getAttribute('sort');
let nextType = 'asc';
if (current === nextCol) {
nextType = (currentType === 'asc') ? 'desc' : 'asc';
}
form.querySelector('[name=sort]').value = nextCol;
form.querySelector('[name=sort_type]').value = nextType;
form.submit();
}); });
}); </script>
</script>
@endpush
@endsection @endsection

25
resources/views/admin/operator_ques/_form.blade.php
View File

@ -16,14 +16,7 @@
{!! $errorMsg !!} {!! $errorMsg !!}
</div> </div>
@endif @endif
<div class="card-header">
@if($isInfo)
<a href="{{route('operator_ques_add')}}" class="btn btn-lg btn-success">{{__('登録')}}</a>
<a href="{{route('operator_ques_edit',['id'=>$que_id])}}" class="btn btn-lg btn-danger">{{__('編集')}}</a>
@else
<button type="submit" class="btn btn-lg btn-danger register" >{{__('保存')}}</button>
@endIf
</div>
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
@if($isEdit || $isInfo) @if($isEdit || $isInfo)
@ -149,11 +142,15 @@
</div> </div>
</div> </div>
</div> </div>
@if($isInfo)
<a href="{{route('operator_ques_add')}}" class="btn btn-lg btn-success">{{__('登録')}}</a> {{-- 下部ボタン --}}
<a href="{{route('operator_ques_edit',['id'=>$que_id])}}" class="btn btn-lg btn-danger">{{__('編集')}}</a> @if($isEdit)
@else <button type="submit" class="btn btn-lg btn-success register">{{ __('保存') }}</button>
<button type="submit" class="btn btn-lg btn-danger register" >{{__('保存')}}</button> <button type="submit" class="btn btn-lg btn-secondary register">{{ __('戻る') }}</button>
@endIf @else
<button type="submit" class="btn btn-lg btn-success register">{{ __('登録') }}</button>
<button type="submit" class="btn btn-lg btn-danger register">{{ __('削除') }}</button>
@endif
</div> </div>

14
resources/views/admin/operator_ques/add.blade.php
View File

@ -8,14 +8,13 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row mb-2"> <div class="row mb-2">
<div class="col-lg-6"> <div class="col-lg-6">
<h1 class="m-0 text-dark">[東京都|〇〇駐輪場] オペレータキュー</h1> <h1 class="m-0 text-dark">新規登録</h1>
</div><!-- /.col --> </div><!-- /.col -->
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="./index2.html">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item"><a href="./index3.html">[東京都|〇〇駐輪場]</a></li> <li class="breadcrumb-item"><a href="{{ route('operator_ques') }}">オペレータキュー</a></li>
<li class="breadcrumb-item">オペレータキュー</li> <li class="breadcrumb-item active">新規登録</li>
<li class="breadcrumb-item active">[東京都|〇〇駐輪場] オペレータキュー</li>
</ol> </ol>
</div><!-- /.col --> </div><!-- /.col -->
</div><!-- /.row --> </div><!-- /.row -->
@ -41,11 +40,6 @@
</div> </div>
</div> </div>
<div class="container-fluid mb20">
<button type="submit" class="btn btn-sm btn-default mr10">{{__('削除')}}</button>
<button type="submit" class="btn btn-sm btn-default mr10">{{__('インポート')}}</button>
<button type="submit" class="btn btn-sm btn-default mr10">{{__('CSV出力')}}</button>
</div>
</div> </div>
</section> </section>
<!-- /.content --> <!-- /.content -->

14
resources/views/admin/operator_ques/edit.blade.php
View File

@ -8,14 +8,13 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row mb-2"> <div class="row mb-2">
<div class="col-lg-6"> <div class="col-lg-6">
<h1 class="m-0 text-dark">[東京都|〇〇駐輪場] オペレータキュー</h1> <h1 class="m-0 text-dark">編集</h1>
</div><!-- /.col --> </div><!-- /.col -->
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="./index2.html">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item"><a href="./index3.html">[東京都|〇〇駐輪場]</a></li> <li class="breadcrumb-item"><a href="{{ route('operator_ques') }}">オペレータキュー</a></li>
<li class="breadcrumb-item">オペレータキュー</li> <li class="breadcrumb-item active">編集</li>
<li class="breadcrumb-item active">利用者マスタ</li>
</ol> </ol>
</div><!-- /.col --> </div><!-- /.col -->
</div><!-- /.row --> </div><!-- /.row -->
@ -41,11 +40,6 @@
</div> </div>
</div> </div>
<div class="container-fluid mb20">
<button type="submit" class="btn btn-sm btn-default mr10">{{__('削除')}}</button>
<button type="submit" class="btn btn-sm btn-default mr10">{{__('インポート')}}</button>
<button type="submit" class="btn btn-sm btn-default mr10">{{__('CSV出力')}}</button>
</div>
</div> </div>
</section> </section>
<!-- /.content --> <!-- /.content -->

16
resources/views/admin/operator_ques/list.blade.php
View File

@ -10,7 +10,7 @@
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="{{ route('home') }}">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item active">オペレータキュー</li> <li class="breadcrumb-item active">オペレータキュー</li>
</ol> </ol>
</div> </div>
@ -93,11 +93,11 @@
<div class="table-responsive"> <div class="table-responsive">
<form action="{{ route('operator_ques_delete') }}" method="POST" id="form_delete"> <form action="{{ route('operator_ques_delete') }}" method="POST" id="form_delete">
@csrf @csrf
<table class="table table-bordered table-striped dataTable text-nowrap"> <table class="table table-bordered dataTable text-nowrap">
<thead> <thead>
<tr> <tr>
<th style="width:120px;" class="text-left"> <th style="width:140px;" class="text-left">
<input type="checkbox" class="minimal m-0" id="checkbox_all"> <input type="checkbox" onclick="$('input[name*=\'pk\']').prop('checked', this.checked);">
</th> </th>
<th class="sorting {{ ($sort=='que_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="que_id"><span>キューID</span></th> <th class="sorting {{ ($sort=='que_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="que_id"><span>キューID</span></th>
<th class="sorting {{ ($sort=='user_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="user_id"><span>利用者名</span></th> <th class="sorting {{ ($sort=='user_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="user_id"><span>利用者名</span></th>
@ -111,13 +111,13 @@
<th><span>処理リンク</span></th> <th><span>処理リンク</span></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody class="bg-white">
@foreach($list as $item) @foreach($list as $item)
<tr> <tr>
<td class="table-warning align-middle"> <td class="align-middle" style="background-color:#faebd7;">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<input type="checkbox" class="minimal m-0 checkbox" name="pk[]" value="{{ $item->que_id }}"> <input type="checkbox" class="m-0 checkbox" name="pk[]" value="{{ $item->que_id }}">
<a href="{{ route('operator_ques_info', ['id' => $item->que_id]) }}" class="btn btn-sm btn-default ml-2">編集</a> <a href="{{ route('operator_ques_edit', ['id' => $item->que_id]) }}" class="btn btn-sm btn-default ml10">編集</a>
</div> </div>
</td> </td>
<td class="sm-item text-left align-middle">{{ $item->que_id }}</td> <td class="sm-item text-left align-middle">{{ $item->que_id }}</td>

21
resources/views/admin/opes/_form.blade.php
View File

@ -17,14 +17,6 @@
</div> </div>
@endif @endif
<div class="card-header">
@if($isInfo)
<a href="{{ route('opes_add') }}" class="btn btn-lg btn-success">{{__('登録')}}</a>
<a href="{{ route('opes_edit',['id'=>$ope_id]) }}" class="btn btn-lg btn-danger">{{__('編集')}}</a>
@else
<button type="submit" class="btn btn-lg btn-danger register">{{__('保存')}}</button>
@endif
</div>
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
@ -447,12 +439,13 @@
<!-- /.form group - 退職日 --> <!-- /.form group - 退職日 -->
</div> </div>
{{-- 下部ボタン --}}
@if($isInfo) @if($isEdit)
<a href="{{route('opes_add')}}" class="btn btn-lg btn-success">{{__('登録')}}</a> <button type="submit" class="btn btn-lg btn-success register">{{ __('保存') }}</button>
<a href="{{route('opes_edit',['id'=>$ope_id])}}" class="btn btn-lg btn-danger">{{__('編集')}}</a> <button type="submit" class="btn btn-lg btn-secondary register">{{ __('戻る') }}</button>
@else @else
<button type="submit" class="btn btn-lg btn-danger register">{{__('保存')}}</button> <button type="submit" class="btn btn-lg btn-success register">{{ __('登録') }}</button>
@endIf <button type="submit" class="btn btn-lg btn-danger register">{{ __('削除') }}</button>
@endif
</div> </div>

10
resources/views/admin/opes/add.blade.php
View File

@ -7,14 +7,14 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row mb-2"> <div class="row mb-2">
<div class="col-lg-6"> <div class="col-lg-6">
<h1 class="m-0 text-dark">新規</h1> <h1 class="m-0 text-dark">新規登録</h1>
</div><!-- /.col --> </div><!-- /.col -->
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="./index2.html">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="./index2.html">ホーム</a></li>
<li class="breadcrumb-item"><a href="./index3.html">[東京都|〇〇駐輪場]</a></li> <!-- <li class="breadcrumb-item"><a href="./index3.html">[東京都|〇〇駐輪場]</a></li> -->
<li class="breadcrumb-item">オペレータマスタ</li> <li class="breadcrumb-item"><a href="{{ route('opes') }}">オペレータマスタ</a></li>
<li class="breadcrumb-item active">[東京都|〇〇駐輪場] オペレータマスタ</li> <li class="breadcrumb-item active">新規登録</li>
</ol> </ol>
</div><!-- /.col --> </div><!-- /.col -->
</div><!-- /.row --> </div><!-- /.row -->

8
resources/views/admin/opes/edit.blade.php
View File

@ -11,10 +11,10 @@
</div><!-- /.col --> </div><!-- /.col -->
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="./index2.html">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="./index2.html">ホーム</a></li>
<li class="breadcrumb-item"><a href="./index3.html">[東京都|〇〇駐輪場]</a></li> <!-- <li class="breadcrumb-item"><a href="./index3.html">[東京都|〇〇駐輪場]</a></li> -->
<li class="breadcrumb-item">オペレータマスタ</li> <li class="breadcrumb-item"><a href="{{ route('opes') }}">オペレータマスタ</a></li>
<li class="breadcrumb-item active">利用者マスタ</li> <li class="breadcrumb-item active">編集</li>
</ol> </ol>
</div><!-- /.col --> </div><!-- /.col -->
</div><!-- /.row --> </div><!-- /.row -->

26
resources/views/admin/opes/list.blade.php
View File

@ -10,8 +10,8 @@
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="{{ route('home') }}">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li> <!-- <li class="breadcrumb-item"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li> -->
<li class="breadcrumb-item active">オペレータマスタ</li> <li class="breadcrumb-item active">オペレータマスタ</li>
</ol> </ol>
</div> </div>
@ -66,11 +66,11 @@
<div class="table-responsive"> <div class="table-responsive">
<form action="{{ route('opes_delete') }}" method="POST" id="form_delete"> <form action="{{ route('opes_delete') }}" method="POST" id="form_delete">
@csrf @csrf
<table class="table table-bordered table-striped dataTable text-nowrap"> <table class="table table-bordered dataTable text-nowrap">
<thead> <thead>
<tr> <tr>
<th style="width:120px;" class="text-left"> <th style="width:140px;" class="text-left">
<input type="checkbox" class="minimal m-0" id="checkbox_all"> <input type="checkbox" onclick="$('input[name*=\'pk\']').prop('checked', this.checked);">
</th> </th>
<th class="sorting {{ ($sort=='ope_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="ope_id"><span>オペレータID</span></th> <th class="sorting {{ ($sort=='ope_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="ope_id"><span>オペレータID</span></th>
<th class="sorting {{ ($sort=='ope_name') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="ope_name"><span>オペレータ名</span></th> <th class="sorting {{ ($sort=='ope_name') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="ope_name"><span>オペレータ名</span></th>
@ -87,13 +87,13 @@
<th class="sorting {{ ($sort=='ope_quitday') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="ope_quitday"><span>退職日</span></th> <th class="sorting {{ ($sort=='ope_quitday') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="ope_quitday"><span>退職日</span></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody class="bg-white">
@foreach($list as $item) @foreach($list as $item)
<tr> <tr>
<td class="table-warning align-middle"> <td class="align-middle" style="background-color:#faebd7;">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<input type="checkbox" class="minimal m-0 checkbox" name="pk[]" value="{{ $item->ope_id }}"> <input type="checkbox" class="m-0 checkbox" name="pk[]" value="{{ $item->ope_id }}">
<a href="{{ route('opes_info', ['id' => $item->ope_id]) }}" class="btn btn-sm btn-default ml-2">編集</a> <a href="{{ route('opes_edit', ['id' => $item->ope_id]) }}" class="btn btn-sm btn-default ml10">編集</a>
</div> </div>
</td> </td>
<td class="sm-item text-left align-middle">{{ $item->ope_id }}</td> <td class="sm-item text-left align-middle">{{ $item->ope_id }}</td>
@ -138,10 +138,10 @@
@push('scripts') @push('scripts')
<script> <script>
// 全選択 // // 全選択
document.getElementById('checkbox_all')?.addEventListener('change', function(e){ // document.getElementById('checkbox_all')?.addEventListener('change', function(e){
document.querySelectorAll('.checkbox').forEach(cb => cb.checked = e.target.checked); // document.querySelectorAll('.checkbox').forEach(cb => cb.checked = e.target.checked);
}); // });
// 削除確認 // 削除確認
document.getElementById('delete')?.addEventListener('click', function(){ document.getElementById('delete')?.addEventListener('click', function(){

20
resources/views/admin/payments/_form.blade.php
View File

@ -6,22 +6,6 @@
<div class="card p-4"> <div class="card p-4">
{{-- 登録・削除 ボタン（上部） --}}
<div class="text-left mt-2 mb-3">
@if($isInfo)
<a href="{{ route('payments_edit', ['id' => $payment->payment_id]) }}" class="btn btn-lg btn-success">編集</a>
@else
<button type="submit" class="btn btn-lg btn-success">登録</button>
@if($isEdit)
<a href="{{ route('payments_delete', ['id' => $payment->payment_id]) }}"
class="btn btn-lg btn-danger ms-2"
onclick="return confirm('削除してよろしいですか？')">削除</a>
@endif
@endif
</div>
<div class="border-top my-3"></div>
{{-- 決済情報ID（編集/参照のみ表示、システム自動採番） --}} {{-- 決済情報ID（編集/参照のみ表示、システム自動採番） --}}
@if($isEdit || $isInfo) @if($isEdit || $isInfo)
<div class="row mb-3"> <div class="row mb-3">
@ -193,9 +177,7 @@
</div> </div>
@endif @endif
<div class="border-top my-3"></div> {{-- ボタン --}}
{{-- 登録・削除 ボタン（下部重ね） --}}
<div class="text-left mt-2"> <div class="text-left mt-2">
@if($isInfo) @if($isInfo)
<a href="{{ route('payments_edit', ['id' => $payment->payment_id]) }}" class="btn btn-lg btn-success">編集</a> <a href="{{ route('payments_edit', ['id' => $payment->payment_id]) }}" class="btn btn-lg btn-success">編集</a>

2
resources/views/admin/payments/add.blade.php
View File

@ -12,7 +12,7 @@
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item"><a href="{{ route('payments') }}">決済情報マスタ</a></li> <li class="breadcrumb-item"><a href="{{ route('payments') }}">決済情報マスタ</a></li>
<li class="breadcrumb-item active">新規</li> <li class="breadcrumb-item active">新規登録</li>
</ol> </ol>
</div> </div>
</div> </div>

18
resources/views/admin/payments/list.blade.php
View File

@ -11,8 +11,8 @@
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="{{ route('home') }}">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li> <!-- <li class="breadcrumb-item"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li> -->
<li class="breadcrumb-item active">決済情報マスタ</li> <li class="breadcrumb-item active">決済情報マスタ</li>
</ol> </ol>
</div> </div>
@ -62,12 +62,12 @@
<div class="table-responsive"> <div class="table-responsive">
<form action="{{ route('payments_delete') }}" method="POST" id="form_delete"> <form action="{{ route('payments_delete') }}" method="POST" id="form_delete">
@csrf @csrf
<table class="table table-bordered table-striped dataTable text-nowrap"> <table class="table table-bordered dataTable text-nowrap">
<thead> <thead>
<tr> <tr>
{{-- チェック + 編集 --}} {{-- チェック + 編集 --}}
<th style="width:120px;" class="text-left"> <th style="width:140px;" class="text-left">
<input type="checkbox" class="minimal m-0" id="checkbox_all"> <input type="checkbox" onclick="$('input[name*=\'pk\']').prop('checked', this.checked);">
</th> </th>
<th class="sorting {{ ($sort=='payment_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="payment_id"> <th class="sorting {{ ($sort=='payment_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="payment_id">
<span>決済情報ID</span> <span>決済情報ID</span>
@ -89,14 +89,14 @@
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody class="bg-white">
@foreach($payments as $payment) @foreach($payments as $payment)
<tr> <tr>
{{-- 同じセルに チェック + 編集ボタン --}} {{-- 同じセルに チェック + 編集ボタン --}}
<td class="table-warning align-middle"> <td class="align-middle" style="background-color:#faebd7;">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<input type="checkbox" class="minimal m-0 checkbox" name="id[]" value="{{ $payment->payment_id }}"> <input type="checkbox" class="m-0 checkbox" name="pk[]" value="{{ $payment->payment_id }}">
<a href="{{ route('payments_edit', ['id' => $payment->payment_id]) }}" class="btn btn-sm btn-default ml-2">編集</a> <a href="{{ route('payments_edit', ['id' => $payment->payment_id]) }}" class="btn btn-sm btn-default ml10">編集</a>
</div> </div>
</td> </td>
<td class="sm-item text-left align-middle">{{ $payment->payment_id }}</td> <td class="sm-item text-left align-middle">{{ $payment->payment_id }}</td>

24
resources/views/admin/settings/_form.blade.php
View File

@ -11,16 +11,6 @@
</div> </div>
@endif @endif
{{-- ===== 上部ボタン領域 ===== --}}
<div class="card-header">
@if(!empty($isInfo) && !empty($setting?->setting_id))
<a href="{{ route('settings_add') }}" class="btn btn-success btn-lg">新規登録</a>
<a href="{{ route('settings_edit', ['id' => $setting->setting_id]) }}" class="btn btn-warning btn-lg">編集</a>
@else
<button type="submit" class="btn btn-primary btn-lg">保存</button>
@endif
</div>
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
@ -192,10 +182,12 @@
{{-- ===== 下部ボタン領域 ===== --}} {{-- ===== 下部ボタン領域 ===== --}}
<div class="card-header"> <div class="card-header">
@if(!empty($isInfo) && !empty($setting?->setting_id)) {{-- 下部ボタン --}}
<a href="{{ route('settings_add') }}" class="btn btn-success btn-lg">新規登録</a> @if($isEdit)
<a href="{{ route('settings_edit', ['id' => $setting->setting_id]) }}" class="btn btn-warning btn-lg">編集</a> <button type="submit" class="btn btn-lg btn-success register">{{ __('保存') }}</button>
@else <button type="submit" class="btn btn-lg btn-secondary register">{{ __('戻る') }}</button>
<button type="submit" class="btn btn-primary btn-lg">保存</button> @else
@endif <button type="submit" class="btn btn-lg btn-success register">{{ __('登録') }}</button>
<button type="submit" class="btn btn-lg btn-danger register">{{ __('削除') }}</button>
@endif
</div> </div>

2
resources/views/admin/settings/add.blade.php
View File

@ -5,7 +5,7 @@
<div class="content-header"> <div class="content-header">
<div class="container-fluid"> <div class="container-fluid">
<div class="row mb-2"> <div class="row mb-2">
<div class="col-lg-6"><h1 class="m-0 text-dark">設定マスタ 新規登録</h1></div> <div class="col-lg-6"><h1 class="m-0 text-dark">新規登録</h1></div>
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="#">ホーム</a></li> <li class="breadcrumb-item"><a href="#">ホーム</a></li>

2
resources/views/admin/settings/edit.blade.php
View File

@ -5,7 +5,7 @@
<div class="content-header"> <div class="content-header">
<div class="container-fluid"> <div class="container-fluid">
<div class="row mb-2"> <div class="row mb-2">
<div class="col-lg-6"><h1 class="m-0 text-dark">設定マスタ 編集</h1></div> <div class="col-lg-6"><h1 class="m-0 text-dark">編集</h1></div>
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="#">ホーム</a></li> <li class="breadcrumb-item"><a href="#">ホーム</a></li>

16
resources/views/admin/settings/list.blade.php
View File

@ -10,7 +10,7 @@
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="{{ route('home') }}">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item active">{{ __('設定マスタ') }}</li> <li class="breadcrumb-item active">{{ __('設定マスタ') }}</li>
</ol> </ol>
</div> </div>
@ -68,10 +68,10 @@
<div class="table-responsive"> <div class="table-responsive">
<form action="{{ route('settings_delete') }}" method="POST" id="form_delete"> <form action="{{ route('settings_delete') }}" method="POST" id="form_delete">
@csrf @csrf
<table class="table table-bordered table-striped dataTable text-nowrap"> <table class="table table-bordered dataTable text-nowrap">
<thead> <thead>
<tr> <tr>
<th style="width:140px;" class="text-left"> <th style="width:120px;" class="text-left">
<input type="checkbox" onclick="$('input[name*=\'pk\']').prop('checked', this.checked);"> <input type="checkbox" onclick="$('input[name*=\'pk\']').prop('checked', this.checked);">
</th> </th>
<th sort="setting_id" class="sorting {{ ($sort=='setting_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}"><span>{{ __('設定ID') }}</span></th> <th sort="setting_id" class="sorting {{ ($sort=='setting_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}"><span>{{ __('設定ID') }}</span></th>
@ -85,15 +85,17 @@
<th class="text-right"><span>{{ __('キープアライブ(分)') }}</span></th> <th class="text-right"><span>{{ __('キープアライブ(分)') }}</span></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody class="bg-white">
{{-- データ表示 --}}
@foreach($list as $row) @foreach($list as $row)
<tr> <tr>
<td class="table-warning align-middle"> <td class="align-middle" style="background-color:#faebd7;">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<input type="checkbox" class="minimal m-0 checkbox" name="id[]" value="{{ $row->setting_id }}"> <input type="checkbox" class="m-0 checkbox" name="pk[]" value="{{ $row->setting_id }}">
<a href="{{ route('settings_edit',['id'=>$row->setting_id]) }}" class="btn btn-sm btn-default ml-2">{{ __('編集') }}</a> <a href="{{ route('settings_edit', ['id' => $row->setting_id]) }}" class="btn btn-sm btn-default ml10">{{ __('編集') }}</a>
</div> </div>
</td> </td>
<td class="sm-item text-right align-middle">{{ $row->setting_id }}</td> <td class="sm-item text-right align-middle">{{ $row->setting_id }}</td>
<td class="sm-item text-left align-middle">{{ $row->edit_master }}</td> <td class="sm-item text-left align-middle">{{ $row->edit_master }}</td>
<td class="sm-item text-left align-middle">{{ $row->web_master }}</td> <td class="sm-item text-left align-middle">{{ $row->web_master }}</td>

23
resources/views/admin/settlement_transactions/_form.blade.php
View File

@ -17,16 +17,6 @@
</div> </div>
@endif @endif
<div class="card-header">
@if($isInfo)
<a href="{{ route('settlement_transactions_add') }}" class="btn btn-lg btn-success">{{ __('登録') }}</a>
<a href="{{ route('settlement_transactions_edit', ['id' => $transaction->settlement_transaction_id]) }}"
class="btn btn-lg btn-danger">{{ __('編集') }}</a>
@else
<button type="submit" class="btn btn-lg btn-danger register">{{ __('保存') }}</button>
@endif
</div>
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
@ -216,12 +206,13 @@
</div> </div>
{{-- 下部ボタン（上部と同じ） --}} {{-- 下部ボタン --}}
@if($isInfo) @if($isEdit)
<a href="{{ route('settlement_transactions_add') }}" class="btn btn-lg btn-success">{{ __('登録') }}</a> <button type="submit" class="btn btn-lg btn-success register">{{ __('保存') }}</button>
<a href="{{ route('settlement_transactions_edit', ['id' => $transaction->settlement_transaction_id]) }}" <button type="submit" class="btn btn-lg btn-secondary register">{{ __('戻る') }}</button>
class="btn btn-lg btn-danger">{{ __('編集') }}</a>
@else @else
<button type="submit" class="btn btn-lg btn-danger register">{{ __('保存') }}</button> <button type="submit" class="btn btn-lg btn-success register">{{ __('登録') }}</button>
<button type="submit" class="btn btn-lg btn-danger register">{{ __('削除') }}</button>
@endif @endif
</div> </div>

8
resources/views/admin/settlement_transactions/add.blade.php
View File

@ -7,14 +7,14 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row mb-2"> <div class="row mb-2">
<div class="col-lg-6"> <div class="col-lg-6">
<h1 class="m-0 text-dark">新規</h1> <h1 class="m-0 text-dark">新規登録</h1>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="{{ route('home') }}">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li> <!-- <li class="breadcrumb-item"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li> -->
<li class="breadcrumb-item"><a href="{{ route('settlement_transactions') }}">決済トランザクション</a></li> <li class="breadcrumb-item"><a href="{{ route('settlement_transactions') }}">決済トランザクション</a></li>
<li class="breadcrumb-item active">新規</li> <li class="breadcrumb-item active">新規登録</li>
</ol> </ol>
</div> </div>
</div> </div>

4
resources/views/admin/settlement_transactions/edit.blade.php
View File

@ -11,8 +11,8 @@
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="{{ route('home') }}">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li> <!-- <li class="breadcrumb-item"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li> -->
<li class="breadcrumb-item"><a href="{{ route('settlement_transactions') }}">決済トランザクション</a></li> <li class="breadcrumb-item"><a href="{{ route('settlement_transactions') }}">決済トランザクション</a></li>
<li class="breadcrumb-item active">編集</li> <li class="breadcrumb-item active">編集</li>
</ol> </ol>

10
resources/views/admin/settlement_transactions/list.blade.php
View File

@ -10,7 +10,7 @@
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="{{ route('home') }}">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item active">決済トランザクション</li> <li class="breadcrumb-item active">決済トランザクション</li>
</ol> </ol>
</div> </div>
@ -84,7 +84,7 @@
<div class="table-responsive"> <div class="table-responsive">
<form action="{{ route('settlement_transactions_delete') }}" method="POST" id="form_delete"> <form action="{{ route('settlement_transactions_delete') }}" method="POST" id="form_delete">
@csrf @csrf
<table class="table table-bordered table-striped dataTable text-nowrap"> <table class="table table-bordered dataTable text-nowrap">
<thead> <thead>
<tr> <tr>
<th style="width:140px;" class="text-left"> <th style="width:140px;" class="text-left">
@ -106,13 +106,13 @@
<th><span>MD5文字列</span></th> <th><span>MD5文字列</span></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody class="bg-white" >
@foreach($transactions as $item) @foreach($transactions as $item)
<tr> <tr>
<td class="table-warning align-middle"> <td class="align-middle" style="background-color:#faebd7;">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<input type="checkbox" class="m-0 checkbox" name="pk[]" value="{{ $item->settlement_transaction_id }}"> <input type="checkbox" class="m-0 checkbox" name="pk[]" value="{{ $item->settlement_transaction_id }}">
<a href="{{ route('settlement_transactions_edit', ['id' => $item->settlement_transaction_id]) }}" class="btn btn-sm btn-default ml-2">編集</a> <a href="{{ route('settlement_transactions_edit', ['id' => $item->settlement_transaction_id]) }}" class="btn btn-sm btn-default ml10">編集</a>
</div> </div>
</td> </td>

21
resources/views/admin/tax/_form.blade.php
View File

@ -6,22 +6,6 @@
<div class="card p-4"> <div class="card p-4">
{{-- 登録・削除 ボタン（上部） --}}
<div class="text-left mt-2 mb-3">
@if($isInfo)
<a href="{{ route('tax_edit', ['id' => $tax->tax_id]) }}" class="btn btn-lg btn-success">編集</a>
@else
<button type="submit" class="btn btn-lg btn成功 btn-success">登録</button>
@if($isEdit)
<a href="{{ route('tax_delete', ['id' => $tax->tax_id]) }}"
class="btn btn-lg btn-danger ms-2"
onclick="return confirm('削除してよろしいですか？')">削除</a>
@endif
@endif
</div>
<div class="border-top my-3"></div>
{{-- 消費税ID（編集/参照のみ表示、システム自動入力） --}} {{-- 消費税ID（編集/参照のみ表示、システム自動入力） --}}
@if($isEdit || $isInfo) @if($isEdit || $isInfo)
<div class="row mb-3"> <div class="row mb-3">
@ -60,10 +44,7 @@
@error('tax_day')<div class="invalid-feedback">{{ $message }}</div>@enderror @error('tax_day')<div class="invalid-feedback">{{ $message }}</div>@enderror
</div> </div>
</div> </div>
{{-- ボタン --}}
<div class="border-top my-3"></div>
{{-- 登録・削除 ボタン（下部重ね） --}}
<div class="text-left mt-2"> <div class="text-left mt-2">
@if($isInfo) @if($isInfo)
<a href="{{ route('tax_edit', ['id' => $tax->tax_id]) }}" class="btn btn-lg btn-success">編集</a> <a href="{{ route('tax_edit', ['id' => $tax->tax_id]) }}" class="btn btn-lg btn-success">編集</a>

4
resources/views/admin/tax/add.blade.php
View File

@ -6,13 +6,13 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row mb-2"> <div class="row mb-2">
<div class="col-sm-6"> <div class="col-sm-6">
<h1 class="m-0 text-dark">新規</h1> <h1 class="m-0 text-dark">新規登録</h1>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item"><a href="{{ route('tax') }}">消費税マスタ</a></li> <li class="breadcrumb-item"><a href="{{ route('tax') }}">消費税マスタ</a></li>
<li class="breadcrumb-item active">新規</li> <li class="breadcrumb-item active">新規登録</li>
</ol> </ol>
</div> </div>
</div> </div>

20
resources/views/admin/tax/list.blade.php
View File

@ -11,8 +11,8 @@
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="{{ route('home') }}">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li> <!-- <li class="breadcrumb-item"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li> -->
<li class="breadcrumb-item active">消費税マスタ</li> <li class="breadcrumb-item active">消費税マスタ</li>
</ol> </ol>
</div> </div>
@ -61,14 +61,14 @@
<div class="table-responsive"> <div class="table-responsive">
<form action="{{ route('tax_delete') }}" method="POST" id="form_delete"> <form action="{{ route('tax_delete') }}" method="POST" id="form_delete">
@csrf @csrf
<table class="table table-bordered table-striped dataTable text-nowrap"> <table class="table table-bordered dataTable text-nowrap">
<thead> <thead>
<tr> <tr>
{{-- チェック + 編集 --}} {{-- チェック + 編集 --}}
<th style="width:120px;" class="text-left"> <th style="width:140px;" class="text-left">
<input type="checkbox" class="minimal m-0" id="checkbox_all"> <input type="checkbox" onclick="$('input[name*=\'pk\']').prop('checked', this.checked);">
</th> </th>
<th class="sorting {{ ($sort=='tax_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="tax_id"> <th class="sorting4='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="tax_id">
<span>消費税ID</span> <span>消費税ID</span>
</th> </th>
<th class="sorting {{ ($sort=='tax_percent') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="tax_percent"> <th class="sorting {{ ($sort=='tax_percent') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="tax_percent">
@ -79,14 +79,14 @@
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody class="bg-white">
@foreach($taxes as $tax) @foreach($taxes as $tax)
<tr> <tr>
{{-- 同じセルに チェック + 編集ボタン --}} {{-- 同じセルに チェック + 編集ボタン --}}
<td class="table-warning align-middle"> <td class="align-middle" style="background-color:#faebd7;">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<input type="checkbox" class="minimal m-0 checkbox" name="id[]" value="{{ $tax->tax_id }}"> <input type="checkbox" class="m-0 checkbox" name="pk[]" value="{{ $tax->tax_id }}">
<a href="{{ route('tax_edit', ['id' => $tax->tax_id]) }}" class="btn btn-sm btn-default ml-2">編集</a> <a href="{{ route('tax_edit', ['id' => $tax->tax_id]) }}" class="btn btn-sm btn-default ml10">編集</a>
</div> </div>
</td> </td>
<td class="sm-item text-left align-middle">{{ $tax->tax_id }}</td> <td class="sm-item text-left align-middle">{{ $tax->tax_id }}</td>