From 5a1b725b31077e881cd4aece9501f6a398a06617 Mon Sep 17 00:00:00 2001 From: amit kumar laravel Date: Fri, 27 Dec 2024 11:30:15 +0530 Subject: [PATCH 1/2] Fixed issue #1821 --- .../Controllers/Contact/Persons/PersonController.php | 1 + .../Settings/Warehouse/WarehouseController.php | 1 + .../control-group/controls/inline/email.blade.php | 9 ++++++++- .../control-group/controls/inline/phone.blade.php | 11 +++++++++-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/Controllers/Contact/Persons/PersonController.php b/packages/Webkul/Admin/src/Http/Controllers/Contact/Persons/PersonController.php index 507fa2fbc..b1b9a2dd9 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/Contact/Persons/PersonController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Contact/Persons/PersonController.php @@ -103,6 +103,7 @@ public function update(AttributeForm $request, int $id): RedirectResponse|JsonRe if (request()->ajax()) { return response()->json([ + 'data' => $person, 'message' => trans('admin::app.contacts.persons.index.update-success'), ], 200); } diff --git a/packages/Webkul/Admin/src/Http/Controllers/Settings/Warehouse/WarehouseController.php b/packages/Webkul/Admin/src/Http/Controllers/Settings/Warehouse/WarehouseController.php index cc5138e95..ef96bc54c 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/Settings/Warehouse/WarehouseController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Settings/Warehouse/WarehouseController.php @@ -123,6 +123,7 @@ public function update(AttributeForm $request, int $id): RedirectResponse|JsonRe if (request()->ajax()) { return response()->json([ + 'data' => $warehouse, 'message' => trans('admin::app.settings.warehouses.index.update-success'), ]); } diff --git a/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/email.blade.php b/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/email.blade.php index cc5537173..4cf4894a0 100644 --- a/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/email.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/email.blade.php @@ -289,17 +289,24 @@ class="primary-button justify-center" this.inputValue = params.contact_emails; if (this.url) { + this.isProcessing = true; + this.$axios.put(this.url, { [this.name]: this.inputValue, }) .then((response) => { + this.emails = response.data.data.emails || this.emails; + this.$emitter.emit('add-flash', { type: 'success', message: response.data.message }); }) .catch((error) => { this.inputValue = this.value; this.$emitter.emit('add-flash', { type: 'error', message: error.response.data.message }); - }); + }) + .finally(() => { + this.isProcessing = false; + }); } this.$emit('on-save', params); diff --git a/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/phone.blade.php b/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/phone.blade.php index b92697cd4..3bc01e582 100644 --- a/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/phone.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/phone.blade.php @@ -287,20 +287,27 @@ class="primary-button justify-center" }, updateOrCreate(params) { - this.inputValue = params.contact_numbers; + this.inputValue = params.contact_numbers || this.inputValue; if (this.url) { + this.isProcessing = true; + this.$axios.put(this.url, { [this.name]: this.inputValue, }) .then((response) => { + this.contactNumbers = response.data.data.contact_numbers || this.contactNumbers; + this.$emitter.emit('add-flash', { type: 'success', message: response.data.message }); }) .catch((error) => { this.inputValue = this.value; this.$emitter.emit('add-flash', { type: 'error', message: error.response.data.message }); - }); + }) + .finally(() => { + this.isProcessing = false; + }); } this.$emit('on-save', params); From 79e818f688cc079df265090f2854bccb7aef491b Mon Sep 17 00:00:00 2001 From: amit kumar laravel Date: Fri, 10 Jan 2025 18:57:00 +0530 Subject: [PATCH 2/2] Fix Issue on emails. --- .../form/control-group/controls/inline/email.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/email.blade.php b/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/email.blade.php index 4cf4894a0..9028e4a09 100644 --- a/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/email.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/email.blade.php @@ -286,7 +286,7 @@ class="primary-button justify-center" }, updateOrCreate(params) { - this.inputValue = params.contact_emails; + this.inputValue = params.contact_emails ?? params.emails; if (this.url) { this.isProcessing = true;