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

master

master
Rustem 2025-05-24 19:33:12 +05:00
parent fab3679f53
commit 83d62045bd
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,7 +226,7 @@ class MobileApiController extends Controller
} }
} }
public function checkAvailableCar($started_at = null, $ended_at = null, $modelId = null): bool { public function checkAvailableCar($started_at = null, $ended_at = null, $modelId = null, $color = null): bool {
if (!$started_at || !$ended_at || !$modelId) { if (!$started_at || !$ended_at || !$modelId) {
$request = request(); $request = request();
$started_at = $started_at ?? $request->input('started_at'); $started_at = $started_at ?? $request->input('started_at');
@ -243,6 +243,7 @@ class MobileApiController extends Controller
$cars = UniModel::model('pipi_auto') $cars = UniModel::model('pipi_auto')
->where('is_inactive', '=', false) ->where('is_inactive', '=', false)
->where('model_id', $modelId) ->where('model_id', $modelId)
->where('color_id', $color->first()->id)
->get(); ->get();
$busyCars = UniModel::model('pipi_auto_calendar') $busyCars = UniModel::model('pipi_auto_calendar')
->whereBetween('date', [$started_at, $ended_at]) ->whereBetween('date', [$started_at, $ended_at])
@ -284,10 +285,6 @@ class MobileApiController extends Controller
continue; continue;
} }
if (!$this->checkAvailableCar($started_at, $ended_at, $mark->id)) {
continue;
}
$cars = UniModel::model('pipi_auto')->where('model_id', $mark->id)->get(); $cars = UniModel::model('pipi_auto')->where('model_id', $mark->id)->get();
@ -328,6 +325,10 @@ 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, $carsOfColor)) {
continue;
}
$key = $mark->name . '-' . $mark->year . '-' . $carColor; $key = $mark->name . '-' . $mark->year . '-' . $carColor;
$availableMarks[$key] = [ $availableMarks[$key] = [