diff --git a/app/Http/Controllers/Admin/FloorController.php b/app/Http/Controllers/Admin/FloorController.php index 69af9ba..940d661 100644 --- a/app/Http/Controllers/Admin/FloorController.php +++ b/app/Http/Controllers/Admin/FloorController.php @@ -135,6 +135,9 @@ class FloorController extends BaseController $this->validateId($id, AdminFloor::class); $data = [ 'region_list' => AdminFloorRegion::getFloorRegion($id), + 'building_floor_list' => get_select_data( + AdminFloorService::getBuildingFloor() + ), 'item' => AdminFloorService::getFloorData($id) ]; return $this->responseService->success($data); diff --git a/app/Services/AdminFloorService.php b/app/Services/AdminFloorService.php index a9d7439..b0dcb9f 100644 --- a/app/Services/AdminFloorService.php +++ b/app/Services/AdminFloorService.php @@ -44,9 +44,10 @@ class AdminFloorService } $model = AdminFloor::query()->create([ - 'name' => $data['name'], - 'image_url' => $data['image_url'], - 'created_at' => get_datetime() + 'name' => $data['name'], + 'image_url' => $data['image_url'], + 'building_floor' => $data['building_floor'] ?? 1, + 'created_at' => get_datetime() ]); $this->logService->logCreated($model, 'admin_floor.create'); @@ -115,6 +116,7 @@ class AdminFloorService $model->update([ 'name' => $data['name'], 'image_url' => $data['image_url'], + 'building_floor' => $data['building_floor'] ?? 1, 'updated_at' => get_datetime() ]); diff --git a/app/Services/ParkingInformationService.php b/app/Services/ParkingInformationService.php index dd54138..6fdaf80 100644 --- a/app/Services/ParkingInformationService.php +++ b/app/Services/ParkingInformationService.php @@ -8,8 +8,6 @@ use App\Models\ParkingLicensePlate; use App\Models\ParkingSpace; use App\Models\ParkingSpaceType; use Exception; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\DB; class ParkingInformationService extends BaseService @@ -24,10 +22,9 @@ class ParkingInformationService extends BaseService /** * @param $data - * @return Builder|Model * @throws Exception */ - public function createModel($data): Builder|Model + public function createModel($data) { try { DB::beginTransaction();