From 0123885e038170ba89b033199c1b14c17e8eb384 Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludovic.candellier@fundglobam.com>
Date: Sun, 1 Jan 2023 22:45:27 +0100
Subject: [PATCH] enhance addresses

---
 .../Shop/Auth/RegisterController.php          |  2 +-
 app/Repositories/Shop/CustomerAddresses.php   |  3 +++
 resources/views/Shop/Orders/order.blade.php   |  2 +-
 .../Shop/Orders/partials/addresses.blade.php  | 25 ++++++++++++-------
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/Shop/Auth/RegisterController.php b/app/Http/Controllers/Shop/Auth/RegisterController.php
index 160e99a4..a488eaed 100644
--- a/app/Http/Controllers/Shop/Auth/RegisterController.php
+++ b/app/Http/Controllers/Shop/Auth/RegisterController.php
@@ -48,7 +48,7 @@ class RegisterController extends Controller
 
     public function showRegistrationForm()
     {
-        return view('Shop.auth.register', $data ?? []);
+        return view('Shop.auth.register');
     }
 
     protected function create(array $data)
diff --git a/app/Repositories/Shop/CustomerAddresses.php b/app/Repositories/Shop/CustomerAddresses.php
index 86e2f480..16f11966 100644
--- a/app/Repositories/Shop/CustomerAddresses.php
+++ b/app/Repositories/Shop/CustomerAddresses.php
@@ -23,9 +23,11 @@ class CustomerAddresses
 
     public static function add($user_id, $data)
     {
+        $name = $data['company'] ? $data['company'] : $data['first_name'] . ' ' . $data['last_name']; 
         if ($data['use_for_delivery'] ?? false) {
             return self::store([
                 'customer_id' => $user_id,
+                'name' => $name,
                 'address' => $data['delivery_address'],
                 'address2' => $data['delivery_address2'],
                 'zipcode' => $data['delivery_zipcode'],
@@ -34,6 +36,7 @@ class CustomerAddresses
         } else {
             return self::store([
                 'customer_id' => $user_id,
+                'name' => $name,
                 'address' => $data['address'],
                 'address2' => $data['address2'],
                 'zipcode' => $data['zipcode'],
diff --git a/resources/views/Shop/Orders/order.blade.php b/resources/views/Shop/Orders/order.blade.php
index 18f099a8..8491b065 100644
--- a/resources/views/Shop/Orders/order.blade.php
+++ b/resources/views/Shop/Orders/order.blade.php
@@ -24,7 +24,7 @@
 
 				<div id="registred" @if (!App\Repositories\Shop\Customers::isConnected()) class="d-none" @endif>
 					<x-layout.collapse id="adresses" title="Adresses" class="rounded-lg mb-3" uncollapsed=true>
-						@include('Shop.Orders.partials.addresses')
+						@include('Shop.Orders.partials.addresses', ['addresses' => $customer['addresses'] ?? false])
 					</x-layout.collapse>
 
 					<x-layout.collapse id="delivery_mode" title="Mode de livraison" class="rounded-lg mb-3" uncollapsed=true>
diff --git a/resources/views/Shop/Orders/partials/addresses.blade.php b/resources/views/Shop/Orders/partials/addresses.blade.php
index bc720055..23335fc0 100644
--- a/resources/views/Shop/Orders/partials/addresses.blade.php
+++ b/resources/views/Shop/Orders/partials/addresses.blade.php
@@ -1,10 +1,17 @@
-@foreach ($addresses ?? [] as $address)
-    <div class="row">
-        <div class="col-1">
-            <x-form.radios.icheck name="address_id" val="{{ $address['id'] }}" id="address_{{ $address['id'] }}"/>
+@if ($addresses)
+    @foreach ($addresses ?? [] as $address)
+        <div class="row">
+            <div class="col-1">
+                <x-form.radios.icheck name="address_id" val="{{ $address['id'] }}" id="address_{{ $address['id'] }}"/>
+            </div>
+            <div class="col-11">
+                {{ $address['name'] }}<br/>
+                {{ $address['address'] }}<br/>
+                @if ($address['address2'])
+                    {{ $address['address2'] }}<br/>
+                @endif
+                {{ $address['zipcode'] }} {{ $address['city'] }}<br/>
+            </div>
         </div>
-        <div class="col-11">
-            
-        </div>
-    </div>
-@endforeach
+    @endforeach
+@endif
\ No newline at end of file