From bfd30b668ed97df3ddf693c21cc2d21d1f0c3e53 Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludovic.candellier@fundglobam.com>
Date: Thu, 29 Dec 2022 17:13:43 +0100
Subject: [PATCH] fixes

---
 app/Repositories/Shop/CustomerAddresses.php   | 24 +++++++++++++------
 .../views/Admin/Shop/Orders/list.blade.php    |  2 +-
 resources/views/Shop/Baskets/basket.blade.php |  2 +-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/Repositories/Shop/CustomerAddresses.php b/app/Repositories/Shop/CustomerAddresses.php
index e069ee2e..766637bb 100644
--- a/app/Repositories/Shop/CustomerAddresses.php
+++ b/app/Repositories/Shop/CustomerAddresses.php
@@ -23,13 +23,23 @@ class CustomerAddresses
 
     public static function add($user_id, $data)
     {
-        return self::store([
-            'customer_id' => $user_id,
-            'address' => $data['delivery_address'],
-            'address2' => $data['delivery_address2'],
-            'zipcode' => $data['delivery_zipcode'],
-            'city' => $data['city'],
-        ]);
+        if ($data['use_for_delivery']) {
+            return self::store([
+                'customer_id' => $user_id,
+                'address' => $data['delivery_address'],
+                'address2' => $data['delivery_address2'],
+                'zipcode' => $data['delivery_zipcode'],
+                'city' => $data['delivery_city'],
+            ]);
+        } else {
+            return self::store([
+                'customer_id' => $user_id,
+                'address' => $data['address'],
+                'address2' => $data['address2'],
+                'zipcode' => $data['zipcode'],
+                'city' => $data['city'],
+            ]);
+        }
     }
 
     public static function store($data)
diff --git a/resources/views/Admin/Shop/Orders/list.blade.php b/resources/views/Admin/Shop/Orders/list.blade.php
index c838cf66..dee36eab 100644
--- a/resources/views/Admin/Shop/Orders/list.blade.php
+++ b/resources/views/Admin/Shop/Orders/list.blade.php
@@ -6,6 +6,6 @@
 
 @section('content')
 	@component('components.card')
-		@include('components.datatable', ['route' => route('Admin.Shop.Orders.index'), 'model' => 'orders'])
+		@include('components.datatable', ['route' => route('Admin.Shop.Orders.index'), 'model' => 'orders', 'with_add' => false])
 	@endcomponent
 @endsection
diff --git a/resources/views/Shop/Baskets/basket.blade.php b/resources/views/Shop/Baskets/basket.blade.php
index 0c8bc60c..9d2fdd14 100644
--- a/resources/views/Shop/Baskets/basket.blade.php
+++ b/resources/views/Shop/Baskets/basket.blade.php
@@ -28,7 +28,7 @@
 				@endforeach		
 			</div>
 			<div class="col-4">
-				<x-card class='shadow gradient-green1'>
+				<x-card class='shadow'>
 					@include('Shop.Baskets.partials.basketTotal')
 					<div class="row m-3">
 						<div class="col-12 text-center">