From 61c7daf6dcfa4fd175fdfd1e7cfbbcc055d6cde5 Mon Sep 17 00:00:00 2001 From: Suraj Kashyap Date: Wed, 9 Jul 2025 13:59:27 +0530 Subject: [PATCH 1/2] Issue --- .../Http/Controllers/Settings/GroupController.php | 6 ++++++ packages/Webkul/Admin/src/Resources/lang/en/app.php | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/Controllers/Settings/GroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Settings/GroupController.php index b7d5a5037..ab44e99f3 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Settings/GroupController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Settings/GroupController.php @@ -102,6 +102,12 @@ public function destroy(int $id): JsonResponse { $group = $this->groupRepository->findOrFail($id); + if ($group->users()->exists()) { + return response()->json([ + 'message' => trans('admin::app.settings.groups.index.delete-failed-associated-users'), + ], 400); + } + try { Event::dispatch('settings.group.delete.before', $id); diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 251acccfc..b042f42ae 100644 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -746,12 +746,13 @@ 'groups' => [ 'index' => [ - 'create-btn' => 'Create Group', - 'title' => 'Groups', - 'create-success' => 'Group created successfully.', - 'update-success' => 'Group updated successfully.', - 'destroy-success' => 'Group deleted successfully.', - 'delete-failed' => 'Group can not be deleted.', + 'create-btn' => 'Create Group', + 'title' => 'Groups', + 'create-success' => 'Group created successfully.', + 'update-success' => 'Group updated successfully.', + 'destroy-success' => 'Group deleted successfully.', + 'delete-failed' => 'Group can not be deleted.', + 'delete-failed-associated-users' => 'Group can not be deleted, as this is being used by users.', 'datagrid' => [ 'delete' => 'Delete', From 03e8fd91e4239687e24a0c2f37cc425b787f7599 Mon Sep 17 00:00:00 2001 From: Suraj Kashyap Date: Thu, 10 Jul 2025 10:41:40 +0530 Subject: [PATCH 2/2] add translation. --- packages/Webkul/Admin/src/Resources/lang/ar/app.php | 13 +++++++------ packages/Webkul/Admin/src/Resources/lang/es/app.php | 13 +++++++------ packages/Webkul/Admin/src/Resources/lang/fa/app.php | 13 +++++++------ .../Webkul/Admin/src/Resources/lang/pt_BR/app.php | 13 +++++++------ packages/Webkul/Admin/src/Resources/lang/tr/app.php | 13 +++++++------ packages/Webkul/Admin/src/Resources/lang/vi/app.php | 13 +++++++------ 6 files changed, 42 insertions(+), 36 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php index cc2877f9e..5ce597532 100644 --- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php @@ -744,12 +744,13 @@ 'groups' => [ 'index' => [ - 'create-btn' => 'إنشاء مجموعة', - 'title' => 'المجموعات', - 'create-success' => 'تم إنشاء المجموعة بنجاح.', - 'update-success' => 'تم تحديث المجموعة بنجاح.', - 'destroy-success' => 'تم حذف المجموعة بنجاح.', - 'delete-failed' => 'لا يمكن حذف المجموعة.', + 'create-btn' => 'إنشاء مجموعة', + 'title' => 'المجموعات', + 'create-success' => 'تم إنشاء المجموعة بنجاح.', + 'update-success' => 'تم تحديث المجموعة بنجاح.', + 'destroy-success' => 'تم حذف المجموعة بنجاح.', + 'delete-failed' => 'لا يمكن حذف المجموعة.', + 'delete-failed-associated-users' => 'لا يمكن حذف المجموعة لأنها مستخدمة من قبل المستخدمين.', 'datagrid' => [ 'delete' => 'حذف', diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php index 0e7442ee7..3e542386c 100644 --- a/packages/Webkul/Admin/src/Resources/lang/es/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php @@ -748,12 +748,13 @@ 'groups' => [ 'index' => [ - 'create-btn' => 'Crear Grupo', - 'title' => 'Grupos', - 'create-success' => 'Grupo creado con éxito.', - 'update-success' => 'Grupo actualizado con éxito.', - 'destroy-success' => 'Grupo eliminado con éxito.', - 'delete-failed' => 'No se puede eliminar el grupo.', + 'create-btn' => 'Crear Grupo', + 'title' => 'Grupos', + 'create-success' => 'Grupo creado con éxito.', + 'update-success' => 'Grupo actualizado con éxito.', + 'destroy-success' => 'Grupo eliminado con éxito.', + 'delete-failed' => 'No se puede eliminar el grupo.', + 'delete-failed-associated-users' => 'No se puede eliminar el grupo, ya que está siendo utilizado por usuarios.', 'datagrid' => [ 'delete' => 'Eliminar', diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php index a685e06f7..53a6a76c4 100644 --- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php @@ -749,12 +749,13 @@ 'groups' => [ 'index' => [ - 'create-btn' => 'ایجاد گروه', - 'title' => 'گروه‌ها', - 'create-success' => 'گروه با موفقیت ایجاد شد.', - 'update-success' => 'گروه با موفقیت به‌روزرسانی شد.', - 'destroy-success' => 'گروه با موفقیت حذف شد.', - 'delete-failed' => 'گروه قابل حذف نیست.', + 'create-btn' => 'ایجاد گروه', + 'title' => 'گروه‌ها', + 'create-success' => 'گروه با موفقیت ایجاد شد.', + 'update-success' => 'گروه با موفقیت به‌روزرسانی شد.', + 'destroy-success' => 'گروه با موفقیت حذف شد.', + 'delete-failed' => 'امکان حذف گروه وجود ندارد.', + 'delete-failed-associated-users' => 'امکان حذف گروه وجود ندارد زیرا توسط کاربران استفاده می‌شود.', 'datagrid' => [ 'delete' => 'حذف', diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php index 539036909..f13e43e11 100644 --- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php @@ -742,12 +742,13 @@ 'groups' => [ 'index' => [ - 'create-btn' => 'Adicionar Grupo', - 'title' => 'Grupos', - 'create-success' => 'Grupo adicionado com sucesso.', - 'update-success' => 'Grupo atualizado com sucesso.', - 'destroy-success' => 'Grupo excluído com sucesso.', - 'delete-failed' => 'Não foi possível excluir o grupo.', + 'create-btn' => 'Criar Grupo', + 'title' => 'Grupos', + 'create-success' => 'Grupo criado com sucesso.', + 'update-success' => 'Grupo atualizado com sucesso.', + 'destroy-success' => 'Grupo excluído com sucesso.', + 'delete-failed' => 'Não foi possível excluir o grupo.', + 'delete-failed-associated-users' => 'Não foi possível excluir o grupo, pois está sendo utilizado por usuários.', 'datagrid' => [ 'delete' => 'Excluir', diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php index a123db268..195950453 100644 --- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php @@ -748,12 +748,13 @@ 'groups' => [ 'index' => [ - 'create-btn' => 'Grup Oluştur', - 'title' => 'Gruplar', - 'create-success' => 'Grup başarıyla oluşturuldu.', - 'update-success' => 'Grup başarıyla güncellendi.', - 'destroy-success' => 'Grup başarıyla silindi.', - 'delete-failed' => 'Grup silinemedi.', + 'create-btn' => 'Grup Oluştur', + 'title' => 'Gruplar', + 'create-success' => 'Grup başarıyla oluşturuldu.', + 'update-success' => 'Grup başarıyla güncellendi.', + 'destroy-success' => 'Grup başarıyla silindi.', + 'delete-failed' => 'Grup silinemedi.', + 'delete-failed-associated-users' => 'Grup silinemiyor, çünkü kullanıcılar tarafından kullanılıyor.', 'datagrid' => [ 'delete' => 'Sil', diff --git a/packages/Webkul/Admin/src/Resources/lang/vi/app.php b/packages/Webkul/Admin/src/Resources/lang/vi/app.php index e305790fa..00291f8e6 100644 --- a/packages/Webkul/Admin/src/Resources/lang/vi/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/vi/app.php @@ -745,12 +745,13 @@ 'groups' => [ 'index' => [ - 'create-btn' => 'Tạo Nhóm', - 'title' => 'Nhóm', - 'create-success' => 'Nhóm đã được tạo thành công.', - 'update-success' => 'Nhóm đã được cập nhật thành công.', - 'destroy-success' => 'Nhóm đã được xóa thành công.', - 'delete-failed' => 'Không thể xóa nhóm.', + 'create-btn' => 'Tạo Nhóm', + 'title' => 'Nhóm', + 'create-success' => 'Tạo nhóm thành công.', + 'update-success' => 'Cập nhật nhóm thành công.', + 'destroy-success' => 'Xóa nhóm thành công.', + 'delete-failed' => 'Không thể xóa nhóm.', + 'delete-failed-associated-users' => 'Không thể xóa nhóm vì đang được sử dụng bởi người dùng.', 'datagrid' => [ 'delete' => 'Xóa',