nitrobon
/
pipicar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new

master
Rustem 2025-08-10 00:18:13 +05:00
parent 6ad0fe85e6
commit 142c65cedc
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/MobileApiController.php
View File

@ -270,7 +270,7 @@ class MobileApiController extends Controller
$availableCars = $cars->reject(fn($car) => in_array($car->id, $busyCars)); $availableCars = $cars->reject(fn($car) => in_array($car->id, $busyCars));
return response()->json($availableCars->isNotEmpty()); return $availableCars->isNotEmpty();
} }
public function getAvailableMarksList(Request $request): JsonResponse public function getAvailableMarksList(Request $request): JsonResponse
@ -305,7 +305,6 @@ class MobileApiController extends Controller
$cars = UniModel::model('pipi_auto')->where('model_id', $mark->id)->get(); $cars = UniModel::model('pipi_auto')->where('model_id', $mark->id)->get();
if ($cars->isEmpty()) { if ($cars->isEmpty()) {
continue; continue;
} }
@ -343,10 +342,6 @@ class MobileApiController extends Controller
$colorPath = url('api/files/file/' . ltrim($photo->path, '/')); $colorPath = url('api/files/file/' . ltrim($photo->path, '/'));
} }
if (!$this->checkAvailableCar($started_at, $ended_at, $mark->id, $carColor->code)) {
continue;
}
$key = $mark->name . '-' . $mark->year . '-' . $carColor->code; $key = $mark->name . '-' . $mark->year . '-' . $carColor->code;
$availableMarks[$key] = [ $availableMarks[$key] = [
@ -367,6 +362,7 @@ class MobileApiController extends Controller
'deposit' => $tariffs_new[0]['deposit'] ?? 30000, 'deposit' => $tariffs_new[0]['deposit'] ?? 30000,
'conditioner' => $mark?->conditioner, 'conditioner' => $mark?->conditioner,
'photo' => $colorPath, 'photo' => $colorPath,
'free' => $this->checkAvailableCar($started_at, $ended_at, $mark->id, $carColor->id),
'tariffs' => $tariffs_new, 'tariffs' => $tariffs_new,
]; ];
} }