diff --git a/app/Http/Controllers/Admin/RegularTypeController.php b/app/Http/Controllers/Admin/RegularTypeController.php index e4a6db4..0bbc423 100644 --- a/app/Http/Controllers/Admin/RegularTypeController.php +++ b/app/Http/Controllers/Admin/RegularTypeController.php @@ -61,7 +61,7 @@ class RegularTypeController extends Controller $new->save(); }); - $request->session()->flash('success', __('新しい成功を創造する。')); + $request->session()->flash('success', __('登録に成功しました。')); return redirect()->route('regular_types'); } @@ -75,7 +75,15 @@ class RegularTypeController extends Controller abort(404); } - $data = array_merge($regular_type->getAttributes(), $this->getDataDropList()); + $data = array_merge( + $regular_type->getAttributes(), + $this->getDataDropList(), + [ + 'regular_type' => $regular_type, + 'isEdit' => true, + ] + ); + if ($request->isMethod('POST')) { @@ -129,18 +137,26 @@ class RegularTypeController extends Controller public function delete(Request $request) { - $arr_pk = $request->get('pk'); + $arr_pk = $request->get('pk'); // 配列で受け取る + if ($arr_pk) { - if (RegularType::deleteByPk($arr_pk)) { - return redirect()->route('regular_types')->with('success', __("削除が完了しました。")); + $deleted = RegularType::destroy($arr_pk); + + if ($deleted > 0) { + return redirect()->route('regular_types') + ->with('success', __("削除が完了しました。")); } else { - return redirect()->route('regular_types')->with('error', __('削除に失敗しました。')); + return redirect()->route('regular_types') + ->with('error', __('削除に失敗しました。')); } } - return redirect()->route('regular_types')->with('error', __('削除するユーザーを選択してください。')); + + return redirect()->route('regular_types') + ->with('error', __('削除するデータを選択してください。')); } + public function export(Request $request) { diff --git a/app/Http/Controllers/Admin/StationController.php b/app/Http/Controllers/Admin/StationController.php index 6943f88..74901c9 100644 --- a/app/Http/Controllers/Admin/StationController.php +++ b/app/Http/Controllers/Admin/StationController.php @@ -38,8 +38,8 @@ class StationController extends Controller 'station_route_name', 'park_id', 'operator_id', - 'station_latitude', - 'station_longitude', + // 'station_latitude', 追加予定 + // 'station_longitude', 追加予定 ]) ->orderBy($sort, $sort_type) ->paginate(20); diff --git a/app/Http/Requests/RegularTypeRequest.php b/app/Http/Requests/RegularTypeRequest.php index de24ff7..d1f5e3b 100644 --- a/app/Http/Requests/RegularTypeRequest.php +++ b/app/Http/Requests/RegularTypeRequest.php @@ -14,14 +14,14 @@ class RegularTypeRequest extends FormRequest public function rules() { return [ - 'name' => 'required|string|max:255', + 'city_id' => 'required|string|max:255', ]; } public function messages() { return [ - 'name.required' => '市区名は必須です。', + 'city_id.required' => '市区名は必須です。', ]; } } diff --git a/resources/views/admin/regular_types/_form.blade.php b/resources/views/admin/regular_types/_form.blade.php index 15f67ac..2fd3315 100644 --- a/resources/views/admin/regular_types/_form.blade.php +++ b/resources/views/admin/regular_types/_form.blade.php @@ -19,172 +19,194 @@