wait #6040 @1:00

diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index ea570df888635b4000e3480bbb8b481e4259e176..7c8fd36f7f94f1178bde90eed6d78a76df0ad5df 100644 (file)
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -500,15 +500,15 @@ class AjaxController extends CubistFrontController
         $email = Client::getClientConnected()->email;
         $address = Client::getClientConnected()->address;
 
-        $addressToArray = json_decode($address);
+        $addressToArray = json_decode($address, true);
 
-        $checkBillingAddress = array_filter($addressToArray, function($n) { return $n->billing_address; });
-        $checkDeliveryAddress = array_filter($addressToArray, function($n) { return $n->delivery_address; });
+        $checkBillingAddress = array_filter($addressToArray, function($n) { return $n['billing_address']; });
+        $checkDeliveryAddress = array_filter($addressToArray, function($n) { return $n['delivery_address']; });
 
 
         if(isset($request->address['billing_address'])){
             foreach ($addressToArray as $key => &$value){
-                $value->billing_address = "0";
+                $value['billing_address'] = "0";
             }
             $data['address']['billing_address'] = "1";
         }else{
@@ -518,7 +518,7 @@ class AjaxController extends CubistFrontController
 
         if(isset($request->address['delivery_address'])){
             foreach ($addressToArray as $key => &$value){
-                $value->delivery_address = "0";
+                $value['delivery_address'] = "0";
             }
             $data['address']['delivery_address'] = "1";
 
@@ -527,17 +527,18 @@ class AjaxController extends CubistFrontController
         }
 
         foreach ($addressToArray as $key => &$value){
-            $value->id = $key;
+            $value['id'] = $key;
         }
         $data['address']['id'] = $index;
+
         $addressToArray[$index] = (object) $data['address'];
 
 
         if(!$checkBillingAddress && !isset($request->address['billing_address'])){
-            $addressToArray[0]->billing_address = "1";
+            $addressToArray[0]['billing_address'] = "1";
         }
         if(!$checkDeliveryAddress && !isset($request->address['delivery_address'])){
-            $addressToArray[0]->delivery_address = "1";
+            $addressToArray[0]['delivery_address'] = "1";
         }
 
         //
@@ -552,6 +553,7 @@ class AjaxController extends CubistFrontController
         $addressToArray = json_decode($address);
 
         unset($addressToArray[$index]);
+        $addressToArray = array_values($addressToArray);
         $addressToString = json_encode($addressToArray);
 
         $email = Client::getClientConnected()->email;

diff --git a/resources/js/app.js b/resources/js/app.js
index a24da2ce422fd1f83df23d0482ab1e8b918a316f..82ff11c02d5db69c56663add2943f6c08db436aa 100644 (file)
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -287,7 +287,7 @@ const app = new Vue({
                 }
             );
             setTimeout(() => {
-                parent ? el.parentElement.remove() : el.remove()
+                parent && !el.classList.contains('ajax-form') ? el.parentElement.remove() : el.remove()
             }, 1000)
         },
         checkEmailExist() {
@@ -414,6 +414,7 @@ const app = new Vue({
                 target.removeAttribute('disabled')
 
             }, 150)
+            console.log('add addresses',this.addresses)
         },
         update(id) {
             let root = this,
@@ -441,6 +442,8 @@ const app = new Vue({
                 .then(function (response) {
                     root.removeErrorsForm()
                     root.validateAction = true
+
+                    console.log('update addresses',root.addresses)
                 })
                 .catch(function (error) {
                     root.errorHandling(error, root, formId)
@@ -457,9 +460,10 @@ const app = new Vue({
                     if(response.data)
                         root.addresses = response.data
 
-                    root.animateDelete(form_, true)
+                    this.animateDelete(form_, true)
                 })
                 .catch(function (error) {
+                    return error;
                 }
             )
         },