Skip to content

Fix Won/Lost modal failure and broken dashboard chart#2491 #2495

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
willestevam wants to merge 2 commits into
base: 2.2
Choose a base branch
from
Open

Fix Won/Lost modal failure and broken dashboard chart#2491 #2495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da9eea8
Fix JS syntax error when locale contains double quotes in pipeline du…
Apr 6, 2026
37fba10
Merge branch '2.2' into fix/won-lost-modal-failure-and-broken-dashboa…
willestevam Apr 16, 2026
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
25 changes: 13 additions & 12 deletions packages/Webkul/Admin/src/Resources/views/settings/pipelines/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,23 +157,24 @@ class="flex gap-4 overflow-x-auto"
<!-- Stage Title and Action -->
<div class="flex items-center justify-between">
<span class="py-1 font-medium dark:text-gray-300">
@{{ element.name ? element.name : '@lang('admin::app.settings.pipelines.create.newly-added')'}}
@{{ element.name ? element.name : '@lang('admin::app.settings.pipelines.create.newly-added')'}}
</span>

<!-- Drag Icon -->
<i
v-if="isDragable(element)"
v-if="isDragable(element)"
class="icon-move cursor-grab rounded-md p-1 text-2xl transition-all hover:bg-gray-100 dark:hover:bg-gray-950"
>
</i>
</div>

<!-- Card Body -->
<div>
<input
type="hidden"
id="slug"
:value="slugify(element.name)"
:value="slugify(element.code ? element.code : element.name)"

:name="'stages[' + element.id + '][code]'"
/>

Expand All @@ -184,7 +185,7 @@ class="icon-move cursor-grab rounded-md p-1 text-2xl transition-all hover:bg-gra
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.pipelines.create.name')
</x-admin::form.control-group.label>

<x-admin::form.control-group.control
type="text"
::name="'stages[' + element.id + '][name]'"
Expand Down Expand Up @@ -227,7 +228,7 @@ class="icon-move cursor-grab rounded-md p-1 text-2xl transition-all hover:bg-gra
{!! view_render_event('admin.settings.pipelines.create.form.stages.probability.after') !!}
</div>
</div>

{!! view_render_event('admin.settings.pipelines.create.form.stages.delete_button.before') !!}

<div
Expand All @@ -236,7 +237,7 @@ class="flex cursor-pointer items-center gap-2 border-t border-gray-300 p-2 text-
v-if="isDragable(element)"
>
<i class="icon-delete text-2xl"></i>

@lang('admin::app.settings.pipelines.create.delete-stage')
</div>

Expand Down Expand Up @@ -287,7 +288,7 @@ class="secondary-button"
return {
stages: [{
'id': 'stage_1',
'code': 'new',
'code': 'new',
'name': "@lang('admin::app.settings.pipelines.create.new-stage')",
'probability': 100
}, {
Expand Down Expand Up @@ -346,7 +347,7 @@ class="secondary-button"
}

this.removeUniqueNameErrors();

this.$emitter.emit('add-flash', { type: 'success', message: "@lang('admin::app.settings.pipelines.create.stage-delete-success')" });
}
});
Expand Down Expand Up @@ -388,7 +389,7 @@ class="secondary-button"
});

if (filteredStages.length > 1) {
return "{!! trans('admin::app.settings.pipelines.create.duplicate-name') !!}";
return @json(trans('admin::app.settings.pipelines.create.duplicate-name'));
}

this.removeUniqueNameErrors();
Expand All @@ -415,7 +416,7 @@ class="secondary-button"

handleDragging(event) {
const draggedElement = event.draggedContext.element;

const relatedElement = event.relatedContext.element;

return this.isDragable(draggedElement) && this.isDragable(relatedElement);
Expand All @@ -424,4 +425,4 @@ class="secondary-button"
})
</script>
@endPushOnce
</x-admin::layouts>
</x-admin::layouts>
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/views/settings/pipelines/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ class="secondary-button"
});

if (filteredStages.length > 1) {
return "{!! trans('admin::app.settings.pipelines.create.duplicate-name') !!}";
return @json(trans('admin::app.settings.pipelines.create.duplicate-name'));
}

this.removeUniqueNameErrors();
Expand Down