From adc617fbad65923185347782b61b6305caa6c559 Mon Sep 17 00:00:00 2001 From: Suraj Kashyap Date: Mon, 11 Nov 2024 10:53:12 +0530 Subject: [PATCH 1/2] fix activities not getting updated when stages changes. --- .../components/activities/index.blade.php | 53 +++++++++---------- .../views/leads/view/stages.blade.php | 20 +++---- 2 files changed, 34 insertions(+), 39 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/components/activities/index.blade.php b/packages/Webkul/Admin/src/Resources/views/components/activities/index.blade.php index 55ce04572..48046ff6d 100644 --- a/packages/Webkul/Admin/src/Resources/views/components/activities/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/components/activities/index.blade.php @@ -15,6 +15,7 @@ active-type="{{ $activeType }}" @if($types):types='@json($types)'@endif @if($extraTypes):extra-types='@json($extraTypes)'@endif + ref="activities" > @@ -556,59 +557,53 @@ class="dark:mix-blend-exclusion dark:invert" }); }, - markAsDone: function(activity) { - let self = this; - + markAsDone(activity) { this.$emitter.emit('open-confirm-modal', { agree: () => { - self.isUpdating[activity.id] = true; + this.isUpdating[activity.id] = true; this.$axios.put("{{ route('admin.activities.update', 'replaceId') }}".replace('replaceId', activity.id), { 'is_done': 1 }) - .then (function(response) { - self.isUpdating[activity.id] = false; + .then ((response) => { + this.isUpdating[activity.id] = false; activity.is_done = 1; - self.$emitter.emit('add-flash', { type: 'success', message: response.data.message }); + this.$emitter.emit('add-flash', { type: 'success', message: response.data.message }); }) - .catch (function (error) { - self.isUpdating[activity.id] = false; + .catch ((error) => { + this.isUpdating[activity.id] = false; - self.$emitter.emit('add-flash', { type: 'error', message: error.response.data.message }); + this.$emitter.emit('add-flash', { type: 'error', message: error.response.data.message }); }); }, }); }, - remove: function(activity) { - let self = this; - + remove(activity) { this.$emitter.emit('open-confirm-modal', { agree: () => { - self.isUpdating[activity.id] = true; + this.isUpdating[activity.id] = true; this.$axios.delete("{{ route('admin.activities.delete', 'replaceId') }}".replace('replaceId', activity.id)) - .then (function(response) { - self.isUpdating[activity.id] = false; + .then ((response) => { + this.isUpdating[activity.id] = false; - self.activities.splice(self.activities.indexOf(activity), 1); + this.activities.splice(this.activities.indexOf(activity), 1); - self.$emitter.emit('add-flash', { type: 'success', message: response.data.message }); + this.$emitter.emit('add-flash', { type: 'success', message: response.data.message }); }) .catch (function (error) { - self.isUpdating[activity.id] = false; + this.isUpdating[activity.id] = false; - self.$emitter.emit('add-flash', { type: 'error', message: error.response.data.message }); + this.$emitter.emit('add-flash', { type: 'error', message: error.response.data.message }); }); }, }); }, - unlinkEmail: function(activity) { - let self = this; - + unlinkEmail(activity) { this.$emitter.emit('open-confirm-modal', { agree: () => { let emailId = activity.parent_id ?? activity.id; @@ -619,25 +614,25 @@ class="dark:mix-blend-exclusion dark:invert" } }) .then (response => { - let relatedActivities = self.activities.filter(activity => activity.parent_id == emailId || activity.id == emailId); + let relatedActivities = this.activities.filter(activity => activity.parent_id == emailId || activity.id == emailId); relatedActivities.forEach(activity => { - const index = self.activities.findIndex(a => a === activity); + const index = this.activities.findIndex(a => a === activity); if (index !== -1) { - self.activities.splice(index, 1); + this.activities.splice(index, 1); } }); - self.$emitter.emit('add-flash', { type: 'success', message: response.data.message }); + this.$emitter.emit('add-flash', { type: 'success', message: response.data.message }); }) .catch (error => { - self.$emitter.emit('add-flash', { type: 'success', message: response.data.message }); + this.$emitter.emit('add-flash', { type: 'success', message: response.data.message }); }); } }); }, - } + }, }); @endPushOnce diff --git a/packages/Webkul/Admin/src/Resources/views/leads/view/stages.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/view/stages.blade.php index 54ba4810f..129117196 100644 --- a/packages/Webkul/Admin/src/Resources/views/leads/view/stages.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/leads/view/stages.blade.php @@ -231,26 +231,26 @@ class="primary-button" this.isUpdating = true; - let self = this; - this.$axios .put("{{ route('admin.leads.stage.update', $lead->id) }}", params ?? { 'lead_pipeline_stage_id': stage.id }) - .then (function(response) { - self.isUpdating = false; + .then ((response) => { + this.isUpdating = false; + + this.currentStage = stage; - self.currentStage = stage; + this.$parent.$refs.activities.get(); - self.$emitter.emit('add-flash', { type: 'success', message: response.data.message }); + this.$emitter.emit('add-flash', { type: 'success', message: response.data.message }); }) - .catch (function (error) { - self.isUpdating = false; + .catch ((error) => { + this.isUpdating = false; - self.$emitter.emit('add-flash', { type: 'error', message: error.response.data.message }); + this.$emitter.emit('add-flash', { type: 'error', message: error.response.data.message }); }); }, - } + }, }); @endPushOnce From 73d36623f012e5d1878ad5f82ae79ab80d9f01d1 Mon Sep 17 00:00:00 2001 From: Suraj Kashyap Date: Mon, 11 Nov 2024 11:16:14 +0530 Subject: [PATCH 2/2] fix minor issues and refine some code. --- .../views/components/activities/index.blade.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/components/activities/index.blade.php b/packages/Webkul/Admin/src/Resources/views/components/activities/index.blade.php index 48046ff6d..83d274088 100644 --- a/packages/Webkul/Admin/src/Resources/views/components/activities/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/components/activities/index.blade.php @@ -565,14 +565,14 @@ class="dark:mix-blend-exclusion dark:invert" this.$axios.put("{{ route('admin.activities.update', 'replaceId') }}".replace('replaceId', activity.id), { 'is_done': 1 }) - .then ((response) => { + .then((response) => { this.isUpdating[activity.id] = false; activity.is_done = 1; this.$emitter.emit('add-flash', { type: 'success', message: response.data.message }); }) - .catch ((error) => { + .catch((error) => { this.isUpdating[activity.id] = false; this.$emitter.emit('add-flash', { type: 'error', message: error.response.data.message }); @@ -587,14 +587,14 @@ class="dark:mix-blend-exclusion dark:invert" this.isUpdating[activity.id] = true; this.$axios.delete("{{ route('admin.activities.delete', 'replaceId') }}".replace('replaceId', activity.id)) - .then ((response) => { + .then((response) => { this.isUpdating[activity.id] = false; this.activities.splice(this.activities.indexOf(activity), 1); this.$emitter.emit('add-flash', { type: 'success', message: response.data.message }); }) - .catch (function (error) { + .catch((error) => { this.isUpdating[activity.id] = false; this.$emitter.emit('add-flash', { type: 'error', message: error.response.data.message }); @@ -613,7 +613,7 @@ class="dark:mix-blend-exclusion dark:invert" email_id: emailId, } }) - .then (response => { + .then((response) => { let relatedActivities = this.activities.filter(activity => activity.parent_id == emailId || activity.id == emailId); relatedActivities.forEach(activity => { @@ -626,8 +626,8 @@ class="dark:mix-blend-exclusion dark:invert" this.$emitter.emit('add-flash', { type: 'success', message: response.data.message }); }) - .catch (error => { - this.$emitter.emit('add-flash', { type: 'success', message: response.data.message }); + .catch((error) => { + this.$emitter.emit('add-flash', { type: 'error', message: error.response.data.message }); }); } });