From 07575fe15111b916423cebb9cc76681153fcce08 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 6 Oct 2023 11:22:23 +0200
Subject: [PATCH] wait #6363 @0.5

---
 app/Events/OrderOperation.php           |  3 ++-
 app/Http/Controllers/AjaxController.php |  1 -
 app/Models/Order.php                    | 11 +++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/Events/OrderOperation.php b/app/Events/OrderOperation.php
index beb17d7..c64a764 100644
--- a/app/Events/OrderOperation.php
+++ b/app/Events/OrderOperation.php
@@ -18,8 +18,9 @@ class OrderOperation
         $newUserId = $order->getAttribute('user_id');
         $originalUserID = $order->getOriginal('user_id');
 
-        if($newUserId != $originalUserID)
+        if($newUserId != $originalUserID) {
             $order->addresses = $addresses;
+        }
 
         $order->company = $company;
     }
diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index 1a52ec8..b78a0bc 100644
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -127,7 +127,6 @@ class AjaxController extends CubistFrontController
         Mail::raw(implode("\r\n", $contents), function ($message) use ($validatedData, $page, $subject_,$recipient) {
             $message->from(config('mail.from.address'), config('mail.from.name'));
             $message->sender(config('mail.from.address'), config('mail.from.name'));
-            $message->to('soufiane@cubedesigners.com');
             $message->bcc('test+pmi@cubedesigners.com');
             if($recipient) {
                 $message->to($recipient);
diff --git a/app/Models/Order.php b/app/Models/Order.php
index aabdfe3..d67e3af 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -48,17 +48,16 @@ class Order extends ECommerceCommon
                     'type' => 'Table',
                     'columns' => ['id' => '#', 'ref' => 'Référence options', 'reference' => 'Référence produit', 'name' => 'Nom de produit', 'quantity' => 'Quantité'],
                     'tab' => $tabOrder];
-                $this->addField($field);
             } else if ($field['name'] === 'user_id') {
                 $field['label'] = 'Utilisateur';
                 $field['tab'] = 'Infos client';
                 $field['type'] = 'SelectFromArray';
                 $field['options'] = $this->userOptions();
-            } else
-                if ($field['name'] === 'total') {
-                    $field['tab'] = $tabOrder;
-                    $this->addField($field);
-                }
+            } else if ($field['name'] === 'total') {
+                $field['tab'] = $tabOrder;
+
+            }
+            $this->addField($field);
         }
 
         $this->addField(['name' => 'status',
-- 
2.39.5