From 42a116e9ac2225e281e9f652277155a2940abfb3 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Thu, 31 Aug 2023 09:58:44 +0700 Subject: [PATCH] bugs fix division --- Modules/Internal/Http/Controllers/Api/DivisionController.php | 2 +- frontend/dashboard/src/pages/Corporates/Division/Form.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/Internal/Http/Controllers/Api/DivisionController.php b/Modules/Internal/Http/Controllers/Api/DivisionController.php index df33f22c..10ba58f0 100644 --- a/Modules/Internal/Http/Controllers/Api/DivisionController.php +++ b/Modules/Internal/Http/Controllers/Api/DivisionController.php @@ -92,7 +92,7 @@ class DivisionController extends Controller 'code' => [ 'required', // Rule::unique('corporate_plans')->where('corporate_id', $corporate_id)->ignore($corporatePlan->id) - Rule::unique('corporate_divisions')->where('corporate_id', $corporate_id) + // Rule::unique('corporate_divisions')->where('corporate_id', $corporate_id) ], 'name' => 'required' ]); diff --git a/frontend/dashboard/src/pages/Corporates/Division/Form.tsx b/frontend/dashboard/src/pages/Corporates/Division/Form.tsx index dfdde430..cebefba5 100644 --- a/frontend/dashboard/src/pages/Corporates/Division/Form.tsx +++ b/frontend/dashboard/src/pages/Corporates/Division/Form.tsx @@ -69,7 +69,7 @@ export default function CorporatePlanForm({ isEdit, currentCorporatePlan }: Prop enqueueSnackbar('Division created successfully', { variant: 'success' }); }) .then((res) => { - navigate('/corporates/' + corporate_id + '/divisions', { replace: true }); + navigate('/corporate/' + corporate_id + '/divisions', { replace: true }); }) .catch(({ response }) => { if (response.status === 422) { @@ -89,7 +89,7 @@ export default function CorporatePlanForm({ isEdit, currentCorporatePlan }: Prop enqueueSnackbar('Division updated successfully', { variant: 'success' }); }) .then((res) => { - navigate('/corporates/' + corporate_id + '/divisions/' , { replace: true }); + navigate('/corporate/' + corporate_id + '/divisions/' , { replace: true }); }) .catch(({ response }) => { enqueueSnackbar('Update Failed : '+ response.data.message, { variant: 'error' });