From ccc6823c0032711c0e62b8b2fe158814ae859bd7 Mon Sep 17 00:00:00 2001
From: soufiane <soufiane@cubedesigners.com>
Date: Fri, 21 Jul 2023 16:56:50 +0200
Subject: [PATCH] wait #6162 @0:20

---
 app/Models/ECommerceCommon.php |  2 +-
 app/Models/Order.php           | 43 ++++++++++++++++++----------------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/app/Models/ECommerceCommon.php b/app/Models/ECommerceCommon.php
index 91aa2c4..dce2a0b 100644
--- a/app/Models/ECommerceCommon.php
+++ b/app/Models/ECommerceCommon.php
@@ -19,7 +19,7 @@ class ECommerceCommon extends CubistMagicAbstractModel
             'type' => 'BunchOfFieldsMultiple',
             'bunch' => 'App\SubForms\Address',
             'column' => false,
-            'tab' => 'Informations',
+            'tab' => 'Infos client',
             'edit_label' => 'Éditer « %city »'
         ],
         [
diff --git a/app/Models/Order.php b/app/Models/Order.php
index 28dee92..82bcf4f 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -37,6 +37,28 @@ class Order extends ECommerceCommon
             'column' => true,
         ]);
 
+        $this->addField(['name' => 'status',
+            'label' => 'Status',
+            'type' => 'SelectFromArray',
+            'column' => true,
+            'options' => self::$_optionsForSelect,
+            'default' => 'new',
+            'tab' => $tabOrder
+        ]);
+
+        $this->addField(['name' => 'complete_status',
+            'label' => 'Indication du status',
+            'type' => 'Text',
+            'tab' => $tabOrder
+        ]);
+
+        $this->addField(['name' => 'request_date',
+            'label' => 'Date',
+            'type' => 'Datetime',
+            'column' => true,
+            'tab' => $tabOrder]);
+
+
         foreach ($this->fields as $fields) {
             if ($fields['name'] === 'products') {
                 $fields = ['name' => 'products',
@@ -51,7 +73,7 @@ class Order extends ECommerceCommon
 
             if ($fields['name'] === 'user_id') {
                 $fields['label'] = 'Utilisateur';
-                $fields['tab'] = 'Informations';
+                $fields['tab'] = 'Infos client';
                 $fields['type'] = 'SelectFromArray';
                 $fields['options'] = $this->userOptions();
             }
@@ -59,26 +81,7 @@ class Order extends ECommerceCommon
             $this->addField($fields);
         }
 
-        $this->addField(['name' => 'status',
-            'label' => 'Status',
-            'type' => 'SelectFromArray',
-            'column' => true,
-            'options' => self::$_optionsForSelect,
-            'default' => 'new',
-            'tab' => $tabOrder
-        ]);
-
-        $this->addField(['name' => 'complete_status',
-            'label' => 'Indication du status',
-            'type' => 'Text',
-            'tab' => $tabOrder
-        ]);
 
-        $this->addField(['name' => 'request_date',
-            'label' => 'Date',
-            'type' => 'Datetime',
-            'column' => true,
-            'tab' => $tabOrder]);
 
         parent::setFields();
     }
-- 
2.39.5