From 69478e3c7436b4df088af1cac35441bb3de99de6 Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludovic.candellier@fundglobam.com>
Date: Wed, 13 Sep 2023 22:17:49 +0200
Subject: [PATCH] minor fix on updating status of order, upgrade datatables

---
 .../Admin/Shop/OrderController.php            | 19 ++++++++++---------
 app/Mail/Acheminement.php                     |  6 +++---
 app/Repositories/Shop/OrderMails.php          |  4 ++--
 composer.json                                 |  2 +-
 .../views/Admin/Shop/Orders/edit.blade.php    | 12 +++++++++++-
 .../partials/sliderByShelve.blade.php         |  4 +++-
 6 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/Admin/Shop/OrderController.php b/app/Http/Controllers/Admin/Shop/OrderController.php
index c304fc21..de169f97 100644
--- a/app/Http/Controllers/Admin/Shop/OrderController.php
+++ b/app/Http/Controllers/Admin/Shop/OrderController.php
@@ -30,8 +30,6 @@ class OrderController extends Controller
     public function edit($id)
     {
         $data = Orders::edit($id);
-        // dump($data);
-        // exit;
 
         return view('Admin.Shop.Orders.edit', $data);
     }
@@ -39,13 +37,16 @@ class OrderController extends Controller
     public function store(Request $request)
     {
         $order = Orders::store($request->all());
-        switch ($order->status) {
-            case 1:
-                OrderMails::sendPreparation($order->id);
-                break;
-            case 2:
-                OrderMails::sendShipping($order->id);
-                break;
+        if ($order->wasChanged('status')) {
+            switch ($order->status) {
+                case 1:
+                    OrderMails::sendPreparation($order->id);
+                    break;
+                case 2:
+                    OrderMails::sendShipping($order->id);
+                    break;
+                default:
+            }
         }
 
         return redirect()->route('Admin.Shop.Orders.index');
diff --git a/app/Mail/Acheminement.php b/app/Mail/Acheminement.php
index 17ee3437..0d4e8ea2 100644
--- a/app/Mail/Acheminement.php
+++ b/app/Mail/Acheminement.php
@@ -45,9 +45,9 @@ class Acheminement extends TemplateMailable
     {
         $this->prenom = $order->customer->first_name;
         $this->nom = $order->customer->last_name;
-        $this->adresse = $order->address->address;
-        $this->cp = $order->address->zipcode;
-        $this->ville = $order->address->city;
+        $this->adresse = $order->delivery_address->address;
+        $this->cp = $order->delivery_address->zipcode;
+        $this->ville = $order->delivery_address->city;
         $this->societe = $order->customer->company;
         $this->email = $order->customer->email;
         $this->numero_suivi = $order->delivery_ref;
diff --git a/app/Repositories/Shop/OrderMails.php b/app/Repositories/Shop/OrderMails.php
index 72301895..23b4ca74 100644
--- a/app/Repositories/Shop/OrderMails.php
+++ b/app/Repositories/Shop/OrderMails.php
@@ -28,7 +28,7 @@ class OrderMails
 
     public static function sendPreparation($orderId)
     {
-        $order = Orders::get($orderId, ['customer', 'address']);
+        $order = Orders::get($orderId, ['customer', 'delivery_address']);
         $mail = new Preparation($order);
 
         return Mail::to($order->customer->email)->send($mail);
@@ -36,7 +36,7 @@ class OrderMails
 
     public static function sendShipping($orderId)
     {
-        $order = Orders::get($orderId, ['customer', 'address']);
+        $order = Orders::get($orderId, ['customer', 'delivery_address']);
         $mail = new Acheminement($order);
 
         return Mail::to($order->customer->email)->send($mail);
diff --git a/composer.json b/composer.json
index 16bad87d..8832a326 100644
--- a/composer.json
+++ b/composer.json
@@ -103,7 +103,7 @@
         "watson/rememberable": "^6.0",
         "wildside/userstamps": "^2.1",
         "yadahan/laravel-authentication-log": "^1.2",
-        "yajra/laravel-datatables": "^1.5"
+        "yajra/laravel-datatables": "^9.0"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.8",
diff --git a/resources/views/Admin/Shop/Orders/edit.blade.php b/resources/views/Admin/Shop/Orders/edit.blade.php
index 6d116c0b..0c832118 100644
--- a/resources/views/Admin/Shop/Orders/edit.blade.php
+++ b/resources/views/Admin/Shop/Orders/edit.blade.php
@@ -13,7 +13,7 @@
                     <h4>{{ $order['delivery']['name'] }} </h4>
                 </div>
                 <div class="col-6 text-right">
-                    @include('components.form.buttons.button-save')
+                    <x-save />
                 </div>
             </div>
 
@@ -121,3 +121,13 @@
         </x-card>
     {{ Form::close() }}
 @endsection
+
+@include('load.form.save')
+@include('load.form.select2')
+
+@push('js')
+    <script>
+        initSaveForm('#order-form');
+        initSelect2();
+    </script>
+@endpush
diff --git a/resources/views/Shop/Homepage/partials/sliderByShelve.blade.php b/resources/views/Shop/Homepage/partials/sliderByShelve.blade.php
index d7518d20..656c17a2 100644
--- a/resources/views/Shop/Homepage/partials/sliderByShelve.blade.php
+++ b/resources/views/Shop/Homepage/partials/sliderByShelve.blade.php
@@ -5,7 +5,9 @@
 				<h1 class="p-2 green" style="font-size: 2em;">{{ $shelve['name'] }}</h1>
 			</div>
 			<div class="col-6 text-right">
-				<a class="mt-2 btn btn-green-dark" href="{{ route('Shop.Categories.show', ['id' => $shelve['id']]) }}">Découvrir la sélection</a>
+				<a href="{{ route('Shop.Categories.show', ['id' => $shelve['id']]) }}" class="mt-2 btn btn-green-dark" >
+					Découvrir la sélection
+				</a>
 				<a class="mt-2 green-dark btn" href="{{ route('Shop.Categories.show', ['id' => $shelve['id']]) }}">Tout voir</a>
 			</div>
 		</div>