Skip to content

Commit 355e524

Browse files
VikassWebkul214254VikassWebkul214254
authored
Merge pull request #2296 from suraj-webkul/issue#2291
issue #2291 fixed.
2 parents 458e070 + 3371462 commit 355e524

File tree

9 files changed

+59
-45
lines changed

9 files changed

+59
-45
lines changed

‎packages/Webkul/Admin/src/Http/Controllers/Settings/SourceController.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Webkul\Admin\Http\Controllers\Settings;
44

5+
use Exception;
56
use Illuminate\Http\JsonResponse;
67
use Illuminate\Support\Facades\Event;
78
use Illuminate\View\View;
@@ -91,17 +92,23 @@ public function destroy(int $id): JsonResponse
9192
{
9293
$source = $this->sourceRepository->findOrFail($id);
9394

95+
if ($source->leads()->count() > 0) {
96+
return new JsonResponse([
97+
'message' => trans('admin::app.settings.sources.index.delete-failed-associated-leads'),
98+
], 400);
99+
}
100+
94101
try {
95102
Event::dispatch('settings.source.delete.before', $id);
96103

97-
$source->delete($id);
104+
$source->delete();
98105

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

101108
return new JsonResponse([
102109
'message' => trans('admin::app.settings.sources.index.delete-success'),
103110
], 200);
104-
} catch (\Exception $exception) {
111+
} catch (Exception $exception) {
105112
return new JsonResponse([
106113
'message' => trans('admin::app.settings.sources.index.delete-failed'),
107114
], 400);

‎packages/Webkul/Admin/src/Resources/lang/ar/app.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -860,12 +860,13 @@
860860

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

870871
'datagrid' => [
871872
'delete' => 'حذف',

‎packages/Webkul/Admin/src/Resources/lang/en/app.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -862,12 +862,13 @@
862862

863863
'sources' => [
864864
'index' => [
865-
'create-btn' => 'Create Source',
866-
'create-success' => 'Source created successfully.',
867-
'delete-failed' => 'Source can not be deleted.',
868-
'delete-success' => 'Source deleted successfully.',
869-
'title' => 'Sources',
870-
'update-success' => 'Source updated successfully.',
865+
'title' => 'Sources',
866+
'create-btn' => 'Create Source',
867+
'create-success' => 'Source created successfully.',
868+
'delete-failed' => 'Source can not be deleted.',
869+
'delete-success' => 'Source deleted successfully.',
870+
'update-success' => 'Source updated successfully.',
871+
'delete-failed-associated-leads' => 'Source cannot be deleted because it is associated with existing leads. Please detach or update those leads before deletion.',
871872

872873
'datagrid' => [
873874
'delete' => 'Delete',

‎packages/Webkul/Admin/src/Resources/lang/es/app.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -864,12 +864,13 @@
864864

865865
'sources' => [
866866
'index' => [
867-
'create-btn' => 'Crear Fuente',
868-
'create-success' => 'Fuente creada con éxito.',
869-
'delete-failed' => 'No se puede eliminar la fuente.',
870-
'delete-success' => 'Fuente eliminada con éxito.',
871-
'title' => 'Fuentes',
872-
'update-success' => 'Fuente actualizada con éxito.',
867+
'title' => 'Fuentes',
868+
'create-btn' => 'Crear Fuente',
869+
'create-success' => 'Fuente creada con éxito.',
870+
'delete-failed' => 'No se puede eliminar la fuente.',
871+
'delete-success' => 'Fuente eliminada con éxito.',
872+
'update-success' => 'Fuente actualizada con éxito.',
873+
'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.',
873874

874875
'datagrid' => [
875876
'delete' => 'Eliminar',

‎packages/Webkul/Admin/src/Resources/lang/fa/app.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -865,12 +865,13 @@
865865

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

875876
'datagrid' => [
876877
'delete' => 'حذف',

‎packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -858,12 +858,13 @@
858858

859859
'sources' => [
860860
'index' => [
861-
'create-btn' => 'Adicionar Origem',
862-
'create-success' => 'Origem adicionada com sucesso.',
863-
'delete-failed' => 'Não é possível excluir a origem.',
864-
'delete-success' => 'Origem excluída com sucesso.',
865-
'title' => 'Origens',
866-
'update-success' => 'Origem atualizada com sucesso.',
861+
'title' => 'Fontes',
862+
'create-btn' => 'Criar Fonte',
863+
'create-success' => 'Fonte criada com sucesso.',
864+
'delete-failed' => 'Não foi possível excluir a fonte.',
865+
'delete-success' => 'Fonte excluída com sucesso.',
866+
'update-success' => 'Fonte atualizada com sucesso.',
867+
'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.',
867868

868869
'datagrid' => [
869870
'delete' => 'Excluir',

‎packages/Webkul/Admin/src/Resources/lang/tr/app.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -864,12 +864,13 @@
864864

865865
'sources' => [
866866
'index' => [
867-
'create-btn' => 'Kaynak Oluştur',
868-
'create-success' => 'Kaynak başarıyla oluşturuldu.',
869-
'delete-failed' => 'Kaynak silinemedi.',
870-
'delete-success' => 'Kaynak başarıyla silindi.',
871-
'title' => 'Kaynaklar',
872-
'update-success' => 'Kaynak başarıyla güncellendi.',
867+
'title' => 'Kaynaklar',
868+
'create-btn' => 'Kaynak Oluştur',
869+
'create-success' => 'Kaynak başarıyla oluşturuldu.',
870+
'delete-failed' => 'Kaynak silinemedi.',
871+
'delete-success' => 'Kaynak başarıyla silindi.',
872+
'update-success' => 'Kaynak başarıyla güncellendi.',
873+
'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.',
873874

874875
'datagrid' => [
875876
'delete' => 'Sil',

‎packages/Webkul/Admin/src/Resources/lang/vi/app.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -860,12 +860,13 @@
860860

861861
'sources' => [
862862
'index' => [
863-
'create-btn' => 'Tạo Nguồn',
864-
'create-success' => 'Nguồn đã được tạo thành công.',
865-
'delete-failed' => 'Không thể xóa nguồn.',
866-
'delete-success' => 'Nguồn đã được xóa thành công.',
867-
'title' => 'Các Nguồn',
868-
'update-success' => 'Nguồn đã được cập nhật thành công.',
863+
'title' => 'Nguồn',
864+
'create-btn' => 'Tạo Nguồn',
865+
'create-success' => 'Tạo nguồn thành công.',
866+
'delete-failed' => 'Không thể xóa nguồn.',
867+
'delete-success' => 'Xóa nguồn thành công.',
868+
'update-success' => 'Cập nhật nguồn thành công.',
869+
'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.',
869870

870871
'datagrid' => [
871872
'delete' => 'Xóa',

‎packages/Webkul/Lead/src/Models/Source.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ class Source extends Model implements SourceContract
2323
*/
2424
public function leads()
2525
{
26-
return $this->hasMany(LeadProxy::modelClass());
26+
return $this->hasMany(LeadProxy::modelClass(), 'lead_source_id', 'id');
2727
}
2828
}

0 commit comments

Comments
 (0)