Skip to content

issue #2291 fixed. #2296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2025
Merged

issue #2291 fixed. #2296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions packages/Webkul/Admin/src/Http/Controllers/Settings/SourceController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Webkul\Admin\Http\Controllers\Settings;

use Exception;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Event;
use Illuminate\View\View;
Expand Down Expand Up @@ -91,17 +92,23 @@ public function destroy(int $id): JsonResponse
{
$source = $this->sourceRepository->findOrFail($id);

if ($source->leads()->count() > 0) {
return new JsonResponse([
'message' => trans('admin::app.settings.sources.index.delete-failed-associated-leads'),
], 400);
}

try {
Event::dispatch('settings.source.delete.before', $id);

$source->delete($id);
$source->delete();

Event::dispatch('settings.source.delete.after', $id);

return new JsonResponse([
'message' => trans('admin::app.settings.sources.index.delete-success'),
], 200);
} catch (\Exception $exception) {
} catch (Exception $exception) {
return new JsonResponse([
'message' => trans('admin::app.settings.sources.index.delete-failed'),
], 400);
Expand Down
13 changes: 7 additions & 6 deletions packages/Webkul/Admin/src/Resources/lang/ar/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,12 +859,13 @@

'sources' => [
'index' => [
'create-btn' => 'إنشاء مصدر',
'create-success' => 'تم إنشاء المصدر بنجاح.',
'delete-failed' => 'لا يمكن حذف المصدر.',
'delete-success' => 'تم حذف المصدر بنجاح.',
'title' => 'المصادر',
'update-success' => 'تم تحديث المصدر بنجاح.',
'title' => 'المصادر',
'create-btn' => 'إنشاء مصدر',
'create-success' => 'تم إنشاء المصدر بنجاح.',
'delete-failed' => 'لا يمكن حذف المصدر.',
'delete-success' => 'تم حذف المصدر بنجاح.',
'update-success' => 'تم تحديث المصدر بنجاح.',
'delete-failed-associated-leads' => 'لا يمكن حذف المصدر لأنه مرتبط بعملاء محتملين موجودين. يرجى فصل أو تحديث هؤلاء العملاء قبل الحذف.',

'datagrid' => [
'delete' => 'حذف',
Expand Down
13 changes: 7 additions & 6 deletions packages/Webkul/Admin/src/Resources/lang/en/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,12 +861,13 @@

'sources' => [
'index' => [
'create-btn' => 'Create Source',
'create-success' => 'Source created successfully.',
'delete-failed' => 'Source can not be deleted.',
'delete-success' => 'Source deleted successfully.',
'title' => 'Sources',
'update-success' => 'Source updated successfully.',
'title' => 'Sources',
'create-btn' => 'Create Source',
'create-success' => 'Source created successfully.',
'delete-failed' => 'Source can not be deleted.',
'delete-success' => 'Source deleted successfully.',
'update-success' => 'Source updated successfully.',
'delete-failed-associated-leads' => 'Source cannot be deleted because it is associated with existing leads. Please detach or update those leads before deletion.',

'datagrid' => [
'delete' => 'Delete',
Expand Down
13 changes: 7 additions & 6 deletions packages/Webkul/Admin/src/Resources/lang/es/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,12 +863,13 @@

'sources' => [
'index' => [
'create-btn' => 'Crear Fuente',
'create-success' => 'Fuente creada con éxito.',
'delete-failed' => 'No se puede eliminar la fuente.',
'delete-success' => 'Fuente eliminada con éxito.',
'title' => 'Fuentes',
'update-success' => 'Fuente actualizada con éxito.',
'title' => 'Fuentes',
'create-btn' => 'Crear Fuente',
'create-success' => 'Fuente creada con éxito.',
'delete-failed' => 'No se puede eliminar la fuente.',
'delete-success' => 'Fuente eliminada con éxito.',
'update-success' => 'Fuente actualizada con éxito.',
'delete-failed-associated-leads' => 'No se puede eliminar la fuente porque está asociada a clientes potenciales existentes. Por favor, desvincúlelos o actualícelos antes de eliminar.',

'datagrid' => [
'delete' => 'Eliminar',
Expand Down
13 changes: 7 additions & 6 deletions packages/Webkul/Admin/src/Resources/lang/fa/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,12 +864,13 @@

'sources' => [
'index' => [
'create-btn' => 'ایجاد منبع',
'create-success' => 'منبع با موفقیت ایجاد شد.',
'delete-failed' => 'منبع قابل حذف نیست.',
'delete-success' => 'منبع با موفقیت حذف شد.',
'title' => 'منابع',
'update-success' => 'منبع با موفقیت به‌روزرسانی شد.',
'title' => 'منابع',
'create-btn' => 'ایجاد منبع',
'create-success' => 'منبع با موفقیت ایجاد شد.',
'delete-failed' => 'امکان حذف منبع وجود ندارد.',
'delete-success' => 'منبع با موفقیت حذف شد.',
'update-success' => 'منبع با موفقیت به‌روزرسانی شد.',
'delete-failed-associated-leads' => 'نمی‌توان منبع را حذف کرد زیرا با سرنخ‌های موجود مرتبط است. لطفاً ابتدا آن‌ها را جدا کرده یا به‌روزرسانی کنید.',

'datagrid' => [
'delete' => 'حذف',
Expand Down
13 changes: 7 additions & 6 deletions packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,12 +857,13 @@

'sources' => [
'index' => [
'create-btn' => 'Adicionar Origem',
'create-success' => 'Origem adicionada com sucesso.',
'delete-failed' => 'Não é possível excluir a origem.',
'delete-success' => 'Origem excluída com sucesso.',
'title' => 'Origens',
'update-success' => 'Origem atualizada com sucesso.',
'title' => 'Fontes',
'create-btn' => 'Criar Fonte',
'create-success' => 'Fonte criada com sucesso.',
'delete-failed' => 'Não foi possível excluir a fonte.',
'delete-success' => 'Fonte excluída com sucesso.',
'update-success' => 'Fonte atualizada com sucesso.',
'delete-failed-associated-leads' => 'Não é possível excluir a fonte porque está associada a leads existentes. Por favor, desvincule ou atualize esses leads antes da exclusão.',

'datagrid' => [
'delete' => 'Excluir',
Expand Down
13 changes: 7 additions & 6 deletions packages/Webkul/Admin/src/Resources/lang/tr/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,12 +863,13 @@

'sources' => [
'index' => [
'create-btn' => 'Kaynak Oluştur',
'create-success' => 'Kaynak başarıyla oluşturuldu.',
'delete-failed' => 'Kaynak silinemedi.',
'delete-success' => 'Kaynak başarıyla silindi.',
'title' => 'Kaynaklar',
'update-success' => 'Kaynak başarıyla güncellendi.',
'title' => 'Kaynaklar',
'create-btn' => 'Kaynak Oluştur',
'create-success' => 'Kaynak başarıyla oluşturuldu.',
'delete-failed' => 'Kaynak silinemedi.',
'delete-success' => 'Kaynak başarıyla silindi.',
'update-success' => 'Kaynak başarıyla güncellendi.',
'delete-failed-associated-leads' => 'Kaynak silinemiyor çünkü mevcut adaylarla ilişkili. Lütfen bu adayları silmeden önce bağlantılarını kaldırın veya güncelleyin.',

'datagrid' => [
'delete' => 'Sil',
Expand Down
13 changes: 7 additions & 6 deletions packages/Webkul/Admin/src/Resources/lang/vi/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,12 +859,13 @@

'sources' => [
'index' => [
'create-btn' => 'Tạo Nguồn',
'create-success' => 'Nguồn đã được tạo thành công.',
'delete-failed' => 'Không thể xóa nguồn.',
'delete-success' => 'Nguồn đã được xóa thành công.',
'title' => 'Các Nguồn',
'update-success' => 'Nguồn đã được cập nhật thành công.',
'title' => 'Nguồn',
'create-btn' => 'Tạo Nguồn',
'create-success' => 'Tạo nguồn thành công.',
'delete-failed' => 'Không thể xóa nguồn.',
'delete-success' => 'Xóa nguồn thành công.',
'update-success' => 'Cập nhật nguồn thành công.',
'delete-failed-associated-leads' => 'Không thể xóa nguồn vì nó đang được liên kết với các khách hàng tiềm năng. Vui lòng hủy liên kết hoặc cập nhật các khách hàng đó trước khi xóa.',

'datagrid' => [
'delete' => 'Xóa',
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Lead/src/Models/Source.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ class Source extends Model implements SourceContract
*/
public function leads()
{
return $this->hasMany(LeadProxy::modelClass());
return $this->hasMany(LeadProxy::modelClass(), 'lead_source_id', 'id');
}
}
Loading