fixes on addresses

app/Http/Controllers/Shop/Auth/LoginController.php

@@ -32,8 +32,13 @@ class LoginController extends Controller
 
         if ($this->guard()->attempt($credentials, $request->get('remember'))) {
             $request->session()->regenerate();
-
-            return back()->getTargetUrl() === route('Shop.login') ? redirect()->intended(route('home')) : back();
+            if (back()->getTargetUrl() === route('Shop.Orders.store')) {
+                $route = 'Shop.Orders.order';
+            } else {
+                $route = 'home';
+            }
+    
+            return redirect()->intended(route($route));
         }
 
         return back()->withErrors([

app/Http/Controllers/Shop/Auth/RegisterController.php

@@ -24,28 +24,27 @@ class RegisterController extends Controller
 
     public function register(RegisterCustomer $request)
     {
-        $validatedData = $request->validateWithBag('Errors', [
+        $request->validateWithBag('Errors', [
             'last_name' => 'required|max:255',
             'first_name' => 'required|max:255',
             'email' => 'required|email|max:255|unique:shop_customers,email,NULL,id,deleted_at,NULL',
             'password' => ['required', 'confirmed', new Password()],
 
         ]);
-    
+
+        if (back()->getTargetUrl() === route('Shop.Orders.store')) {
+            $route = 'Shop.Orders.order';
+        } else {
+            $route = 'home';
+        }
+
         $user = $this->create($request->all());
 
         $this->guard()->login($user);
-        /*
-        $response = $this->registered($request, $user);
-
-        if ($response) {
-            return $response;
-        }
-        */
 
         return $request->wantsJson()
             ? new JsonResponse([], 201)
-            : redirect()->route('home');
+            : redirect()->route($route);
     }
 
     public function emailVerify()

app/Http/Controllers/Shop/CustomerController.php

@@ -52,6 +52,6 @@ class CustomerController extends Controller
         $data = $request->all();
         $customer = Customers::storeFull($data);
 
-        return response()->json(['error' => 0]);
+        return redirect()->route('Shop.Customers.edit');
     }
 }

app/Repositories/Shop/CustomerAddresses.php

@@ -12,27 +12,35 @@ class CustomerAddresses
     public static function add($userId, $data)
     {
         $name = $data['company'] ? $data['company'] : $data['first_name'].' '.$data['last_name'];
-        if ($data['use_for_delivery'] ?? false) {
-            return self::store([
-                'customer_id' => $userId,
-                'name' => $name,
-                'address' => $data['delivery_address'],
-                'address2' => $data['delivery_address2'],
-                'zipcode' => $data['delivery_zipcode'],
-                'city' => $data['delivery_city'],
-            ]);
-        }
-
+        $delivery = $data['use_for_delivery'] ?? false;
+        
         return self::store([
             'customer_id' => $userId,
             'name' => $name,
-            'address' => $data['address'],
-            'address2' => $data['address2'],
-            'zipcode' => $data['zipcode'],
-            'city' => $data['city'],
+            'address' => $delivery ? $data['delivery_address'] : $data['address'],
+            'address2' => $delivery ? $data['delivery_address2'] : $data['address2'],
+            'zipcode' => $delivery ? $data['delivery_zipcode'] : $data['zipcode'],
+            'city' => $delivery ? $data['delivery_city'] : $data['city'],
         ]);
     }
 
+    public static function storeByCustomer($customer, $data)
+    {
+        $deliveries = $data['deliveries'] ?? false;
+        if ($deliveries && $deliveries['zipcode'] && $deliveries['city']) {
+            $deliveries['customer_id'] = $customer->id;
+            $deliveries['type'] = 1;
+            self::store($deliveries);
+        }
+
+        $invoices = $data['invoices'] ?? false;
+        if ($invoices && $invoices['zipcode'] && $invoices['city']) {
+            $invoices['customer_id'] = $customer->id;
+            $invoices['type'] = 2;
+            self::store($invoices);
+        }
+    }
+
     public static function toggleActive($id, $active)
     {
         return self::update(['active' => $active], $id);

app/Repositories/Shop/Customers.php

@@ -70,7 +70,7 @@ class Customers
     {
         $customer = $id ? self::get($id) : self::getAuth();
         $file = self::makeAvatarFilename($customer);
-        if (! File::checkFile($file)) {
+        if (!File::checkFile($file)) {
             self::createAvatar($customer);
         }
 
@@ -80,7 +80,7 @@ class Customers
     public static function createAvatar($customer)
     {
         $filename = self::makeAvatarFilename($customer);
-        $name = $customer->first_name.' '.$customer->last_name;
+        $name = $customer->first_name . ' ' . $customer->last_name;
         $avatar = new Avatar();
 
         return $avatar->create($name)
@@ -97,7 +97,7 @@ class Customers
     {
         $path = storage_path(self::getStorage());
         if (File::checkDirOrCreate($path)) {
-            $filename = $path.self::getAvatarFilename($customer);
+            $filename = $path . self::getAvatarFilename($customer);
         }
 
         return $filename ?? false;
@@ -105,7 +105,7 @@ class Customers
 
     public static function getAvatarFilename($customer)
     {
-        return 'user-'.$customer->uuid.'.png';
+        return 'user-' . $customer->uuid . '.png';
     }
 
     public static function getAddresses($id = false)
@@ -141,7 +141,7 @@ class Customers
 
     public static function isNotConnected()
     {
-        return ! self::isConnected();
+        return !self::isConnected();
     }
 
     public static function isConnected()
@@ -161,19 +161,26 @@ class Customers
 
     public static function storeFull($data)
     {
-        $saleChannels = $data['sale_channels'];
-        unset($data['sale_channels']);
-        $customer = self::store($data);
-        if ($customer) {
-            self::storeSaleChannels($customer->id, $saleChannels);
+        $data2 = $data;
+        if ($data['sale_channels'] ?? false) {
+            $saleChannels = $data['sale_channels'] ?? false;
+            unset($data['sale_channels']);
         }
+        if ($data['deliveries'] ?? false) {
+            unset($data['deliveries']);
+        }
+        if ($data['invoices'] ?? false) {
+            unset($data['invoices']);
+        }
+        $customer = self::store($data);
+        CustomerAddresses::storeByCustomer($customer, $data2);
 
         return $customer->id;
     }
 
     public static function storeDeliveries($customer, $deliveries)
     {
-        if (! $deliveries) {
+        if (!$deliveries) {
             return false;
         }
         $deliveries = collect($deliveries)->transform(function ($item) {
@@ -220,14 +227,14 @@ class Customers
     {
         $path = '/app/public/Customers/';
 
-        return $filename ? $path.$filename : $path;
+        return $filename ? $path . $filename : $path;
     }
 
     public static function getPublic($filename = false)
     {
         $path = '/storage/Customers/';
 
-        return $filename ? $path.$filename : $path;
+        return $filename ? $path . $filename : $path;
     }
 
     public static function guard()

app/Repositories/Shop/OrderMails.php

@@ -16,7 +16,7 @@ class OrderMails
 
     public static function sendOrderConfirmed($orderId)
     {
-        $order = Orders::get($orderId, ['customer', 'address']);
+        $order = Orders::get($orderId, ['customer', 'delivery_address']);
         $mail = new ConfirmationCommande($order);
 
         return Mail::to($order->customer->email)->send($mail);

app/Repositories/Shop/Orders.php

@@ -59,7 +59,7 @@ class Orders
     public static function saveOrder($data)
     {
         $basket = $data['basket'];
-        $invoice = $data['invoice'];
+        $invoice = $data['invoice'] ?? [];
         unset($data['basket'], $data['invoice']);
         $data += self::getSummaryOfBasket($basket);
         $order = self::store($data);