From af445340485ab776585c9aabc79b246624ffb8e4 Mon Sep 17 00:00:00 2001
From: "kin.rinzen" <yukikk0405@outlook.com>
Date: Fri, 5 Sep 2025 22:32:43 +0900
Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E6=A7=8B=E9=80=A0=E3=83=BB?=
 =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E5=87=A6=E7=90=86=E3=81=AE=E7=B5=B1?=
 =?UTF-8?q?=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/MailTemplateController.php          | 34 ++++++++-
 .../Admin/OperatorQueController.php           | 17 ++++-
 .../Controllers/Admin/SettingController.php   | 22 +++++-
 resources/views/admin/devices/_form.blade.php | 28 +++-----
 resources/views/admin/devices/add.blade.php   | 10 +--
 resources/views/admin/devices/edit.blade.php  |  5 +-
 resources/views/admin/devices/list.blade.php  | 17 ++---
 .../admin/mail_templates/_form.blade.php      | 26 +++----
 .../views/admin/mail_templates/add.blade.php  | 10 +--
 .../views/admin/mail_templates/edit.blade.php | 23 ++++--
 .../views/admin/mail_templates/list.blade.php | 71 ++++++++-----------
 .../views/admin/operator_ques/_form.blade.php | 25 +++----
 .../views/admin/operator_ques/add.blade.php   | 14 ++--
 .../views/admin/operator_ques/edit.blade.php  | 14 ++--
 .../views/admin/operator_ques/list.blade.php  | 16 ++---
 resources/views/admin/opes/_form.blade.php    | 23 +++---
 resources/views/admin/opes/add.blade.php      | 10 +--
 resources/views/admin/opes/edit.blade.php     |  8 +--
 resources/views/admin/opes/list.blade.php     | 26 +++----
 .../views/admin/payments/_form.blade.php      | 20 +-----
 resources/views/admin/payments/add.blade.php  |  2 +-
 resources/views/admin/payments/list.blade.php | 18 ++---
 .../views/admin/settings/_form.blade.php      | 24 +++----
 resources/views/admin/settings/add.blade.php  |  2 +-
 resources/views/admin/settings/edit.blade.php |  2 +-
 resources/views/admin/settings/list.blade.php | 16 +++--
 .../settlement_transactions/_form.blade.php   | 25 +++----
 .../settlement_transactions/add.blade.php     |  8 +--
 .../settlement_transactions/edit.blade.php    |  4 +-
 .../settlement_transactions/list.blade.php    | 10 +--
 resources/views/admin/tax/_form.blade.php     | 21 +-----
 resources/views/admin/tax/add.blade.php       |  4 +-
 resources/views/admin/tax/list.blade.php      | 20 +++---
 33 files changed, 273 insertions(+), 302 deletions(-)

diff --git a/app/Http/Controllers/Admin/MailTemplateController.php b/app/Http/Controllers/Admin/MailTemplateController.php
index 6323dff..bad801f 100644
--- a/app/Http/Controllers/Admin/MailTemplateController.php
+++ b/app/Http/Controllers/Admin/MailTemplateController.php
@@ -11,15 +11,46 @@ class MailTemplateController extends Controller
     /**
      * 一覧表示
      */
-    public function list(Request $request)
+   public function list(Request $request)
     {
         if ($request->input('action') === 'reset') {
             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_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();
 
         // 絞り込み
@@ -46,6 +77,7 @@ class MailTemplateController extends Controller
         ));
     }
 
+
     /**
      * 新規登録
      */
diff --git a/app/Http/Controllers/Admin/OperatorQueController.php b/app/Http/Controllers/Admin/OperatorQueController.php
index 36daf1c..c192e4f 100644
--- a/app/Http/Controllers/Admin/OperatorQueController.php
+++ b/app/Http/Controllers/Admin/OperatorQueController.php
@@ -24,20 +24,31 @@ class OperatorQueController extends Controller
         $sort      = $request->input('sort', 'que_id');
         $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();
 
+        // フィルタリング（絞り込み）
         if ($request->filled('que_status')) {
             $query->where('que_status', $request->input('que_status'));
         }
 
         $list = $query->orderBy($sort, $sort_type)
-                      ->paginate(\App\Utils::item_per_page ?? 20);
-
-        $que_status = $request->input('que_status');
+                    ->paginate(\App\Utils::item_per_page ?? 20);
 
         return view('admin.operator_ques.list', compact('list', 'sort', 'sort_type'));
     }
 
+
     /**
      * 新規登録（画面/処理）
      */
diff --git a/app/Http/Controllers/Admin/SettingController.php b/app/Http/Controllers/Admin/SettingController.php
index 454f128..e650576 100644
--- a/app/Http/Controllers/Admin/SettingController.php
+++ b/app/Http/Controllers/Admin/SettingController.php
@@ -16,15 +16,31 @@ class SettingController extends Controller
     public function list(Request $request)
     {
         $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', [
             'list'      => $list,
-            'sort'      => 'setting_id',
-            'sort_type' => 'desc',
+            'sort'      => $sort,
+            'sort_type' => $sort_type,
         ]);
     }
 
+
     /**
      * 追加（GET: 画面 / POST: 登録）: /settings/add
      */
diff --git a/resources/views/admin/devices/_form.blade.php b/resources/views/admin/devices/_form.blade.php
index eddf819..b5d29fe 100644
--- a/resources/views/admin/devices/_form.blade.php
+++ b/resources/views/admin/devices/_form.blade.php
@@ -18,16 +18,7 @@
     </div>
 @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="row">
 
@@ -170,12 +161,11 @@
     </div>
 </div>
 
-{{-- ===== ボタン区（下部） ===== --}}
-<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>
+{{-- 下部ボタン --}}
+ @if($isEdit)
+    <button type="submit" class="btn btn-lg btn-success register">{{ __('保存') }}</button>
+    <button type="submit" class="btn btn-lg btn-secondary register">{{ __('戻る') }}</button>
+@else
+    <button type="submit" class="btn btn-lg btn-success register">{{ __('登録') }}</button>
+    <button type="submit" class="btn btn-lg btn-danger register">{{ __('削除') }}</button>
+ @endif
diff --git a/resources/views/admin/devices/add.blade.php b/resources/views/admin/devices/add.blade.php
index 3e603fd..7f516d6 100644
--- a/resources/views/admin/devices/add.blade.php
+++ b/resources/views/admin/devices/add.blade.php
@@ -6,14 +6,14 @@
         <div class="container-fluid">
             <div class="row mb-2">
                 <div class="col-lg-6">
-                    <h1 class="m-0 text-dark">新規</h1>
+                    <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="./index2.html">XX様info(ホーム)</a></li>
-                        <li class="breadcrumb-item"><a href="./index3.html">[東京都|〇〇駐輪場]</a></li>
-                        <li class="breadcrumb-item">デバイス管理マスタ</li>
-                        <li class="breadcrumb-item active">[東京都|〇〇駐輪場] デバイス管理マスタ</li>
+                        <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
+                        <li class="breadcrumb-item"><a href="{{ route('devices') }}">デバイス管理マスタ</a></li>
+                        <li class="breadcrumb-item">新規登録</li>
+                        
                     </ol>
                 </div>
             </div>
diff --git a/resources/views/admin/devices/edit.blade.php b/resources/views/admin/devices/edit.blade.php
index 8e6a9f3..ea8a155 100644
--- a/resources/views/admin/devices/edit.blade.php
+++ b/resources/views/admin/devices/edit.blade.php
@@ -10,9 +10,8 @@
                 </div>
                 <div class="col-lg-6">
                     <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="./index3.html">[東京都|〇〇駐輪場]</a></li>
-                        <li class="breadcrumb-item">デバイス管理マスタ</li>
+                        <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
+                        <li class="breadcrumb-item"><a href="{{ route('devices') }}">デバイス管理マスタ</a></li>
                         <li class="breadcrumb-item active">編集</li>
                     </ol>
                 </div>
diff --git a/resources/views/admin/devices/list.blade.php b/resources/views/admin/devices/list.blade.php
index 2275378..bbaa4da 100644
--- a/resources/views/admin/devices/list.blade.php
+++ b/resources/views/admin/devices/list.blade.php
@@ -70,11 +70,11 @@
             $WORK = ['1'=>'稼働', '0'=>'停止', 1=>'稼働', 0=>'停止'];
           @endphp
 
-          <table class="table table-bordered table-striped dataTable text-nowrap">
+          <table class="table table-bordered dataTable text-nowrap">
             <thead>
               <tr>
                 <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 class="sorting @if($sort=='device_id'){{ $sort_type=='asc'?'sorting_asc':'sorting_desc' }}@endif text-right"
                     sort="device_id"><span>{{ __('デバイスID') }}</span></th>
@@ -92,15 +92,16 @@
                 <th class="text-left"><span>{{ __('備考') }}</span></th>
               </tr>
             </thead>
-            <tbody>
+            <tbody class="bg-white">
               @foreach($list as $item)
                 <tr>
-                  <td class="table-warning align-middle">
-                    <div class="d-flex align-items-center">
-                      <input type="checkbox" class="minimal m-0 checkbox" name="ids[]" value="{{ $item->device_id }}">
-                      <a href="{{ route('devices_edit',['id'=>$item->device_id]) }}" class="btn btn-sm btn-default ml-2">{{ __('編集') }}</a>
-                    </div>
+                  <td class="align-middle" style="background-color:#faebd7;">
+                      <div class="d-flex align-items-center">
+                          <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>
+                      </div>
                   </td>
+
                   <td class="sm-item text-right">{{ $item->device_id }}</td>
                   <td class="sm-item text-left">
                     {{ $item->park_id }}
diff --git a/resources/views/admin/mail_templates/_form.blade.php b/resources/views/admin/mail_templates/_form.blade.php
index fac1efc..224c8d8 100644
--- a/resources/views/admin/mail_templates/_form.blade.php
+++ b/resources/views/admin/mail_templates/_form.blade.php
@@ -11,14 +11,6 @@
     </div>
 @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="row">
@@ -134,11 +126,15 @@
         </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>
-    @else
-        <button type="submit" class="btn btn-lg btn-danger register">保存</button>
-    @endif
+    {{-- ===== 下部ボタン領域 ===== --}}
+
+        {{-- 下部ボタン --}}
+        @if($isEdit)
+            <button type="submit" class="btn btn-lg btn-success register">{{ __('保存') }}</button>
+            <button type="submit" class="btn btn-lg btn-secondary register">{{ __('戻る') }}</button>
+        @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>
diff --git a/resources/views/admin/mail_templates/add.blade.php b/resources/views/admin/mail_templates/add.blade.php
index 5e24be2..0a08565 100644
--- a/resources/views/admin/mail_templates/add.blade.php
+++ b/resources/views/admin/mail_templates/add.blade.php
@@ -7,14 +7,14 @@
         <div class="container-fluid">
             <div class="row mb-2">
                 <div class="col-lg-6">
-                    <h1 class="m-0 text-dark">新規</h1>
+                    <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') }}">XX様info(ホーム)</a></li>
-                        <li class="breadcrumb-item"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li>
-                        <li class="breadcrumb-item">メール送信テンプレート</li>
-                        <li class="breadcrumb-item active">[東京都|〇〇駐輪場] メール送信テンプレート新規登録</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="{{ route('mail_templates') }}">メール送信テンプレート</a></li>
+                        <li class="breadcrumb-item active">新規登録</li>
                     </ol>
                 </div>
             </div>
diff --git a/resources/views/admin/mail_templates/edit.blade.php b/resources/views/admin/mail_templates/edit.blade.php
index 0d9952f..cf79dfa 100644
--- a/resources/views/admin/mail_templates/edit.blade.php
+++ b/resources/views/admin/mail_templates/edit.blade.php
@@ -2,11 +2,26 @@
 @section('title', '[東京都|〇〇駐輪場] メール送信テンプレート')
 
 @section('content')
-<div class="content-header">
-    <div class="container-fluid">
-        <h1 class="m-0 text-dark">メール送信テンプレート編集</h1>
+
+<!-- Content Header (Page header) -->
+    <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>
+    <!-- /.content-header -->
 <section class="content">
     <div class="container-fluid">
         <div class="card">
diff --git a/resources/views/admin/mail_templates/list.blade.php b/resources/views/admin/mail_templates/list.blade.php
index b960b50..13201f3 100644
--- a/resources/views/admin/mail_templates/list.blade.php
+++ b/resources/views/admin/mail_templates/list.blade.php
@@ -11,7 +11,7 @@
             </div>
             <div class="col-lg-6">
                 <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>
                 </ol>
             </div>
@@ -114,15 +114,17 @@
         <div class="table-responsive">
             <form action="{{ route('mail_templates_delete') }}" method="POST" id="form_delete">
                 @csrf
-                <table class="table table-bordered table-striped dataTable text-nowrap">
+                <table class="table table-bordered dataTable text-nowrap">
                     <thead>
                         <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 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=='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>BCCアドレス</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>
                         </tr>
                     </thead>
-                    <tbody>
+
+                    <tbody class="bg-white">
                     @foreach($templates as $item)
                         <tr>
-                            <td class="table-warning align-middle">
+                            <td class="align-middle" style="background-color:#faebd7;">
                                 <div class="d-flex align-items-center">
-                                    <input type="checkbox" class="minimal 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>
+                                    <input type="checkbox" class="m-0 checkbox" name="pk[]" value="{{ $item->mail_template_id }}">
+                                    <a href="{{ route('mail_templates_edit', ['id' => $item->mail_template_id]) }}" class="btn btn-sm btn-default ml-2">編集</a>
                                 </div>
                             </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>
 
-@push('scripts')
-<script>
-    // 全選択・全解除
-    document.getElementById('checkbox_all')?.addEventListener('change', function(e){
-        document.querySelectorAll('.checkbox').forEach(cb => cb.checked = e.target.checked);
-    });
+    <script>
+        document.addEventListener('DOMContentLoaded', function () {
+            document.querySelectorAll('th.sorting').forEach(function (th) {
+                th.addEventListener('click', function () {
+                    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';
 
-    // 削除確認
-    document.getElementById('delete')?.addEventListener('click', function(){
-        const anyChecked = Array.from(document.querySelectorAll('.checkbox')).some(cb => cb.checked);
-        if (!anyChecked) {
-            alert('削除対象が選択されていません。');
-            return;
-        }
-        if (confirm('削除してよろしいですか？')) {
-            document.getElementById('form_delete').submit();
-        }
-    });
+                    const newType = (currentSort === sort && currentType === 'asc') ? 'desc' : 'asc';
+                    url.searchParams.set('sort', sort);
+                    url.searchParams.set('sort_type', newType);
 
-    // ソート
-    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();
+                    window.location.href = url.toString();
+                });
+            });
         });
-    });
-</script>
-@endpush
+    </script>
+
 @endsection
diff --git a/resources/views/admin/operator_ques/_form.blade.php b/resources/views/admin/operator_ques/_form.blade.php
index 17c9e65..c1c195e 100644
--- a/resources/views/admin/operator_ques/_form.blade.php
+++ b/resources/views/admin/operator_ques/_form.blade.php
@@ -16,14 +16,7 @@
         {!! $errorMsg !!}
     </div>
 @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="row">
         @if($isEdit || $isInfo)
@@ -149,11 +142,15 @@
             </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>
-    @else
-        <button type="submit" class="btn btn-lg btn-danger register" >{{__('保存')}}</button>
-    @endIf
+
+        {{-- 下部ボタン --}}
+        @if($isEdit)
+            <button type="submit" class="btn btn-lg btn-success register">{{ __('保存') }}</button>
+            <button type="submit" class="btn btn-lg btn-secondary register">{{ __('戻る') }}</button>
+        @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>
 
diff --git a/resources/views/admin/operator_ques/add.blade.php b/resources/views/admin/operator_ques/add.blade.php
index 410c6be..23ee552 100644
--- a/resources/views/admin/operator_ques/add.blade.php
+++ b/resources/views/admin/operator_ques/add.blade.php
@@ -8,14 +8,13 @@
         <div class="container-fluid">
             <div class="row mb-2">
                 <div class="col-lg-6">
-                    <h1 class="m-0 text-dark">[東京都|〇〇駐輪場] オペレータキュー</h1>
+                    <h1 class="m-0 text-dark">新規登録</h1>
                 </div><!-- /.col -->
                 <div class="col-lg-6">
                     <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="./index3.html">[東京都|〇〇駐輪場]</a></li>
-                        <li class="breadcrumb-item">オペレータキュー</li>
-                        <li class="breadcrumb-item active">[東京都|〇〇駐輪場] オペレータキュー</li>
+                        <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
+                        <li class="breadcrumb-item"><a href="{{ route('operator_ques') }}">オペレータキュー</a></li>
+                        <li class="breadcrumb-item active">新規登録</li>
                     </ol>
                 </div><!-- /.col -->
             </div><!-- /.row -->
@@ -41,11 +40,6 @@
                 </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>
     </section>
     <!-- /.content -->
diff --git a/resources/views/admin/operator_ques/edit.blade.php b/resources/views/admin/operator_ques/edit.blade.php
index 1640c4d..a6e7089 100644
--- a/resources/views/admin/operator_ques/edit.blade.php
+++ b/resources/views/admin/operator_ques/edit.blade.php
@@ -8,14 +8,13 @@
         <div class="container-fluid">
             <div class="row mb-2">
                 <div class="col-lg-6">
-                    <h1 class="m-0 text-dark">[東京都|〇〇駐輪場] オペレータキュー</h1>
+                    <h1 class="m-0 text-dark">編集</h1>
                 </div><!-- /.col -->
                 <div class="col-lg-6">
                     <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="./index3.html">[東京都|〇〇駐輪場]</a></li>
-                        <li class="breadcrumb-item">オペレータキュー</li>
-                        <li class="breadcrumb-item active">利用者マスタ</li>
+                        <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
+                        <li class="breadcrumb-item"><a href="{{ route('operator_ques') }}">オペレータキュー</a></li>
+                        <li class="breadcrumb-item active">編集</li>
                     </ol>
                 </div><!-- /.col -->
             </div><!-- /.row -->
@@ -41,11 +40,6 @@
                 </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>
     </section>
     <!-- /.content -->
diff --git a/resources/views/admin/operator_ques/list.blade.php b/resources/views/admin/operator_ques/list.blade.php
index 1576a27..8dc88a9 100644
--- a/resources/views/admin/operator_ques/list.blade.php
+++ b/resources/views/admin/operator_ques/list.blade.php
@@ -10,7 +10,7 @@
             </div>
             <div class="col-lg-6">
                 <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>
                 </ol>
             </div>
@@ -93,11 +93,11 @@
             <div class="table-responsive">
                 <form action="{{ route('operator_ques_delete') }}" method="POST" id="form_delete">
                     @csrf
-                    <table class="table table-bordered table-striped dataTable text-nowrap">
+                    <table class="table table-bordered dataTable text-nowrap">
                         <thead>
                         <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 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>
@@ -111,13 +111,13 @@
                             <th><span>処理リンク</span></th>
                         </tr>
                         </thead>
-                        <tbody>
+                        <tbody class="bg-white">
                         @foreach($list as $item)
                             <tr>
-                                <td class="table-warning align-middle">
+                                <td class="align-middle" style="background-color:#faebd7;">
                                     <div class="d-flex align-items-center">
-                                        <input type="checkbox" class="minimal 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>
+                                        <input type="checkbox" class="m-0 checkbox" name="pk[]" value="{{ $item->que_id }}">
+                                        <a href="{{ route('operator_ques_edit', ['id' => $item->que_id]) }}" class="btn btn-sm btn-default ml10">編集</a>
                                     </div>
                                 </td>
                                 <td class="sm-item text-left align-middle">{{ $item->que_id }}</td>
diff --git a/resources/views/admin/opes/_form.blade.php b/resources/views/admin/opes/_form.blade.php
index e706760..be13bbb 100644
--- a/resources/views/admin/opes/_form.blade.php
+++ b/resources/views/admin/opes/_form.blade.php
@@ -17,15 +17,7 @@
     </div>
 @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="row">
     @if($isInfo || $isEdit)
@@ -447,12 +439,13 @@
         <!-- /.form group - 退職日 -->
 
     </div>
-
-    @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>
+    {{-- 下部ボタン --}}
+    @if($isEdit)
+        <button type="submit" class="btn btn-lg btn-success register">{{ __('保存') }}</button>
+        <button type="submit" class="btn btn-lg btn-secondary register">{{ __('戻る') }}</button>
     @else
-        <button type="submit" class="btn btn-lg btn-danger register">{{__('保存')}}</button>
-    @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>
 
diff --git a/resources/views/admin/opes/add.blade.php b/resources/views/admin/opes/add.blade.php
index 5042ad2..cb1aa0e 100644
--- a/resources/views/admin/opes/add.blade.php
+++ b/resources/views/admin/opes/add.blade.php
@@ -7,14 +7,14 @@
         <div class="container-fluid">
             <div class="row mb-2">
                 <div class="col-lg-6">
-                    <h1 class="m-0 text-dark">新規</h1>
+                    <h1 class="m-0 text-dark">新規登録</h1>
                 </div><!-- /.col -->
                 <div class="col-lg-6">
                     <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="./index3.html">[東京都|〇〇駐輪場]</a></li>
-                        <li class="breadcrumb-item">オペレータマスタ</li>
-                        <li class="breadcrumb-item active">[東京都|〇〇駐輪場] オペレータマスタ</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="{{ route('opes') }}">オペレータマスタ</a></li>
+                        <li class="breadcrumb-item active">新規登録</li>
                     </ol>
                 </div><!-- /.col -->
             </div><!-- /.row -->
diff --git a/resources/views/admin/opes/edit.blade.php b/resources/views/admin/opes/edit.blade.php
index 3b84165..208a4b2 100644
--- a/resources/views/admin/opes/edit.blade.php
+++ b/resources/views/admin/opes/edit.blade.php
@@ -11,10 +11,10 @@
                 </div><!-- /.col -->
                 <div class="col-lg-6">
                     <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="./index3.html">[東京都|〇〇駐輪場]</a></li>
-                        <li class="breadcrumb-item">オペレータマスタ</li>
-                        <li class="breadcrumb-item active">利用者マスタ</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="{{ route('opes') }}">オペレータマスタ</a></li>
+                        <li class="breadcrumb-item active">編集</li>
                     </ol>
                 </div><!-- /.col -->
             </div><!-- /.row -->
diff --git a/resources/views/admin/opes/list.blade.php b/resources/views/admin/opes/list.blade.php
index e9f912e..931bc70 100644
--- a/resources/views/admin/opes/list.blade.php
+++ b/resources/views/admin/opes/list.blade.php
@@ -10,8 +10,8 @@
             </div>
             <div class="col-lg-6">
                 <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="javascript:void(0);">[東京都|〇〇駐輪場]</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 active">オペレータマスタ</li>
                 </ol>
             </div>
@@ -66,11 +66,11 @@
             <div class="table-responsive">
                 <form action="{{ route('opes_delete') }}" method="POST" id="form_delete">
                     @csrf
-                    <table class="table table-bordered table-striped dataTable text-nowrap">
+                    <table class="table table-bordered dataTable text-nowrap">
                         <thead>
                             <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 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>
@@ -87,13 +87,13 @@
                                 <th class="sorting {{ ($sort=='ope_quitday') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="ope_quitday"><span>退職日</span></th>
                             </tr>
                         </thead>
-                        <tbody>
+                        <tbody class="bg-white">
                             @foreach($list as $item)
                                 <tr>
-                                    <td class="table-warning align-middle">
+                                    <td class="align-middle" style="background-color:#faebd7;">
                                         <div class="d-flex align-items-center">
-                                            <input type="checkbox" class="minimal 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>
+                                            <input type="checkbox" class="m-0 checkbox" name="pk[]" value="{{ $item->ope_id }}">
+                                            <a href="{{ route('opes_edit', ['id' => $item->ope_id]) }}" class="btn btn-sm btn-default ml10">編集</a>
                                         </div>
                                     </td>
                                     <td class="sm-item text-left align-middle">{{ $item->ope_id }}</td>
@@ -138,10 +138,10 @@
 
 @push('scripts')
 <script>
-    // 全選択
-    document.getElementById('checkbox_all')?.addEventListener('change', function(e){
-        document.querySelectorAll('.checkbox').forEach(cb => cb.checked = e.target.checked);
-    });
+    // // 全選択
+    // document.getElementById('checkbox_all')?.addEventListener('change', function(e){
+    //     document.querySelectorAll('.checkbox').forEach(cb => cb.checked = e.target.checked);
+    // });
 
     // 削除確認
     document.getElementById('delete')?.addEventListener('click', function(){
diff --git a/resources/views/admin/payments/_form.blade.php b/resources/views/admin/payments/_form.blade.php
index f91d145..6302703 100644
--- a/resources/views/admin/payments/_form.blade.php
+++ b/resources/views/admin/payments/_form.blade.php
@@ -6,22 +6,6 @@
 
 <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（編集/参照のみ表示、システム自動採番） --}}
   @if($isEdit || $isInfo)
     <div class="row mb-3">
@@ -193,9 +177,7 @@
     </div>
   @endif
 
-  <div class="border-top my-3"></div>
-
-  {{-- 登録・削除 ボタン（下部重ね） --}}
+  {{-- ボタン --}}
   <div class="text-left mt-2">
     @if($isInfo)
       <a href="{{ route('payments_edit', ['id' => $payment->payment_id]) }}" class="btn btn-lg btn-success">編集</a>
diff --git a/resources/views/admin/payments/add.blade.php b/resources/views/admin/payments/add.blade.php
index 03843c6..f1d364b 100644
--- a/resources/views/admin/payments/add.blade.php
+++ b/resources/views/admin/payments/add.blade.php
@@ -12,7 +12,7 @@
         <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('payments') }}">決済情報マスタ</a></li>
-          <li class="breadcrumb-item active">新規</li>
+          <li class="breadcrumb-item active">新規登録</li>
         </ol>
       </div>
     </div>
diff --git a/resources/views/admin/payments/list.blade.php b/resources/views/admin/payments/list.blade.php
index b4b5f5f..7a681d2 100644
--- a/resources/views/admin/payments/list.blade.php
+++ b/resources/views/admin/payments/list.blade.php
@@ -11,8 +11,8 @@
       </div>
       <div class="col-lg-6">
         <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="javascript:void(0);">[東京都|〇〇駐輪場]</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 active">決済情報マスタ</li>
         </ol>
       </div>
@@ -62,12 +62,12 @@
       <div class="table-responsive">
         <form action="{{ route('payments_delete') }}" method="POST" id="form_delete">
           @csrf
-          <table class="table table-bordered table-striped dataTable text-nowrap">
+          <table class="table table-bordered dataTable text-nowrap">
             <thead>
               <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 class="sorting {{ ($sort=='payment_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="payment_id">
                   <span>決済情報ID</span>
@@ -89,14 +89,14 @@
                 </th>
               </tr>
             </thead>
-            <tbody>
+            <tbody class="bg-white">
               @foreach($payments as $payment)
                 <tr>
                   {{-- 同じセルに チェック + 編集ボタン --}}
-                  <td class="table-warning align-middle">
+                  <td class="align-middle" style="background-color:#faebd7;">
                     <div class="d-flex align-items-center">
-                      <input type="checkbox" class="minimal m-0 checkbox" name="id[]" value="{{ $payment->payment_id }}">
-                      <a href="{{ route('payments_edit', ['id' => $payment->payment_id]) }}" class="btn btn-sm btn-default ml-2">編集</a>
+                      <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 ml10">編集</a>
                     </div>
                   </td>
                   <td class="sm-item text-left align-middle">{{ $payment->payment_id }}</td>
diff --git a/resources/views/admin/settings/_form.blade.php b/resources/views/admin/settings/_form.blade.php
index 73107f8..3173db6 100644
--- a/resources/views/admin/settings/_form.blade.php
+++ b/resources/views/admin/settings/_form.blade.php
@@ -11,16 +11,6 @@
   </div>
 @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="row">
 
@@ -192,10 +182,12 @@
 
 {{-- ===== 下部ボタン領域 ===== --}}
 <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
+    {{-- 下部ボタン --}}
+    @if($isEdit)
+        <button type="submit" class="btn btn-lg btn-success register">{{ __('保存') }}</button>
+        <button type="submit" class="btn btn-lg btn-secondary register">{{ __('戻る') }}</button>
+    @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>
diff --git a/resources/views/admin/settings/add.blade.php b/resources/views/admin/settings/add.blade.php
index bd44f4a..45b86f2 100644
--- a/resources/views/admin/settings/add.blade.php
+++ b/resources/views/admin/settings/add.blade.php
@@ -5,7 +5,7 @@
 <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"><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="#">ホーム</a></li>
diff --git a/resources/views/admin/settings/edit.blade.php b/resources/views/admin/settings/edit.blade.php
index b68603c..9c52f06 100644
--- a/resources/views/admin/settings/edit.blade.php
+++ b/resources/views/admin/settings/edit.blade.php
@@ -5,7 +5,7 @@
 <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"><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="#">ホーム</a></li>
diff --git a/resources/views/admin/settings/list.blade.php b/resources/views/admin/settings/list.blade.php
index 6831074..780dbc8 100644
--- a/resources/views/admin/settings/list.blade.php
+++ b/resources/views/admin/settings/list.blade.php
@@ -10,7 +10,7 @@
             </div>
             <div class="col-lg-6">
                 <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>
                 </ol>
             </div>
@@ -68,10 +68,10 @@
             <div class="table-responsive">
                 <form action="{{ route('settings_delete') }}" method="POST" id="form_delete">
                     @csrf
-                    <table class="table table-bordered table-striped dataTable text-nowrap">
+                    <table class="table table-bordered dataTable text-nowrap">
                         <thead>
                             <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);">
                             </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>
                             </tr>
                         </thead>
-                        <tbody>
+                        <tbody class="bg-white">
+                            {{-- データ表示 --}}
                             @foreach($list as $row)
                                 <tr>
-                                    <td class="table-warning align-middle">
+                                    <td class="align-middle" style="background-color:#faebd7;">
                                         <div class="d-flex align-items-center">
-                                            <input type="checkbox" class="minimal m-0 checkbox" name="id[]" value="{{ $row->setting_id }}">
-                                            <a href="{{ route('settings_edit',['id'=>$row->setting_id]) }}" class="btn btn-sm btn-default ml-2">{{ __('編集') }}</a>
+                                            <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 ml10">{{ __('編集') }}</a>
                                         </div>
                                     </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->web_master }}</td>
diff --git a/resources/views/admin/settlement_transactions/_form.blade.php b/resources/views/admin/settlement_transactions/_form.blade.php
index 7235f17..9fac302 100644
--- a/resources/views/admin/settlement_transactions/_form.blade.php
+++ b/resources/views/admin/settlement_transactions/_form.blade.php
@@ -17,16 +17,6 @@
     </div>
 @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="row">
 
@@ -216,12 +206,13 @@
 
   </div>
 
-  {{-- 下部ボタン（上部と同じ） --}}
-  @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>
+  {{-- 下部ボタン --}}
+  @if($isEdit)
+      <button type="submit" class="btn btn-lg btn-success register">{{ __('保存') }}</button>
+      <button type="submit" class="btn btn-lg btn-secondary register">{{ __('戻る') }}</button>
   @else
-      <button type="submit" class="btn btn-lg btn-danger register">{{ __('保存') }}</button>
-  @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>
diff --git a/resources/views/admin/settlement_transactions/add.blade.php b/resources/views/admin/settlement_transactions/add.blade.php
index d3615f2..edebe03 100644
--- a/resources/views/admin/settlement_transactions/add.blade.php
+++ b/resources/views/admin/settlement_transactions/add.blade.php
@@ -7,14 +7,14 @@
         <div class="container-fluid">
             <div class="row mb-2">
                 <div class="col-lg-6">
-                    <h1 class="m-0 text-dark">新規</h1>
+                    <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') }}">XX様info(ホーム)</a></li>
-                        <li class="breadcrumb-item"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</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="{{ route('settlement_transactions') }}">決済トランザクション</a></li>
-                        <li class="breadcrumb-item active">新規</li>
+                        <li class="breadcrumb-item active">新規登録</li>
                     </ol>
                 </div>
             </div>
diff --git a/resources/views/admin/settlement_transactions/edit.blade.php b/resources/views/admin/settlement_transactions/edit.blade.php
index 2194509..0952043 100644
--- a/resources/views/admin/settlement_transactions/edit.blade.php
+++ b/resources/views/admin/settlement_transactions/edit.blade.php
@@ -11,8 +11,8 @@
                 </div>
                 <div class="col-lg-6">
                     <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="javascript:void(0);">[東京都|〇〇駐輪場]</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="{{ route('settlement_transactions') }}">決済トランザクション</a></li>
                         <li class="breadcrumb-item active">編集</li>
                     </ol>
diff --git a/resources/views/admin/settlement_transactions/list.blade.php b/resources/views/admin/settlement_transactions/list.blade.php
index aebd6f6..0d1b06c 100644
--- a/resources/views/admin/settlement_transactions/list.blade.php
+++ b/resources/views/admin/settlement_transactions/list.blade.php
@@ -10,7 +10,7 @@
             </div>
             <div class="col-lg-6">
                 <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>
                 </ol>
             </div>
@@ -84,7 +84,7 @@
             <div class="table-responsive">
                 <form action="{{ route('settlement_transactions_delete') }}" method="POST" id="form_delete">
                     @csrf
-                    <table class="table table-bordered table-striped dataTable text-nowrap">
+                    <table class="table table-bordered dataTable text-nowrap">
                         <thead>
                         <tr>
                             <th style="width:140px;" class="text-left">
@@ -106,13 +106,13 @@
                             <th><span>MD5文字列</span></th>
                         </tr>
                         </thead>
-                        <tbody>
+                        <tbody class="bg-white" >
                         @foreach($transactions as $item)
                             <tr>
-                                <td class="table-warning align-middle">
+                                <td class="align-middle" style="background-color:#faebd7;">
                                     <div class="d-flex align-items-center">
                                         <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>
                                 </td>
 
diff --git a/resources/views/admin/tax/_form.blade.php b/resources/views/admin/tax/_form.blade.php
index 7cf89f3..59507bb 100644
--- a/resources/views/admin/tax/_form.blade.php
+++ b/resources/views/admin/tax/_form.blade.php
@@ -6,22 +6,6 @@
 
 <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（編集/参照のみ表示、システム自動入力） --}}
   @if($isEdit || $isInfo)
     <div class="row mb-3">
@@ -60,10 +44,7 @@
       @error('tax_day')<div class="invalid-feedback">{{ $message }}</div>@enderror
     </div>
   </div>
-
-  <div class="border-top my-3"></div>
-
-  {{-- 登録・削除 ボタン（下部重ね） --}}
+  {{-- ボタン --}}
   <div class="text-left mt-2">
     @if($isInfo)
       <a href="{{ route('tax_edit', ['id' => $tax->tax_id]) }}" class="btn btn-lg btn-success">編集</a>
diff --git a/resources/views/admin/tax/add.blade.php b/resources/views/admin/tax/add.blade.php
index 2890a18..d04975c 100644
--- a/resources/views/admin/tax/add.blade.php
+++ b/resources/views/admin/tax/add.blade.php
@@ -6,13 +6,13 @@
   <div class="container-fluid">
     <div class="row mb-2">
       <div class="col-sm-6">
-        <h1 class="m-0 text-dark">新規</h1>
+        <h1 class="m-0 text-dark">新規登録</h1>
       </div>
       <div class="col-sm-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="{{ route('tax') }}">消費税マスタ</a></li>
-          <li class="breadcrumb-item active">新規</li>
+          <li class="breadcrumb-item active">新規登録</li>
         </ol>
       </div>
     </div>
diff --git a/resources/views/admin/tax/list.blade.php b/resources/views/admin/tax/list.blade.php
index 0c008c7..b8e6410 100644
--- a/resources/views/admin/tax/list.blade.php
+++ b/resources/views/admin/tax/list.blade.php
@@ -11,8 +11,8 @@
             </div>
             <div class="col-lg-6">
                 <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="javascript:void(0);">[東京都|〇〇駐輪場]</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 active">消費税マスタ</li>
                 </ol>
             </div>
@@ -61,14 +61,14 @@
             <div class="table-responsive">
                 <form action="{{ route('tax_delete') }}" method="POST" id="form_delete">
                     @csrf
-                    <table class="table table-bordered table-striped dataTable text-nowrap">
+                    <table class="table table-bordered dataTable text-nowrap">
                         <thead>
                             <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 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>
                                 </th>
                                 <th class="sorting {{ ($sort=='tax_percent') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="tax_percent">
@@ -79,14 +79,14 @@
                                 </th>
                             </tr>
                         </thead>
-                        <tbody>
+                        <tbody class="bg-white">
                             @foreach($taxes as $tax)
                                 <tr>
                                     {{-- 同じセルに チェック + 編集ボタン --}}
-                                    <td class="table-warning align-middle">
+                                    <td class="align-middle" style="background-color:#faebd7;">
                                         <div class="d-flex align-items-center">
-                                            <input type="checkbox" class="minimal m-0 checkbox" name="id[]" value="{{ $tax->tax_id }}">
-                                            <a href="{{ route('tax_edit', ['id' => $tax->tax_id]) }}" class="btn btn-sm btn-default ml-2">編集</a>
+                                            <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 ml10">編集</a>
                                         </div>
                                     </td>
                                     <td class="sm-item text-left align-middle">{{ $tax->tax_id }}</td>