fixes on mail templates, change order edit layout, add DeliveryTypes, DeliveryTypeCalculations & DeliveryPackages

app/Mail/ConfirmationCommande.php

@@ -14,16 +14,45 @@ class ConfirmationCommande extends TemplateMailable
 
     protected static $templateModelClass = MailTemplate::class;
 
-    public $user;
+    public $email;
 
-    public $male;
+    public $nom;
+
+    public $prenom;
+
+    public $societe;
 
     public $subject;
 
-    public function __construct($user, $subject = '')
+    public $numero_commande;
+
+    public $date_commande;
+
+    public $facturation_adresse;
+
+    public $facturation_cp;
+
+    public $facturation_ville;
+
+    public $livraison_adresse;
+
+    public $livraison_cp;
+
+    public $livraison_ville;
+
+    public function __construct($order)
     {
-        $this->user = $user;
-        $this->male = $user->gender == 1;
-        $this->subject = $subject;
+        $this->prenom = $order->customer->first_name;
+        $this->nom = $order->customer->last_name;
+        $this->facturation_adresse = $order->address->address;
+        $this->facturation_cp = $order->address->zipcode;
+        $this->facturation_ville = $order->address->city;
+        $this->livraison_adresse = $order->delivery_address->address;
+        $this->livraison_cp = $order->delivery_address->zipcode;
+        $this->livraison_ville = $order->delivery_address->city;
+        $this->societe = $order->customer->company;
+        $this->email = $order->customer->email;
+        $this->numero_commande = $order->ref;
+        $this->date_commande = $order->created_at;
     }
 }