diff --git a/app/Http/Controllers/Admin/PplaceController.php b/app/Http/Controllers/Admin/PplaceController.php index 7134d41..edc2ae2 100644 --- a/app/Http/Controllers/Admin/PplaceController.php +++ b/app/Http/Controllers/Admin/PplaceController.php @@ -24,7 +24,7 @@ class PplaceController extends Controller $inputs['list'] = Pplace::search($inputs); if ($inputs['list']->total() > 0 && $inputs['page'] > $inputs['list']->lastPage()) { - return redirect()->route('pplace'); + return redirect()->route('pplaces'); } return view('admin.Pplace.list', $inputs); @@ -53,7 +53,7 @@ class PplaceController extends Controller $pplace->fill($inputs); $pplace->save(); }); - return redirect()->route('pplace')->with('success', '登録成功'); + return redirect()->route('pplaces')->with('success', '登録しました。'); } else { $inputs['errorMsg'] = $this->__buildErrorMessasges($validator); } @@ -88,7 +88,7 @@ class PplaceController extends Controller $record->fill($inputs); $record->save(); }); - return redirect()->route('pplace')->with('success', '更新成功'); + return redirect()->route('pplaces')->with('success', '更新成功'); } else { $data['errorMsg'] = $this->__buildErrorMessasges($validator); } @@ -104,13 +104,22 @@ class PplaceController extends Controller public function delete(Request $request) { - $pk = $request->get('pk'); - if ($pk && Pplace::destroy($pk)) { - return redirect()->route('pplace')->with('success', '削除成功'); + $arr_pk = $request->get('pk'); + + if ($arr_pk) { + $ids = is_array($arr_pk) ? $arr_pk : [$arr_pk]; + + if (Pplace::deleteByPk($ids)) { + return redirect()->route('pplaces')->with('success', __("削除成功しました。")); + } else { + return redirect()->route('pplaces')->with('error', __('削除に失敗しました。')); + } } - return redirect()->route('pplace')->with('error', '削除失敗'); + + return redirect()->route('pplaces')->with('error', __('削除するデータを選択してください。')); } + public function export() { $headers = [ @@ -142,7 +151,7 @@ class PplaceController extends Controller { $file = $request->file('file'); if (!$file) { - return redirect()->route('pplace')->with('error', 'CSVファイルを選択してください'); + return redirect()->route('pplaces')->with('error', 'CSVファイルを選択してください'); } $data = \App\Utils::csvToArray($file); @@ -161,10 +170,10 @@ class PplaceController extends Controller ]); } DB::commit(); - return redirect()->route('pplace')->with('success', 'インポート成功'); + return redirect()->route('pplaces')->with('success', 'インポート成功'); } catch (\Exception $e) { DB::rollBack(); - return redirect()->route('pplace')->with('error', "行 {$record} : " . $e->getMessage()); + return redirect()->route('pplaces')->with('error', "行 {$record} : " . $e->getMessage()); } } diff --git a/app/Models/Pplace.php b/app/Models/Pplace.php index 32ac647..53496a2 100644 --- a/app/Models/Pplace.php +++ b/app/Models/Pplace.php @@ -65,11 +65,15 @@ class Pplace extends Model /** * 主キー配列で一括削除 */ - public static function deleteByPk($arr) + public static function deleteByPk($ids) { - return self::whereIn('pplace_id', $arr)->delete(); + if (!is_array($ids)) { + $ids = [$ids]; + } + return self::whereIn('pplace_id', $ids)->delete(); } + /** * 選択リスト取得用（フォーム等） */ diff --git a/resources/views/admin/pplace/_form.blade.php b/resources/views/admin/pplace/_form.blade.php index 0613d7b..9b02bd6 100644 --- a/resources/views/admin/pplace/_form.blade.php +++ b/resources/views/admin/pplace/_form.blade.php @@ -17,19 +17,9 @@ @endif -
- @if($isInfo) - {{ __('登録') }} - {{ __('編集') }} - @else - - @endif -
-
{{-- 駐輪車室ID --}} - @if($isInfo || $isEdit)
@@ -39,16 +29,15 @@ name="pplace_id" class="form-control form-control-lg" readonly />
- @endif {{-- 番号 --}}
- +
+ name="pplace_number" class="form-control form-control-lg">
@@ -59,28 +48,37 @@
+ name="pplace_remarks" class="form-control form-control-lg" @if(!empty($isEdit))@endif />
- {{-- オペレーター --}} + - @if($isInfo) - {{ __('登録') }} - {{ __('編集') }} - @else - + + {{-- 登録ボタン --}} + + + {{-- 削除ボタン（編集画面のみ表示） --}} + @if(!empty($pplace_id)) + +
+ @csrf + + +
@endif + diff --git a/resources/views/admin/pplace/add.blade.php b/resources/views/admin/pplace/add.blade.php index 5b31953..38eae8f 100644 --- a/resources/views/admin/pplace/add.blade.php +++ b/resources/views/admin/pplace/add.blade.php @@ -7,13 +7,12 @@
-

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

+

新規登録

    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. -
  3. 駐輪車室マスタ
    4. +
  4. ホーム
    5. +
  5. 駐輪車室マスタ
  6. 新規登録
@@ -35,12 +34,7 @@
- -
- - - -
+ diff --git a/resources/views/admin/pplace/edit.blade.php b/resources/views/admin/pplace/edit.blade.php index aa8f830..e38186f 100644 --- a/resources/views/admin/pplace/edit.blade.php +++ b/resources/views/admin/pplace/edit.blade.php @@ -7,13 +7,12 @@
-

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

+

編集

    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. -
  3. 駐輪車室マスタ
    4. +
  4. ホーム
    5. +
  5. 駐輪車室マスタ
  6. 編集
@@ -30,17 +29,11 @@
@csrf - @include('admin.pplace._form', ['isEdit' => 1, 'isInfo' => 0]) + @include('admin.pplace._form', ['isEdit' => true])
- -
- - - -
diff --git a/resources/views/admin/pplace/list.blade.php b/resources/views/admin/pplace/list.blade.php index 7e86000..dd05df5 100644 --- a/resources/views/admin/pplace/list.blade.php +++ b/resources/views/admin/pplace/list.blade.php @@ -9,8 +9,7 @@
    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. +
  3. ホーム
  4. {{__('駐輪車室マスタ')}}
@@ -20,18 +19,31 @@
-
-
+ + @csrf
- - + + + - {{ $list->appends(['sort' => $sort,'sort_type'=>$sort_type])->links('pagination') }} +
+ + {{-- ▼ ページネーション --}} +
+
+ {{ $list->appends([ + 'sort' => $sort ?? '', + 'sort_type' => $sort_type ?? '' + ])->links('pagination') }} +
@@ -55,63 +67,50 @@ @endif
-
-
-
- @csrf - - - - - - - - @foreach($list as $item) - - - - @endforeach - -
- -
- {{__('編集')}} -
-
-
-
- -
-
- - + + @csrf + +
+
+
+ + - - - + + @foreach($list as $item) + - + @endforeach
+ + - {{__('ID')}} + {{__('駐輪車室ID')}} - {{__('番号')}} + + {{__('駐輪車室番号')}} + {{__('備考')}}
+
+ + 編集 +
+ 		{{mb_substr($item->pplace_id, 0, 10)}} {{mb_substr($item->pplace_number, 0, 20)}}{{mb_substr($item->pplace_remarks, 0, 20)}}{{mb_substr($item->pplace_remarks, 0, 20)}}
- -
-
+ +
@endsection diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 5b4d9ae..21a3a04 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -450,6 +450,7 @@ 'stations', 'terms', 'contract_allowable_cities', + 'pplace', ]; $current = app('router')->currentRouteName(); @endphp @@ -492,6 +493,10 @@

{{ __("ゾーンマスタ") }}

+
  • + +

    {{ __("駐輪場室マスタ") }}

     +

  • {{ __("定期種別マスタ") }}

     diff --git a/routes/web.php b/routes/web.php index 5c79c21..08f849b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -41,6 +41,7 @@ use App\Http\Controllers\Admin\SettingController; use App\Http\Controllers\Admin\MailTemplateController; use App\Http\Controllers\Admin\InvSettingController; use App\Http\Controllers\Admin\ZoneController; +use App\Http\Controllers\Admin\PplaceController; /** @@ -144,7 +145,7 @@ Route::middleware('auth')->group(function () { Route::get('/regular_contracts/export', [App\Http\Controllers\Admin\RegularContractController::class, 'export'])->name('regular_contracts_export'); // [東京都|〇〇駐輪場] 駐輪車室マスタ - Route::match(['get', 'post'], '/pplace', [PplaceController::class, 'list'])->name('pplace'); + Route::match(['get', 'post'], '/pplace', [PplaceController::class, 'list'])->name('pplaces'); Route::match(['get', 'post'], '/pplace/add', [PplaceController::class, 'add'])->name('pplace_add'); Route::match(['get', 'post'], '/pplace/edit/{id}', [PplaceController::class, 'edit'])->name('pplace_edit')->where(['id' => '[0-9]+']); Route::match(['get', 'post'], '/pplace/info/{id}', [PplaceController::class, 'info'])->name('pplace_info')->where(['id' => '[0-9]+']);