wait #6162 @0:20

diff --git a/app/Models/ECommerceCommon.php b/app/Models/ECommerceCommon.php
index 91aa2c4f202a517cb46523b15fe49d5abbbe7f60..dce2a0bfa70abfb3898172b005b0c354159224a0 100644 (file)
--- 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 28dee92300c7a4af7db602f807c4e611f3c3dd32..82bcf4fe843555c330a5beb8cd4bd3ce070c1593 100644 (file)
--- 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();
     }