diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php index ce3a0cd..360ffb8 100755 --- a/app/Http/Controllers/Admin/OrdersController.php +++ b/app/Http/Controllers/Admin/OrdersController.php @@ -40,13 +40,19 @@ class OrdersController extends CommonController $this->model = $this->model->where("project_id", $project_id); if ($request->keyword) { - $this->model = $this->model->where(function($query) use ($request) { + $this->model = $this->model->where(function ($query) use ($request) { $query->where("serial", "like", "%" . $request->keyword . "%") ->orWhere("contact", "like", "%" . $request->keyword . "%") ->orWhere("mobile", "like", "%" . $request->keyword . "%"); }); } + if ($request->date) { + $this->model = $this->model->whereHas("orderItems", function ($query) use ($month, $request) { + $query->where("service_date", $month . "-" . $request->date); + }); + } + $data = $this->model ->with([ "orderItems", diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php index 389817b..85878d8 100755 --- a/resources/views/admin/orders/index.blade.php +++ b/resources/views/admin/orders/index.blade.php @@ -19,7 +19,15 @@ @endforeach - + +