diff --git a/Modules/Internal/Http/Controllers/Api/CorporateFormulariumController.php b/Modules/Internal/Http/Controllers/Api/CorporateFormulariumController.php index 84dd56b8..19691b0a 100644 --- a/Modules/Internal/Http/Controllers/Api/CorporateFormulariumController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateFormulariumController.php @@ -19,6 +19,7 @@ class CorporateFormulariumController extends Controller public function index(Request $request, $corporate_id) { $formulariums = Formularium::query() + ->filter($request->all()) ->with(['corporateFormulariums' => function ($query) use ($corporate_id) { $query->where('corporate_id', $corporate_id); }]) diff --git a/app/Models/Formularium.php b/app/Models/Formularium.php index c944c3a5..b8063432 100644 --- a/app/Models/Formularium.php +++ b/app/Models/Formularium.php @@ -40,6 +40,7 @@ class Formularium extends Model return $query ->where('code', 'like', "%" . $search . "%") ->orWhere('name', 'like', "%" . $search . "%") + ->orWhere('id', $search) ; }); } diff --git a/frontend/dashboard/src/pages/Corporates/Formularium/Index.tsx b/frontend/dashboard/src/pages/Corporates/Formularium/Index.tsx index 9cbe7785..c5ae2d12 100644 --- a/frontend/dashboard/src/pages/Corporates/Formularium/Index.tsx +++ b/frontend/dashboard/src/pages/Corporates/Formularium/Index.tsx @@ -14,10 +14,10 @@ export default function CorporateFormularium() { const { corporate_id } = useParams(); return ( - + - +