jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2023-05-24 23:30:29 +02:00
parent 99bdf09be7
commit f4738377c7
13 changed files with 220 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Mail/Acheminement.php
View File

@@ -27,6 +27,8 @@ class Acheminement extends TemplateMailable
public $numero_suivi;
public $lien_suivi;
public $numero_commande;
public $adresse;
@@ -49,6 +51,7 @@ class Acheminement extends TemplateMailable
$this->societe = $order->customer->company;
$this->email = $order->customer->email;
$this->numero_suivi = $order->delivery_ref;
$this->lien_suivi = $order->delivery_link;
$this->numero_commande = $order->ref;
$this->date_expedition = $order->updated_at;
$this->facture = Invoices::getInvoiceHtml($order->invoice->id);

41
app/Mail/ConfirmationCommande.php
View File

@@ -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;
}
}

1
app/Mail/Preparation.php
View File

@@ -30,6 +30,5 @@ class Preparation extends TemplateMailable
$this->nom = $order->customer->last_name;
$this->societe = $order->customer->company;
$this->email = $order->customer->email;
$this->subject = $subject;
}
}