From ef4c9fe57cb6100456a42c55feba2984ea208fd7 Mon Sep 17 00:00:00 2001 From: "kin.rinzen" Date: Mon, 25 Aug 2025 20:00:10 +0900 Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/JurisdictionParkingController.php | 18 +- .../Admin/NeighborStationController.php | 119 ----- .../Controllers/Admin/StationController.php | 140 +++++ app/Models/Park.php | 13 +- .../{NeighborStation.php => Station.php} | 10 +- .../contract_allowable_cities/edit.blade.php | 2 +- .../contract_allowable_cities/list.blade.php | 101 ++-- resources/views/admin/devices/list.blade.php | 228 ++++---- .../jurisdiction_parkings/edit.blade.php | 2 +- .../jurisdiction_parkings/list.blade.php | 85 ++- .../views/admin/managers/_form.blade.php | 28 +- resources/views/admin/managers/edit.blade.php | 2 +- resources/views/admin/managers/info.blade.php | 2 +- resources/views/admin/managers/list.blade.php | 320 +++++------- .../views/admin/operator_ques/list.blade.php | 399 ++++++-------- resources/views/admin/opes/list.blade.php | 488 ++++++------------ .../views/admin/payments/_form.blade.php | 4 +- resources/views/admin/payments/edit.blade.php | 2 +- resources/views/admin/payments/list.blade.php | 93 ++-- .../views/admin/print_areas/edit.blade.php | 2 +- .../views/admin/print_areas/info.blade.php | 2 +- .../views/admin/print_areas/list.blade.php | 69 ++- .../views/admin/regular_types/_form.blade.php | 8 +- .../views/admin/regular_types/add.blade.php | 2 +- .../views/admin/regular_types/edit.blade.php | 2 +- .../views/admin/regular_types/info.blade.php | 2 +- .../views/admin/regular_types/list.blade.php | 259 ++++------ resources/views/admin/settings/list.blade.php | 270 +++++----- .../settlement_transactions/_form.blade.php | 30 +- .../settlement_transactions/edit.blade.php | 2 +- .../settlement_transactions/list.blade.php | 367 ++++++------- .../_form.blade.php | 2 +- .../add.blade.php | 6 +- .../edit.blade.php | 4 +- .../import.blade.php | 5 +- .../info.blade.php | 3 +- .../list.blade.php | 10 +- resources/views/admin/tax/_form.blade.php | 4 +- resources/views/admin/tax/edit.blade.php | 2 +- resources/views/admin/tax/list.blade.php | 86 ++- resources/views/admin/terms/_form.blade.php | 4 +- resources/views/admin/terms/edit.blade.php | 2 +- resources/views/admin/terms/list.blade.php | 94 ++-- resources/views/layouts/app.blade.php | 2 +- routes/web.php | 299 ++++++----- 45 files changed, 1612 insertions(+), 1982 deletions(-) delete mode 100644 app/Http/Controllers/Admin/NeighborStationController.php create mode 100644 app/Http/Controllers/Admin/StationController.php rename app/Models/{NeighborStation.php => Station.php} (58%) rename resources/views/admin/{neighbor_stations => stations}/_form.blade.php (97%) rename resources/views/admin/{neighbor_stations => stations}/add.blade.php (96%) rename resources/views/admin/{neighbor_stations => stations}/edit.blade.php (81%) rename resources/views/admin/{neighbor_stations => stations}/import.blade.php (59%) rename resources/views/admin/{neighbor_stations => stations}/info.blade.php (77%) rename resources/views/admin/{neighbor_stations => stations}/list.blade.php (93%) diff --git a/app/Http/Controllers/Admin/JurisdictionParkingController.php b/app/Http/Controllers/Admin/JurisdictionParkingController.php index 0b42a5e..a2f24d9 100644 --- a/app/Http/Controllers/Admin/JurisdictionParkingController.php +++ b/app/Http/Controllers/Admin/JurisdictionParkingController.php @@ -12,10 +12,15 @@ use Illuminate\Support\Facades\DB; class JurisdictionParkingController extends Controller { public function list(Request $request) - { - $list = JurisdictionParking::query()->paginate(20); - return view('admin.jurisdiction_parkings.list', compact('list')); - } +{ + + $sort = $request->input('sort', 'jurisdiction_parking_id'); + $sort_type = $request->input('sort_type', 'asc'); + + $list = JurisdictionParking::orderBy($sort, $sort_type)->paginate(20); + + return view('admin.jurisdiction_parkings.list', compact('list', 'sort', 'sort_type')); +} public function add(Request $request) { @@ -37,9 +42,9 @@ class JurisdictionParkingController extends Controller } - public function edit(Request $request, $jurisdiction_parking_id) + public function edit(Request $request, $id) { - $record = JurisdictionParking::findOrFail($jurisdiction_parking_id); + $record = JurisdictionParking::findOrFail($id); if ($request->isMethod('post')) { $validated = $request->validate([ @@ -59,6 +64,7 @@ class JurisdictionParkingController extends Controller return view('admin.jurisdiction_parkings.edit', compact('record', 'parks', 'opes')); } + public function delete(Request $request) { if ($request->has('pk')) { diff --git a/app/Http/Controllers/Admin/NeighborStationController.php b/app/Http/Controllers/Admin/NeighborStationController.php deleted file mode 100644 index b40b104..0000000 --- a/app/Http/Controllers/Admin/NeighborStationController.php +++ /dev/null @@ -1,119 +0,0 @@ -input('sort', 'station_id'); - $sort_type = $request->input('sort_type', 'asc'); - - $allowedSorts = ['station_id', 'park_id', 'station_neighbor_station', 'station_name_ruby', 'station_route_name']; - if (!in_array($sort, $allowedSorts)) { - $sort = 'station_id'; - } - - if (!in_array($sort_type, ['asc', 'desc'])) { - $sort_type = 'asc'; - } - - $stations = NeighborStation::select([ - 'station_id', - 'station_neighbor_station', - 'station_name_ruby', - 'station_route_name', - // 'station_latitude', - // 'station_longitude', - 'park_id' - ])->orderBy($sort, $sort_type)->paginate(20); - - return view('admin.neighbor_stations.list', compact('stations', 'sort', 'sort_type')); -} - - - // 新規登録画面と登録処理 - public function add(Request $request) - { - if ($request->isMethod('post')) { - $validated = $request->validate([ - 'station_neighbor_station' => 'required|string|max:255', - 'station_name_ruby' => 'nullable|string|max:255', - 'station_route_name' => 'nullable|string|max:255', - 'park_id' => 'nullable|integer', - 'operator_id' => 'nullable|integer', - ]); - - NeighborStation::create($validated); - return redirect()->route('neighbor_stations')->with('success', '近傍駅が登録されました'); - } - - return view('admin.neighbor_stations.add'); - } - - // 編集画面・更新処理 - public function edit(Request $request, $id) - { - $station = NeighborStation::findOrFail($id); - - if ($request->isMethod('post')) { - $validated = $request->validate([ - 'station_neighbor_station' => 'required|string|max:255', - 'station_name_ruby' => 'nullable|string|max:255', - 'station_route_name' => 'nullable|string|max:255', - 'park_id' => 'nullable|integer', - 'operator_id' => 'nullable|integer', - ]); - - $station->update($validated); - return redirect()->route('neighbor_stations')->with('success', '更新しました'); - } - - return view('admin.neighbor_stations.edit', compact('station')); - } - - // 詳細表示 - public function info($id) - { - $station = NeighborStation::findOrFail($id); - return view('admin.neighbor_stations.info', compact('station')); - } - - // 削除処理 - public function delete(Request $request) - { - $ids = $request->input('pk'); // ← 接收复数 checkbox 名称 pk[] - - if (!empty($ids)) { - NeighborStation::destroy($ids); // 一次性删除多个 - return redirect()->route('neighbor_stations')->with('success', '削除しました'); - } - - return redirect()->route('neighbor_stations')->with('error', '削除対象が見つかりません'); - } - - - // CSVインポート（仮） - public function import(Request $request) - { - // TODO: 実装 - return redirect()->route('neighbor_stations')->with('info', 'CSVインポートは未実装です'); - } - - // CSVエクスポート（仮） - public function export() - { - // TODO: 実装 - return response()->streamDownload(function () { - echo "id,station_neighbor_station,station_name_ruby,station_route_name,park_id,operator_id\n"; - foreach (NeighborStation::all() as $station) { - echo "{$station->id},{$station->station_neighbor_station},{$station->station_name_ruby},{$station->station_route_name},{$station->park_id},{$station->operator_id}\n"; - } - }, 'neighbor_stations.csv'); - } -} diff --git a/app/Http/Controllers/Admin/StationController.php b/app/Http/Controllers/Admin/StationController.php new file mode 100644 index 0000000..beeb510 --- /dev/null +++ b/app/Http/Controllers/Admin/StationController.php @@ -0,0 +1,140 @@ +input('sort', 'station_id'); + $sort_type = $request->input('sort_type', 'asc'); + + // 許可されたソート項目のみ + $allowedSorts = [ + 'station_id', + 'park_id', + 'station_neighbor_station', + 'station_name_ruby', + 'station_route_name' + ]; + if (!in_array($sort, $allowedSorts)) { + $sort = 'station_id'; + } + + if (!in_array($sort_type, ['asc', 'desc'])) { + $sort_type = 'asc'; + } + + // 必要カラムのみ取得 + $stations = Station::select([ + 'station_id', + 'station_neighbor_station', + 'station_name_ruby', + 'station_route_name', + 'park_id', + 'operator_id' + ])->orderBy($sort, $sort_type)->paginate(20); + + return view('admin.stations.list', compact('stations', 'sort', 'sort_type')); + } + + /** + * 新規登録 + */ + public function add(Request $request) + { + if ($request->isMethod('post')) { + $validated = $request->validate([ + 'station_neighbor_station' => 'required|string|max:255', + 'station_name_ruby' => 'nullable|string|max:255', + 'station_route_name' => 'nullable|string|max:255', + 'park_id' => 'nullable|integer', + 'operator_id' => 'nullable|integer', + ]); + + Station::create($validated); + return redirect()->route('stations')->with('success', '近傍駅が登録されました'); + } + + return view('admin.stations.add'); + } + + /** + * 編集 + */ + public function edit(Request $request, $id) + { + $station = Station::findOrFail($id); + + if ($request->isMethod('post')) { + $validated = $request->validate([ + 'station_neighbor_station' => 'required|string|max:255', + 'station_name_ruby' => 'nullable|string|max:255', + 'station_route_name' => 'nullable|string|max:255', + 'park_id' => 'nullable|integer', + 'operator_id' => 'nullable|integer', + ]); + + $station->update($validated); + return redirect()->route('stations')->with('success', '更新しました'); + } + + return view('admin.stations.edit', compact('station')); + } + + /** + * 詳細 + */ + public function info($id) + { + $station = Station::findOrFail($id); + return view('admin.stations.info', compact('station')); + } + + /** + * 削除 + */ + public function delete(Request $request) + { + $ids = $request->input('pk'); // 複数ID対応 + + if (!empty($ids)) { + Station::destroy($ids); + return redirect()->route('stations')->with('success', '削除しました'); + } + + return redirect()->route('stations')->with('error', '削除対象が見つかりません'); + } + + /** + * CSVインポート（仮） + */ + public function import(Request $request) + { + // TODO: 実装予定 + return redirect()->route('stations')->with('info', 'CSVインポートは未実装です'); + } + + /** + * CSVエクスポート + */ + public function export() + { + return response()->streamDownload(function () { + // Excel用のUTF-8 BOM + echo "\xEF\xBB\xBF"; + echo "station_id,station_neighbor_station,station_name_ruby,station_route_name,park_id,operator_id\n"; + + foreach (Station::all() as $station) { + echo "{$station->station_id},{$station->station_neighbor_station},{$station->station_name_ruby},{$station->station_route_name},{$station->park_id},{$station->operator_id}\n"; + } + }, 'stations.csv'); + } +} diff --git a/app/Models/Park.php b/app/Models/Park.php index 7b0368e..97f3c2b 100644 --- a/app/Models/Park.php +++ b/app/Models/Park.php @@ -39,6 +39,15 @@ class Park extends Model { return $this->hasMany(PriceA::class, 'park_id', 'park_id'); } + + /** + * 駐輪場一覧を取得（セレクトボックス用） + * 旧 getList() 呼び出し互換 + * @return \Illuminate\Support\Collection + */ + public static function getList() + { + return self::orderBy('park_id', 'asc') + ->pluck('park_name', 'park_id'); + } } - - diff --git a/app/Models/NeighborStation.php b/app/Models/Station.php similarity index 58% rename from app/Models/NeighborStation.php rename to app/Models/Station.php index 914312e..b10b994 100644 --- a/app/Models/NeighborStation.php +++ b/app/Models/Station.php @@ -4,15 +4,11 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; -class NeighborStation extends Model +class Station extends Model { - // テーブル名を指定 protected $table = 'station'; - - // 主キーを指定 protected $primaryKey = 'station_id'; - // ホワイトリスト protected $fillable = [ 'park_id', 'station_neighbor_station', @@ -20,6 +16,4 @@ class NeighborStation extends Model 'station_route_name', 'operator_id', ]; - - // タイムスタンプのカラム名がデフォルトと同じなので、特に設定不要 -} \ No newline at end of file +} diff --git a/resources/views/admin/contract_allowable_cities/edit.blade.php b/resources/views/admin/contract_allowable_cities/edit.blade.php index 98af0a0..a7063ed 100644 --- a/resources/views/admin/contract_allowable_cities/edit.blade.php +++ b/resources/views/admin/contract_allowable_cities/edit.blade.php @@ -21,7 +21,7 @@
-
+ @csrf
{{-- 契約許容市区マスタID --}} diff --git a/resources/views/admin/contract_allowable_cities/list.blade.php b/resources/views/admin/contract_allowable_cities/list.blade.php index ce2d959..78796b0 100644 --- a/resources/views/admin/contract_allowable_cities/list.blade.php +++ b/resources/views/admin/contract_allowable_cities/list.blade.php @@ -2,6 +2,7 @@ @section('title', '[東京都|〇〇駐輪場] 契約許容市区マスタ') @section('content') +
@@ -10,8 +11,8 @@
    -
  1. ホーム
    2. -
  2. [東京都|〇〇駐輪場]
    3. +
  3. ホーム
    4. +
  4. [東京都|〇〇駐輪場]
  5. 契約許容市区マスタ
@@ -19,10 +20,10 @@
+
-
-
- +
+

絞り込み

@@ -71,80 +72,62 @@
+ - +
- {{ $list->appends(['sort' => $sort,'sort_type'=>$sort_type])->links('pagination') }} +
+ {{ $list->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }} +
- -
- -
+ +
+
@csrf - +
- - - + + + + + + + + - @foreach($list as $item) - - + - - @endforeach + + + + + + + + @endforeach
+ + 契約許容市区ID市区ID許容市区名駐輪場ID隣接区フラグ
-
- -
- 編集 + @foreach($list as $item) +
+
+ + {{ __('編集') }}
- -
{{ $item->contract_allowable_city_id }}{{ $item->city_id }}{{ $item->contract_allowable_city_name }}{{ $item->park_id }}{{ $item->same_district_flag == 0 ? '隣接市' : 'その他' }}
- - -
-
- - - - - - - - - - - - @foreach($list as $item) - - - - - - - - @endforeach - -
- 契約許容市区ID - 市区ID許容市区名駐輪場ID隣接区フラグ
{{ $item->contract_allowable_city_id }}{{ $item->city_id }}{{ $item->contract_allowable_city_name }}{{ $item->park_id }}{{ $item->same_district_flag == 0 ? '隣接市' : 'その他' }}
-
-
+
-
@endpush @endsection diff --git a/resources/views/admin/jurisdiction_parkings/edit.blade.php b/resources/views/admin/jurisdiction_parkings/edit.blade.php index 561cb57..2c9a002 100644 --- a/resources/views/admin/jurisdiction_parkings/edit.blade.php +++ b/resources/views/admin/jurisdiction_parkings/edit.blade.php @@ -21,7 +21,7 @@
-
+ @csrf
{{-- 管轄駐輪場ID（表示のみ） --}} diff --git a/resources/views/admin/jurisdiction_parkings/list.blade.php b/resources/views/admin/jurisdiction_parkings/list.blade.php index 012695c..f67cae9 100644 --- a/resources/views/admin/jurisdiction_parkings/list.blade.php +++ b/resources/views/admin/jurisdiction_parkings/list.blade.php @@ -1,5 +1,5 @@ @extends('layouts.app') -@section('title', '[東京都|○○駐車場] 管轄駐輪場') +@section('title', '[東京都|〇〇駐輪場] 管轄駐輪場マスタ') @section('content') @@ -12,28 +12,36 @@
  1. XX様info(ホーム)
    2. -
  2. 管轄駐輪場
    3. +
  3. [東京都|〇〇駐輪場]
    4. +
  4. 管轄駐輪場マスタ
+
+ {{-- 並び替え用 hidden --}} @csrf -
- - - - {{ $list->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }} +
+
+ + + +
+
+ {{ $list->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }} +
+
@if(session('success'))
{{ session('success') }}
@@ -42,41 +50,20 @@ @endif
-
- -
+ +
+
@csrf - +
- - - - - @foreach($list as $item) - - - - @endforeach - -
- -
- 編集 -
-
-
-
- - -
-
- - - - - + {{-- ★ チェック + 編集 用の1列 --}} + + + @@ -84,19 +71,29 @@ @foreach($list as $item) - - - - + {{-- ★ チェック + 編集ボタン --}} + + + + + + @endforeach
管轄駐輪場ID管轄名 + + 管轄駐輪場ID管轄名 オペレーター（エリアマネージャ） 駐車場
{{ $item->jurisdiction_parking_id }}{{ $item->jurisdiction_parking_name }}{{ $item->ope->ope_name ?? '' }}{{ $item->park->park_name ?? '' }} +
+ + {{ __('編集') }} +
+ 		{{ $item->jurisdiction_parking_id }}{{ $item->jurisdiction_parking_name }}{{ $item->ope->ope_name ?? '' }}{{ $item->park->park_name ?? '' }}
-
+
+
-@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/managers/_form.blade.php b/resources/views/admin/managers/_form.blade.php index e2edd9a..47ee948 100644 --- a/resources/views/admin/managers/_form.blade.php +++ b/resources/views/admin/managers/_form.blade.php @@ -27,7 +27,7 @@
@if($isInfo) {{ __('登録') }} - {{ __('編集') }} + {{ __('編集') }} @else - - {{ $list->appends(['sort' => $sort, 'sort_type' => $sort_type])->links('pagination') }} -
- -
- @if(Session::has('success')) - - @elseif(Session::has('error')) -
- -

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

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

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

- {!! $errorMsg !!} -
- @endif -
- -
- {{-- 左：チェック＆操作 --}} -
-
- @csrf - - - - - - - - @foreach($list as $item) - - - - @endforeach - -
- -
- -
- {{-- 詳細 --}} - {{ __('編集') }} -
-
-
-
- - {{-- 右：一覧テーブル --}} -
-
- - - - {{-- 駐車場管理者ID --}} - - - {{-- 駐車場管理者名 --}} - - - {{-- 種別 --}} - - - {{-- 所属駐車場ID --}} - - - {{-- 管理デバイス1/2 --}} - - - - {{-- メール --}} - - - {{-- 電話 --}} - - - {{-- アラート1（★sort 修正済） --}} - - - {{-- アラート2 --}} - - - {{-- 退職フラグ --}} - - - {{-- 退職日 --}} - - - - - - @foreach($list as $item) - - - - - - - - - - - - - - - @endforeach - - -
{{ __('validation.attributes.manager_id') }}{{ __('validation.attributes.manager_name') }}{{ __('validation.attributes.manager_type') }}{{ __('validation.attributes.manager_parkid') }}{{ __('validation.attributes.manager_device1') }}{{ __('validation.attributes.manager_device2') }}{{ __('validation.attributes.manager_mail') }}{{ __('validation.attributes.manager_tel') }}{{ __('validation.attributes.manager_alert1') }}{{ __('validation.attributes.manager_alert2') }}{{ __('validation.attributes.manager_quit_flag') }}{{ __('validation.attributes.manager_quitday') }}
- {{ mb_substr($item->manager_id, 0, 10) }} - - {{ mb_substr($item->manager_name, 0, 10) }} - - {{ mb_substr($item->manager_type, 0, 10) }} - - {{ mb_substr(!empty($item->getPark()) ? $item->getPark()->park_name : "", 0, 10) }} - - {{ mb_substr(!empty($item->getDevice1()) ? $item->getDevice1()->device_subject : "", 0, 10) }} - - {{ mb_substr(!empty($item->getDevice2()) ? $item->getDevice2()->device_subject : "", 0, 10) }} - - {{ mb_substr($item->manager_mail, 0, 20) }} - - {{ mb_substr($item->manager_tel, 0, 20) }} - - {{ mb_substr($item->manager_alert1, 0, 20) }} - - {{ mb_substr($item->manager_alert2, 0, 20) }} - - {{ $item->getManagerQuitFlagDisplay() }} - - @if($item->manager_quitday) - - {{ mb_substr($item->manager_quitday, 0, 10) }} - - @endif -
-
-
-
+ +
+
+ {{-- 並び替え用 hidden --}} +
+ @csrf + + +
+ +
+ + + +
+ {{ $list->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }}
-
- + +
+ @if(Session::has('success')) + + @elseif(Session::has('error')) +
+ +

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

+ {!! Session::get('error') !!} +
+ @endif +
+ + +
+
+
+ @csrf + + + + {{-- ★ チェック + 編集ボタン列 --}} + + + + + + + + + + + + + + + + + @foreach($list as $item) + + {{-- チェック＋編集ボタン --}} + + + + + + + + + + + + + + + @endforeach + +
+ + 駐輪場管理者ID駐輪場管理者名種別所属駐車場ID管理デバイス1管理デバイス2メール電話アラート1アラート2退職フラグ退職日
+
+ + {{ __('編集') }} +
+ 		{{ $item->manager_id }}{{ $item->manager_name }}{{ $item->manager_type }}{{ !empty($item->getPark()) ? $item->getPark()->park_name : '' }}{{ !empty($item->getDevice1()) ? $item->getDevice1()->device_subject : '' }}{{ !empty($item->getDevice2()) ? $item->getDevice2()->device_subject : '' }}{{ $item->manager_mail }}{{ $item->manager_tel }}{{ $item->manager_alert1 }}{{ $item->manager_alert2 }}{{ $item->getManagerQuitFlagDisplay() }} + @if($item->manager_quitday) + + + {{ mb_substr($item->manager_quitday, 0, 10) }} + + @endif +
+
+
+
+ +
+
+ +
+ + @endsection diff --git a/resources/views/admin/operator_ques/list.blade.php b/resources/views/admin/operator_ques/list.blade.php index f1b0ed8..1576a27 100644 --- a/resources/views/admin/operator_ques/list.blade.php +++ b/resources/views/admin/operator_ques/list.blade.php @@ -1,238 +1,183 @@ @extends('layouts.app') @section('title', '[東京都|〇〇駐輪場] オペレータキュー') + @section('content') -
-
-
-
-

{{__('オペレータキュー')}}

-
-
-
    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. -
  3. {{__('オペレータキュー')}}
    4. -
-
-
-
-
- - - -
- -
-
-

絞り込みフィルター

-
-
- @csrf - - - -
-
- - -
-
- -
- - -
-
-
+
+
+
+
+

オペレータキュー

+
+
+
    +
  1. XX様info(ホーム)
    2. +
  2. オペレータキュー
    3. +
+
+
+
+ +
+
+

絞り込みフィルター

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

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

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

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

- {!! $errorMsg !!} -
- @endif -
-
-
-
- - - - - - - - - @foreach($list as $item) - - - - - - @endforeach - -
- -
- -
- {{-- 詳細 --}} - {{-- 詳細 --}} - - {{-- 編集 --}} - {{ __('編集') }} -
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @foreach($list as $item) - - - - - - - - - - - - - - - - - - - - - - - - - - - - @endforeach - -
{{__('validation.attributes.que_id')}} - {{__('validation.attributes.user_name')}} - {{__('validation.attributes.user_mobile')}}{{__('validation.attributes.user_homephone')}}{{__('validation.attributes.park_name')}} - {{__('validation.attributes.que_class')}} - {{__('validation.attributes.que_comment')}} - {{__('validation.attributes.que_status')}} - {{__('validation.attributes.que_status_comment')}}{{__('validation.attributes.processing')}} -
- {{mb_substr($item->que_id, 0, 10)}} - {{mb_substr(!empty($item->getUser())?$item->getUser()->user_name:"", 0, 10)}} - {{mb_substr(!empty($item->getUser())?$item->getUser()->user_mobile:"", 0, 15)}} - {{mb_substr(!empty($item->getUser())?$item->getUser()->user_homephone:"", 0, 15)}} - {{mb_substr(!empty($item->getPark())?$item->getPark()->park_name:"", 0, 10)}} - {{ mb_substr($item->getQueClassLabel(), 0, 10) }} - - {{ mb_substr($item->que_comment, 0, 20) }} - - {{ mb_substr($item->getQueStatusLabel(), 0, 10) }} - - {{mb_substr($item->que_status_comment, 0, 20)}}
-
-
-
-
- -
-
- +
+
+ -@endsection \ No newline at end of file +
+ +
+ + + +
+ {{ $list->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }} +
+
+ + + +
+ @if(Session::has('success')) + + @elseif(Session::has('error')) +
+ +

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

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

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

+ {!! $errorMsg !!} +
+ @endif +
+ + + +
+
+
+ @csrf + + + + + + + + + + + + + + + + + + @foreach($list as $item) + + + + + + + + + + + + + + @endforeach + +
+ + キューID利用者名携帯電話番号自宅電話番号駐輪場キュー種別キューコメントキューステータスキューステータスコメント処理リンク
+
+ + 編集 +
+ 		{{ $item->que_id }}{{ !empty($item->getUser()) ? $item->getUser()->user_name : '' }}{{ !empty($item->getUser()) ? $item->getUser()->user_mobile : '' }}{{ !empty($item->getUser()) ? $item->getUser()->user_homephone : '' }}{{ !empty($item->getPark()) ? $item->getPark()->park_name : '' }}{{ $item->getQueClassLabel() }}{{ $item->que_comment }}{{ $item->getQueStatusLabel() }}{{ $item->que_status_comment }}
+
+
+
+ +
+
+ +
+ +@push('scripts') + +@endpush +@endsection diff --git a/resources/views/admin/opes/list.blade.php b/resources/views/admin/opes/list.blade.php index fa8d9fc..e9f912e 100644 --- a/resources/views/admin/opes/list.blade.php +++ b/resources/views/admin/opes/list.blade.php @@ -1,320 +1,176 @@ @extends('layouts.app') @section('title', '[東京都|〇〇駐輪場] オペレータマスタ') + @section('content') -
-
-
-
-

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

-
-
-
    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. -
  3. {{__('オペレータマスタ')}}
    4. -
-
-
-
-
- - - -
-
-
-
- @csrf - - -
- -
- - - - - - {{ $list->appends(['sort' => $sort,'sort_type'=>$sort_type])->links('pagination') }} -
- - -
- @if(Session::has('success')) - - @elseif(Session::has('error')) -
- -

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

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

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

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

オペレータマスタ

-
-
- -@endsection \ No newline at end of file +
+
    +
  1. XX様info(ホーム)
    2. +
  2. [東京都|〇〇駐輪場]
    3. +
  3. オペレータマスタ
    4. +
+
+ + + + +
+
+ {{-- 並び替え用 hidden --}} +
+ @csrf + + +
+ + +
+ + + + +
+ {{ $list->appends(['sort' => $sort, 'sort_type' => $sort_type])->links('pagination') }} +
+
+ + +
+ @if(Session::has('success')) + + @elseif(Session::has('error')) +
+ +

エラー:

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

エラー:

+ {!! $errorMsg !!} +
+ @endif +
+ + +
+
+
+ @csrf + + + + + + + + + + + + + + + + + + + + + @foreach($list as $item) + + + + + + + + + + + + + + + + + @endforeach + +
+ + オペレータIDオペレータ名パスワードオペレータ種別メールアドレス電話番号キュー1~13アラート送信管理者権限エリアマネージャーエリアオペレーターオペレーター権限退職フラグ退職日
+
+ + 編集 +
+ 		{{ $item->ope_id }}{{ $item->ope_name }}{{ $item->ope_pass }}{{ \App\Models\Ope::OPE_TYPE[$item->ope_type] }}{{ $item->ope_mail }}{{ $item->ope_phone }} + {{ $item->ope_sendalart_que1 ? 'はい' : 'いいえ' }} / + {{ $item->ope_sendalart_que2 ? 'はい' : 'いいえ' }} / + {{ $item->ope_sendalart_que3 ? 'はい' : 'いいえ' }} / + {{ $item->ope_sendalart_que4 ? 'はい' : 'いいえ' }} / + {{ $item->ope_sendalart_que5 ? 'はい' : 'いいえ' }} / + {{ $item->ope_sendalart_que6 ? 'はい' : 'いいえ' }} / + {{ $item->ope_sendalart_que7 ? 'はい' : 'いいえ' }} / + {{ $item->ope_sendalart_que8 ? 'はい' : 'いいえ' }} / + {{ $item->ope_sendalart_que9 ? 'はい' : 'いいえ' }} / + {{ $item->ope_sendalart_que10 ? 'はい' : 'いいえ' }} / + {{ $item->ope_sendalart_que11 ? 'はい' : 'いいえ' }} / + {{ $item->ope_sendalart_que12 ? 'はい' : 'いいえ' }} / + {{ $item->ope_sendalart_que13 ? 'はい' : 'いいえ' }} + {{ $item->ope_auth1 }}{{ $item->ope_auth2 }}{{ $item->ope_auth3 }}{{ $item->ope_auth4 }}{{ $item->ope_quit_flag ? '退職' : '在籍中' }}{{ $item->ope_quitday }}
+
+
+
+ +
+
+ +
+ +@push('scripts') + +@endpush +@endsection diff --git a/resources/views/admin/payments/_form.blade.php b/resources/views/admin/payments/_form.blade.php index 3880060..f91d145 100644 --- a/resources/views/admin/payments/_form.blade.php +++ b/resources/views/admin/payments/_form.blade.php @@ -9,7 +9,7 @@ {{-- 登録・削除 ボタン（上部） --}}
@if($isInfo) - 編集 + 編集 @else @if($isEdit) @@ -198,7 +198,7 @@ {{-- 登録・削除 ボタン（下部重ね） --}}
@if($isInfo) - 編集 + 編集 @else @if($isEdit) diff --git a/resources/views/admin/payments/edit.blade.php b/resources/views/admin/payments/edit.blade.php index 7ecf7e3..97d6c18 100644 --- a/resources/views/admin/payments/edit.blade.php +++ b/resources/views/admin/payments/edit.blade.php @@ -21,7 +21,7 @@
-
+ @csrf @include('admin.payments._form', [ 'payment' => $payment, diff --git a/resources/views/admin/payments/list.blade.php b/resources/views/admin/payments/list.blade.php index df2b7f1..b4b5f5f 100644 --- a/resources/views/admin/payments/list.blade.php +++ b/resources/views/admin/payments/list.blade.php @@ -1,5 +1,5 @@ @extends('layouts.app') -@section('title', '決済情報マスタ') +@section('title', '[東京都|〇〇駐輪場] 決済情報マスタ') @section('content') @@ -24,60 +24,51 @@
- {{-- 一覧のソート用（既存規約踏襲） --}} + {{-- 並び替え用 hidden --}} @csrf +
- {{ $payments->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }} + +
+ {{ $payments->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }} +
-
- @if(session('success')) -
{{ session('success') }}
- @elseif(session('error')) -
{{ session('error') }}
+ +
+ @if(Session::has('success')) + + @elseif(Session::has('error')) +
+ +

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

+ {!! Session::get('error') !!} +
@endif
-
- -
+ +
+
@csrf - - - - - - - - @foreach($payments as $payment) - - - - @endforeach - -
- -
- 編集 -
-
-
-
- - -
-
- +
+ {{-- チェック + 編集 --}} + @@ -101,26 +92,34 @@ @foreach($payments as $payment) - - - - - - + {{-- 同じセルに チェック + 編集ボタン --}} + + + + + + + @endforeach
+ + 決済情報ID
{{ $payment->payment_id }}{{ $payment->payment_companyname }}{{ $payment->payment_inquirytel }}{{ $payment->payment_inquiryname }}{{ $payment->payment_time }}{{ optional($payment->updated_at)->format('Y-m-d H:i') }} +
+ + 編集 +
+ 		{{ $payment->payment_id }}{{ $payment->payment_companyname }}{{ $payment->payment_inquirytel }}{{ $payment->payment_inquiryname }}{{ $payment->payment_time }}{{ optional($payment->updated_at)->format('Y-m-d H:i') }}
-
+
-
+ +
-{{-- 一括削除 & ソートのJS（既存規約に合わせ最小限） --}} +{{-- 一括削除 & ソートのJS --}} @push('scripts') @endpush @endsection diff --git a/resources/views/admin/settlement_transactions/_form.blade.php b/resources/views/admin/settlement_transactions/_form.blade.php index 5d92a80..7235f17 100644 --- a/resources/views/admin/settlement_transactions/_form.blade.php +++ b/resources/views/admin/settlement_transactions/_form.blade.php @@ -20,7 +20,7 @@
@if($isInfo) {{ __('登録') }} - {{ __('編集') }} @else @@ -33,7 +33,7 @@ {{-- 決済トランザクションID（編集/参照のみ） --}} @if($isInfo || $isEdit)
- +
@@ -48,7 +48,7 @@ {{-- 定期契約ID --}}
- +
@@ -62,7 +62,7 @@ {{-- ステータス --}}
- +
@@ -76,7 +76,7 @@ {{-- 支払いコード --}}
- +
@@ -90,7 +90,7 @@ {{-- 受付番号 --}}
- +
@@ -104,7 +104,7 @@ {{-- 企業コード --}}
- +
@@ -118,7 +118,7 @@ {{-- MMS予約照会日時 --}}
- +
@@ -132,7 +132,7 @@ {{-- CVS本部コード --}}
- +
@@ -146,7 +146,7 @@ {{-- 店舗コード --}}
- +
@@ -160,7 +160,7 @@ {{-- 入金日時（DBはdatetime。画面はdateで日付入力を想定） --}}
- +
@@ -174,7 +174,7 @@ {{-- 決済金額 --}}
- +
@@ -188,7 +188,7 @@ {{-- 印紙貼付フラグ --}}
- +
@@ -202,7 +202,7 @@ {{-- MD5ハッシュ値 --}}
- +
@@ -219,7 +219,7 @@ {{-- 下部ボタン（上部と同じ） --}} @if($isInfo) {{ __('登録') }} - {{ __('編集') }} @else diff --git a/resources/views/admin/settlement_transactions/edit.blade.php b/resources/views/admin/settlement_transactions/edit.blade.php index c9559cd..2194509 100644 --- a/resources/views/admin/settlement_transactions/edit.blade.php +++ b/resources/views/admin/settlement_transactions/edit.blade.php @@ -28,7 +28,7 @@
-
+ @csrf @include('admin.settlement_transactions._form', [ 'transaction' => $transaction, diff --git a/resources/views/admin/settlement_transactions/list.blade.php b/resources/views/admin/settlement_transactions/list.blade.php index e1d4afb..50a23cd 100644 --- a/resources/views/admin/settlement_transactions/list.blade.php +++ b/resources/views/admin/settlement_transactions/list.blade.php @@ -2,228 +2,179 @@ @section('title', '[東京都|〇〇駐輪場] 決済トランザクション') @section('content') -
-
-
-
-

{{ __('決済トランザクション') }}

-
-
-
    -
  1. {{ __('ホーム') }}
    2. -
  2. {{ __('決済トランザクション') }}
    3. -
-
+
+
+
+
+

決済トランザクション

+
+
+
    +
  1. XX様info(ホーム)
    2. +
  2. 決済トランザクション
    3. +
- +
-
- -
-
-

絞り込みフィルター

-
- - @csrf - - - -
-
- - -
-
- -
- - -
- -
-
-
-
- -
- {{-- ソート保持用 --}} +
+ +
+
+

絞り込みフィルター

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

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

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

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

- {!! $errorMsg !!} -
- @endif -
- -
- {{-- 左：チェック＆操作 --}} -
-
- @csrf - - - - - - - - @foreach($transactions as $item) - - - - @endforeach - -
- -
- -
- {{ __('編集') }} -
-
-
-
- - {{-- 右：データ一覧 --}} -
-
- - - - - - - - - - - - - - - - - - - - @foreach($transactions as $item) - - - - - - - - - - - - - - - - @endforeach - -
- {{ __('validation.attributes.settlement_transaction_id') }} - - {{ __('validation.attributes.contract_id') }} - - {{ __('validation.attributes.status') }} - {{ __('validation.attributes.pay_code') }}{{ __('validation.attributes.contract_payment_number') }} - {{ __('validation.attributes.corp_code') }} - - {{ __('validation.attributes.mms_date') }} - - {{ __('validation.attributes.cvs_code') }} - - {{ __('validation.attributes.shop_code') }} - - {{ __('validation.attributes.pay_date') }} - {{ __('validation.attributes.settlement_amount') }}{{ __('validation.attributes.stamp_flag') }}{{ __('validation.attributes.md5_string') }}
{{ $item->settlement_transaction_id }}{{ $item->contract_id }}{{ $item->status }}{{ $item->pay_code }}{{ $item->contract_payment_number }}{{ $item->corp_code }}{{ $item->mms_date }}{{ $item->cvs_code }}{{ $item->shop_code }}{{ optional($item->pay_date)->format('Y-m-d H:i') }}{{ $item->settlement_amount }}{{ $item->stamp_flag }}{{ $item->md5_string }}
-
-
- -
-
-
+
+
+ +
+ + + +
+ {{ $transactions->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }} +
+
- @push('scripts') - - @endpush + }); + +@endpush @endsection diff --git a/resources/views/admin/neighbor_stations/_form.blade.php b/resources/views/admin/stations/_form.blade.php similarity index 97% rename from resources/views/admin/neighbor_stations/_form.blade.php rename to resources/views/admin/stations/_form.blade.php index 7018159..4397bbc 100644 --- a/resources/views/admin/neighbor_stations/_form.blade.php +++ b/resources/views/admin/stations/_form.blade.php @@ -12,7 +12,7 @@ @endif
- 戻る + 戻る
diff --git a/resources/views/admin/neighbor_stations/add.blade.php b/resources/views/admin/stations/add.blade.php similarity index 96% rename from resources/views/admin/neighbor_stations/add.blade.php rename to resources/views/admin/stations/add.blade.php index 09b488b..923d74e 100644 --- a/resources/views/admin/neighbor_stations/add.blade.php +++ b/resources/views/admin/stations/add.blade.php @@ -11,7 +11,7 @@
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. +
  3. [東京都|〇〇駐輪場]
  4. [東京都|〇〇駐輪場] 近傍駅マスタ
@@ -23,7 +23,7 @@
-
+ @csrf @@ -113,7 +113,7 @@ @csrf diff --git a/resources/views/admin/neighbor_stations/edit.blade.php b/resources/views/admin/stations/edit.blade.php similarity index 81% rename from resources/views/admin/neighbor_stations/edit.blade.php rename to resources/views/admin/stations/edit.blade.php index 23ab854..280f238 100644 --- a/resources/views/admin/neighbor_stations/edit.blade.php +++ b/resources/views/admin/stations/edit.blade.php @@ -27,9 +27,9 @@
- + @csrf - @include('admin.neighbor_stations._form', ['isEdit' => 1, 'isInfo' => 0, 'station' => $station]) + @include('admin.stations._form', ['isEdit' => 1, 'isInfo' => 0, 'station' => $station])
diff --git a/resources/views/admin/neighbor_stations/import.blade.php b/resources/views/admin/stations/import.blade.php similarity index 59% rename from resources/views/admin/neighbor_stations/import.blade.php rename to resources/views/admin/stations/import.blade.php index 70b0591..4ce8c45 100644 --- a/resources/views/admin/neighbor_stations/import.blade.php +++ b/resources/views/admin/stations/import.blade.php @@ -1,10 +1,9 @@ -{{-- resources/views/admin/neighbor_stations/import.blade.php --}} @extends('layouts.admin') @section('content')

近傍駅 インポート

-
+ @csrf
@@ -13,5 +12,5 @@ -戻る +戻る @endsection diff --git a/resources/views/admin/neighbor_stations/info.blade.php b/resources/views/admin/stations/info.blade.php similarity index 77% rename from resources/views/admin/neighbor_stations/info.blade.php rename to resources/views/admin/stations/info.blade.php index e9571ec..7197f5b 100644 --- a/resources/views/admin/neighbor_stations/info.blade.php +++ b/resources/views/admin/stations/info.blade.php @@ -1,4 +1,3 @@ -{{-- resources/views/admin/neighbor_stations/info.blade.php --}} @extends('layouts.admin') @section('content') @@ -21,5 +20,5 @@

{{ $station->operator_id }}

-戻る +戻る @endsection diff --git a/resources/views/admin/neighbor_stations/list.blade.php b/resources/views/admin/stations/list.blade.php similarity index 93% rename from resources/views/admin/neighbor_stations/list.blade.php rename to resources/views/admin/stations/list.blade.php index 6e02252..929887c 100644 --- a/resources/views/admin/neighbor_stations/list.blade.php +++ b/resources/views/admin/stations/list.blade.php @@ -24,14 +24,14 @@
{{-- 並び替え用 hidden --}} -
+ @csrf
- +
@@ -65,7 +65,7 @@
-
+ @csrf
@@ -90,7 +90,7 @@ @@ -113,5 +113,5 @@ - + @endsection diff --git a/resources/views/admin/tax/_form.blade.php b/resources/views/admin/tax/_form.blade.php index 40455ea..7cf89f3 100644 --- a/resources/views/admin/tax/_form.blade.php +++ b/resources/views/admin/tax/_form.blade.php @@ -9,7 +9,7 @@ {{-- 登録・削除 ボタン（上部） --}}
@if($isInfo) - 編集 + 編集 @else @if($isEdit) @@ -66,7 +66,7 @@ {{-- 登録・削除 ボタン（下部重ね） --}}
@if($isInfo) - 編集 + 編集 @else @if($isEdit) diff --git a/resources/views/admin/tax/edit.blade.php b/resources/views/admin/tax/edit.blade.php index 04d5c00..20339ea 100644 --- a/resources/views/admin/tax/edit.blade.php +++ b/resources/views/admin/tax/edit.blade.php @@ -21,7 +21,7 @@
-
+ @csrf @include('admin.tax._form', [ 'tax' => $tax, diff --git a/resources/views/admin/tax/list.blade.php b/resources/views/admin/tax/list.blade.php index 1b463b4..0c008c7 100644 --- a/resources/views/admin/tax/list.blade.php +++ b/resources/views/admin/tax/list.blade.php @@ -1,5 +1,5 @@ @extends('layouts.app') -@section('title', '消費税マスタ') +@section('title', '[東京都|〇〇駐輪場] 消費税マスタ') @section('content') @@ -23,60 +23,51 @@
- {{-- 一覧のソート用（既存規約踏襲） --}} + {{-- 並び替え用 hidden --}} @csrf +
- {{ $taxes->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }} + +
+ {{ $taxes->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }} +
-
- @if(session('success')) -
{{ session('success') }}
- @elseif(session('error')) -
{{ session('error') }}
+ +
+ @if(Session::has('success')) + + @elseif(Session::has('error')) +
+ +

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

+ {!! Session::get('error') !!} +
@endif
-
- -
+ +
+
@csrf -
- {{ __('編集') }}
- - - - - - - @foreach($taxes as $tax) - - - - @endforeach - -
- -
- 編集 -
-
- -
- - -
-
- +
+ {{-- チェック + 編集 --}} + @@ -91,30 +82,37 @@ @foreach($taxes as $tax) - - + + - + @endforeach
+ + 消費税ID
{{ $tax->tax_id }} + {{-- 同じセルに チェック + 編集ボタン --}} + +
+ + 編集 +
+ 		{{ $tax->tax_id }} @php - $val = is_numeric($tax->tax_percent) ? number_format((float)$tax->tax_percent, 2, '.', '') : (string)$tax->tax_percent; @endphp {{ $val }}% {{ optional($tax->tax_day)->format('Y-m-d') }}{{ optional($tax->tax_day)->format('Y-m-d') }}
-
+
+
-{{-- 一括削除 & ソートのJS（既存規約に合わせ最小限） --}} + @push('scripts')