wait #6160 @0:30

diff --git a/app/Models/Order.php b/app/Models/Order.php
index 14ee461ee3ffdd3bc6cfd5eff888b95e315e367f..69d3d3200799f450293e8f733f4b7f5c5c3963d9 100644 (file)
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -20,6 +20,7 @@ class Order extends ECommerceCommon
     ];
 
     protected $fillable = ['company'];
+    public $timestamps = false;
 
     protected $_optionsForUserInfo = [];
 
@@ -29,6 +30,8 @@ class Order extends ECommerceCommon
 
     public function setFields()
     {
+        parent::setFields();
+
         $tabOrder = 'Commande';
 
         $this->addField(['name' => 'company',
@@ -37,15 +40,6 @@ class Order extends ECommerceCommon
             'column' => true,
         ]);
 
-        $this->addField(['name' => 'id',
-            'label' => 'Commande #',
-            'type' => 'Text',
-            'attributes' => [
-                'readonly'=>'readonly',
-                'disabled'=>'disabled',
-            ],
-        ]);
-
         foreach ($this->fields as $fields) {
             if ($fields['name'] === 'products') {
                 $fields = ['name' => 'products',
@@ -53,16 +47,13 @@ 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($fields);
             }
 
             if ($fields['name'] === 'total') {
                 $fields['tab'] = $tabOrder;
-
                 $this->addField($fields);
             }
-
         }
 
         $this->addField(['name' => 'status',
@@ -97,7 +88,14 @@ class Order extends ECommerceCommon
             $this->addField($fields);
         }
 
-        parent::setFields();
+        $this->addField(['name' => 'id',
+            'label' => 'Commande #',
+            'type' => 'Text',
+            'attributes' => [
+                'readonly'=>'readonly',
+                'disabled'=>'disabled',
+            ],
+        ]);
     }
 
     public static function getOptionValue($key) {