add city filter to camp
This commit is contained in:
@@ -17,6 +17,7 @@ class CampController extends Controller
|
||||
public function index(Request $request)
|
||||
{
|
||||
$province = $request->province ?? null;
|
||||
$city = $request->city ?? null;
|
||||
$blockageDate = $request->blockage_date ?? null;
|
||||
$axisType = $request->axis_type ?? null;
|
||||
$blockageReason = $request->blockage ?? null;
|
||||
@@ -28,6 +29,9 @@ class CampController extends Controller
|
||||
->when($province, function ($query, $province) {
|
||||
return $query->where('province_id', $province);
|
||||
})
|
||||
->when($city, function ($query, $city) {
|
||||
return $query->where('city_id', $city);
|
||||
})
|
||||
->when($blockageDate, function ($query, $blockageDate) {
|
||||
return $query->whereBetween('submited_at', [$blockageDate . ' 00:00:00', $blockageDate . ' 23:59:59']);
|
||||
})
|
||||
@@ -48,6 +52,9 @@ class CampController extends Controller
|
||||
->when($blockageDate, function ($query, $blockageDate) {
|
||||
return $query->whereBetween('submited_at', [$blockageDate . ' 00:00:00', $blockageDate . ' 23:59:59']);
|
||||
})
|
||||
->when($city, function ($query, $city) {
|
||||
return $query->where('city_id', $city);
|
||||
})
|
||||
->when($axisType, function ($query, $axisType) {
|
||||
return $query->where('axis_type', $axisType);
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user