add total for notification
This commit is contained in:
@@ -215,6 +215,8 @@ class NotificationController extends Controller
|
|||||||
])->count();
|
])->count();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$missions['total'] = $missions['request_portal'] + $missions['transportation'] + $missions['control'];
|
||||||
|
|
||||||
return $missions;
|
return $missions;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,16 +61,10 @@ class RahdaranController extends Controller
|
|||||||
|
|
||||||
public function search(Request $request): JsonResponse
|
public function search(Request $request): JsonResponse
|
||||||
{
|
{
|
||||||
if ($request->has('code')) {
|
$matchedSearchedRahdaran = Rahdaran::query()
|
||||||
$matchedSearchedRahdaran = Rahdaran::query()
|
->where('code', 'LIKE', "%{$request->search}%")
|
||||||
->where('code', 'LIKE', "%{$request->code}%")
|
->orWhere('name', 'LIKE', "%{$request->search}%")
|
||||||
->get();
|
->get();
|
||||||
}
|
|
||||||
else {
|
|
||||||
$matchedSearchedRahdaran = Rahdaran::query()
|
|
||||||
->where('name', 'LIKE', "%{$request->name}%")
|
|
||||||
->get();
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this->successResponse($matchedSearchedRahdaran);
|
return $this->successResponse($matchedSearchedRahdaran);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user