Fixed issue krayin#1821

amit-webkul · Dec 27, 2024 · 5a1b725 · 5a1b725
1 parent 1f90616
commit 5a1b725
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 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
@@ -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
@@ -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/...l/Admin/src/Resources/views/components/form/control-group/controls/inline/email.blade.php b/...l/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/...l/Admin/src/Resources/views/components/form/control-group/controls/inline/phone.blade.php b/...l/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);