Skip to content

Fix #2341 #2346 Issue #2365

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

Open
wants to merge 6 commits into
base: 2.1
Choose a base branch
from
Open

Fix #2341 #2346 Issue #2365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1cb1326
fix : #2346 issue delete-failed-associated-campaigns
sandeeep-prajapati Sep 11, 2025
a724287
fix : #2346 issue fixed
sandeeep-prajapati Sep 11, 2025
3d40d88
fix : #2341 issue fixed
sandeeep-prajapati Sep 11, 2025
5a9c051
fix : #2341 solved Translation missing in Leads Won/Lost modal popup
sandeeep-prajapati Sep 11, 2025
dabf1a7
Fix code style issues using Laravel Pint
sandeeep-prajapati Sep 13, 2025
50eef6a
Merge branch 'krayin:2.1' into fix/#2341
sandeeep-prajapati Sep 13, 2025
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"barryvdh/laravel-debugbar": "^3.6",
"fakerphp/faker": "^1.9.1",
"krayin/krayin-package-generator": "dev-master",
"laravel/pint": "^1.16",
"laravel/pint": "^1.24",
"laravel/sail": "^1.0.1",
"mockery/mockery": "^1.4.2",
"nunomaduro/collision": "^7.0",
Expand Down
25 changes: 14 additions & 11 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 18 additions & 8 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 @@ -349,6 +349,8 @@
'explore-all-matching-leads' => 'استكشاف جميع العملاء المحتملين المطابقين لـ ":query" (:count)',
'explore-all-matching-contacts' => 'استكشاف جميع جهات الاتصال المطابقة لـ ":query" (:count)',
'explore-all-matching-quotes' => 'استكشاف جميع عروض الأسعار المطابقة لـ ":query" (:count)',
'explore-all-settings' => 'استكشاف جميع الإعدادات',
'explore-all-configurations' => 'استكشاف جميع التكوينات',
],
],
],
Expand Down Expand Up @@ -1013,14 +1015,15 @@
'marketing' => [
'events' => [
'index' => [
'create-btn' => 'إنشاء حدث',
'title' => 'الأحداث',
'create-success' => 'تم إنشاء الحدث بنجاح.',
'update-success' => 'تم تحديث الحدث بنجاح.',
'delete-success' => 'تم حذف الحدث بنجاح.',
'delete-failed' => 'لا يمكن حذف الحدث.',
'mass-delete-success' => 'تم حذف الأحداث بنجاح',
'datagrid' => [
'create-btn' => 'إنشاء حدث',
'title' => 'الأحداث',
'create-success' => 'تم إنشاء الحدث بنجاح.',
'update-success' => 'تم تحديث الحدث بنجاح.',
'delete-success' => 'تم حذف الحدث بنجاح.',
'delete-failed' => 'لا يمكن حذف الحدث.',
'mass-delete-success' => 'تم حذف الأحداث بنجاح',
'delete-failed-associated-campaigns' => 'لا يمكن حذف الحدث لأنه مرتبط بحملات موجودة. يرجى فصل أو تحديث هذه الحملات قبل الحذف.',
'datagrid' => [
'delete' => 'حذف',
'edit' => 'تحرير',
'id' => 'المعرف',
Expand Down Expand Up @@ -1810,6 +1813,13 @@
'to' => 'إلى',
],
],
'stages' => [
'won-value' => 'قيمة الربح',
'closed-at' => 'أغلقت في',
'save-btn' => 'حفظ',
'lost-reason' => 'سبب الفقدان',
'need-more-info' => 'تحتاج إلى مزيد من التفاصيل',
],
],
'view-switcher' => [
'all-pipelines' => 'كل المسارات',
Expand Down
24 changes: 17 additions & 7 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 @@ -389,6 +389,8 @@
'explore-all-matching-leads' => 'Explore all leads matching ":query" (:count)',
'explore-all-matching-contacts' => 'Explore all contacts matching ":query" (:count)',
'explore-all-matching-quotes' => 'Explore all quotes matching ":query" (:count)',
'explore-all-settings' => 'Explore all Settings',
'explore-all-configurations' => 'Explore all Configurations',
],
],
],
Expand Down Expand Up @@ -1116,13 +1118,14 @@
'marketing' => [
'events' => [
'index' => [
'create-btn' => 'Create Event',
'title' => 'Events',
'create-success' => 'Event created successfully.',
'update-success' => 'Event updated successfully.',
'delete-success' => 'Event deleted successfully.',
'delete-failed' => 'Event can not be deleted.',
'mass-delete-success' => 'Events deleted successfully',
'create-btn' => 'Create Event',
'title' => 'Events',
'create-success' => 'Event created successfully.',
'update-success' => 'Event updated successfully.',
'delete-success' => 'Event deleted successfully.',
'delete-failed' => 'Event can not be deleted.',
'mass-delete-success' => 'Events deleted successfully',
'delete-failed-associated-campaigns'=> 'Event cannot be deleted because it is associated with existing campaigns. Please detach or update those campaigns before deletion.',

'datagrid' => [
'delete' => 'Delete',
Expand Down Expand Up @@ -1974,6 +1977,13 @@
'to' => 'To',
],
],
'stages' => [
'won-value' => 'Won Value',
'closed-at' => 'Closed At',
'save-btn' => 'Save',
'lost-reason' => 'Lost Reason',
'need-more-info' => 'Need More Details',
],
],

'view-switcher' => [
Expand Down
26 changes: 18 additions & 8 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 @@ -349,6 +349,8 @@
'explore-all-matching-leads' => 'Explorar todas las oportunidades que coinciden con ":query" (:count)',
'explore-all-matching-contacts' => 'Explorar todos los contactos que coinciden con ":query" (:count)',
'explore-all-matching-quotes' => 'Explorar todas las cotizaciones que coinciden con ":query" (:count)',
'explore-all-settings' => 'Explorar todas las Configuraciones',
'explore-all-configurations' => 'Explorar todas las Configuraciones',
],
],
],
Expand Down Expand Up @@ -1013,14 +1015,15 @@
'marketing' => [
'events' => [
'index' => [
'create-btn' => 'Crear Evento',
'title' => 'Eventos',
'create-success' => 'Evento creado con éxito.',
'update-success' => 'Evento actualizado con éxito.',
'delete-success' => 'Evento eliminado con éxito.',
'delete-failed' => 'No se puede eliminar el evento.',
'mass-delete-success' => 'Eventos eliminados con éxito',
'datagrid' => [
'create-btn' => 'Crear Evento',
'title' => 'Eventos',
'create-success' => 'Evento creado con éxito.',
'update-success' => 'Evento actualizado con éxito.',
'delete-success' => 'Evento eliminado con éxito.',
'delete-failed' => 'No se puede eliminar el evento.',
'mass-delete-success' => 'Eventos eliminados con éxito',
'delete-failed-associated-campaigns' => 'No se puede eliminar el evento porque está asociado con campañas existentes. Por favor, desasocie o actualice esas campañas antes de eliminarlo.',
'datagrid' => [
'delete' => 'Eliminar',
'edit' => 'Editar',
'id' => 'ID',
Expand Down Expand Up @@ -1810,6 +1813,13 @@
'to' => 'A',
],
],
'stages' => [
'won-value' => 'Valor Ganado',
'closed-at' => 'Cerrado El',
'save-btn' => 'Guardar',
'lost-reason' => 'Razón de Pérdida',
'need-more-info' => 'Necesita Más Información',
],
],
'view-switcher' => [
'all-pipelines' => 'Todos los Canales',
Expand Down
26 changes: 18 additions & 8 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 @@ -349,6 +349,8 @@
'explore-all-matching-leads' => 'کاوش در تمامی سرنخ‌های مطابق ":query" (:count)',
'explore-all-matching-contacts' => 'کاوش در تمامی مخاطبین مطابق ":query" (:count)',
'explore-all-matching-quotes' => 'کاوش در تمامی پیشنهادات مطابق ":query" (:count)',
'explore-all-settings' => 'کاوش در تمامی تنظیمات',
'explore-all-configurations' => 'کاوش در تمامی پیکربندی‌ها',
],
],
],
Expand Down Expand Up @@ -1013,14 +1015,15 @@
'marketing' => [
'events' => [
'index' => [
'create-btn' => 'ایجاد رویداد',
'title' => 'رویدادها',
'create-success' => 'رویداد با موفقیت ایجاد شد.',
'update-success' => 'رویداد با موفقیت به‌روزرسانی شد.',
'delete-success' => 'رویداد با موفقیت حذف شد.',
'delete-failed' => 'رویداد قابل حذف نیست.',
'mass-delete-success' => 'رویدادها با موفقیت حذف شدند',
'datagrid' => [
'create-btn' => 'ایجاد رویداد',
'title' => 'رویدادها',
'create-success' => 'رویداد با موفقیت ایجاد شد.',
'update-success' => 'رویداد با موفقیت به‌روزرسانی شد.',
'delete-success' => 'رویداد با موفقیت حذف شد.',
'delete-failed' => 'رویداد قابل حذف نیست.',
'mass-delete-success' => 'رویدادها با موفقیت حذف شدند',
'delete-failed-associated-campaigns' => 'رویداد قابل حذف نیست زیرا با کمپین‌های موجود مرتبط است. لطفاً ابتدا آن‌ها را جدا کرده یا به‌روزرسانی کنید.',
'datagrid' => [
'delete' => 'حذف',
'edit' => 'ویرایش',
'id' => 'شناسه',
Expand Down Expand Up @@ -1810,6 +1813,13 @@
'to' => 'تا',
],
],
'stages' => [
'won-value' => 'ارزش برنده',
'closed-at' => 'بسته شده در',
'save-btn' => 'ذخیره',
'lost-reason' => 'دلیل از دست دادن',
'need-more-info' => 'تحتاج إلى مزيد من التفاصيل',
],
],
'view-switcher' => [
'all-pipelines' => 'تمام خطوط تولید',
Expand Down
26 changes: 18 additions & 8 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 @@ -349,6 +349,8 @@
'explore-all-matching-leads' => 'Explorar todos os negócios correspondentes a ":query" (:count)',
'explore-all-matching-contacts' => 'Explorar todos os contatos correspondentes a ":query" (:count)',
'explore-all-matching-quotes' => 'Explorar todas as cotações correspondentes a ":query" (:count)',
'explore-all-settings' => 'Explorar todas as Configurações',
'explore-all-configurations' => 'Explorar todas as Configurações',
],
],
],
Expand Down Expand Up @@ -1013,14 +1015,15 @@
'marketing' => [
'events' => [
'index' => [
'create-btn' => 'Adicionar Evento',
'title' => 'Eventos',
'create-success' => 'Evento adicionado com sucesso.',
'update-success' => 'Evento atualizado com sucesso.',
'delete-success' => 'Evento excluído com sucesso.',
'delete-failed' => 'Não é possível excluir o evento.',
'mass-delete-success' => 'Eventos excluídos com sucesso',
'datagrid' => [
'create-btn' => 'Adicionar Evento',
'title' => 'Eventos',
'create-success' => 'Evento adicionado com sucesso.',
'update-success' => 'Evento atualizado com sucesso.',
'delete-success' => 'Evento excluído com sucesso.',
'delete-failed' => 'Não é possível excluir o evento.',
'mass-delete-success' => 'Eventos excluídos com sucesso',
'delete-failed-associated-campaigns' => 'Não é possível excluir o evento, pois está associado a campanhas existentes. Por favor, desvincule ou atualize essas campanhas antes de excluir.',
'datagrid' => [
'delete' => 'Excluir',
'edit' => 'Editar',
'id' => 'ID',
Expand Down Expand Up @@ -1810,6 +1813,13 @@
'to' => 'Para',
],
],
'stages' => [
'won-value' => 'Valor Ganhado',
'closed-at' => 'Fechado em',
'save-btn' => 'Salvar',
'lost-reason' => 'Motivo da Perda',
'need-more-info' => 'Precisa de Mais Informações',
],
],
'view-switcher' => [
'all-pipelines' => 'Todos os Funis',
Expand Down
Loading
Loading