diff --git a/app/Http/Controllers/Admin/Core/Mail/MailTemplateController.php b/app/Http/Controllers/Admin/Core/Mail/MailTemplateController.php
index c39195ef..537f802b 100644
--- a/app/Http/Controllers/Admin/Core/Mail/MailTemplateController.php
+++ b/app/Http/Controllers/Admin/Core/Mail/MailTemplateController.php
@@ -56,9 +56,9 @@ class MailTemplateController extends Controller
         return view('Admin.Core.Mail.MailTemplate.partials.vars', $data);
     }
 
-    public function preview($template_id, $user_id)
+    public function preview($template_id, $model_id)
     {
-        return MailTemplates::preview($template_id, $user_id);
+        return MailTemplates::preview($template_id, $model_id);
     }
 
     public function modalPreview($template_id)
diff --git a/app/Mail/Acheminement.php b/app/Mail/Acheminement.php
index 0f1faa84..482b18da 100644
--- a/app/Mail/Acheminement.php
+++ b/app/Mail/Acheminement.php
@@ -3,15 +3,14 @@
 namespace App\Mail;
 
 use App\Models\Core\Mail\MailTemplate;
+use App\Repositories\Shop\Traits\MailCustomers;
 use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Mailables\Address;
-use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
 use Spatie\MailTemplates\TemplateMailable;
 
 class Acheminement extends TemplateMailable
 {
-    use Queueable, SerializesModels;
+    use MailCustomers, Queueable, SerializesModels;
 
     protected static $templateModelClass = MailTemplate::class;
 
@@ -29,12 +28,4 @@ class Acheminement extends TemplateMailable
         $this->male = $user->gender == 1;
         $this->subject = $subject;
     }
-
-    public function envelope()
-    {
-        return new Envelope(
-            from: new Address('boutique@jardinenvie.com', 'Boutique Jardin\'Envie'),
-            subject: $this->subject,
-        );
-    }
 }
diff --git a/app/Mail/Bienvenue.php b/app/Mail/Bienvenue.php
index 860616d8..68df7abf 100644
--- a/app/Mail/Bienvenue.php
+++ b/app/Mail/Bienvenue.php
@@ -3,38 +3,33 @@
 namespace App\Mail;
 
 use App\Models\Core\Mail\MailTemplate;
+use App\Repositories\Shop\Traits\MailCustomers;
 use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Mailables\Address;
-use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
 use Spatie\MailTemplates\TemplateMailable;
 
 class Bienvenue extends TemplateMailable
 {
-    use Queueable, SerializesModels;
+    use MailCustomers, Queueable, SerializesModels;
 
     protected static $templateModelClass = MailTemplate::class;
 
-    public $user;
+    public $email;
 
-    public $male;
+    public $nom;
+
+    public $prenom;
+
+    public $societe;
 
     public $subject;
 
-    public $url;
-
     public function __construct($user, $subject = '')
     {
-        $this->user = $user;
-        $this->male = $user->gender == 1;
+        $this->prenom = $user->first_name;
+        $this->nom = $user->last_name;
+        $this->societe = $user->society;
+        $this->email = $user->email;
         $this->subject = $subject;
     }
-
-    public function envelope()
-    {
-        return new Envelope(
-            from: new Address('boutique@jardinenvie.com', 'Jardin\'en\'Vie'),
-            subject: $this->subject,
-        );
-    }
 }
diff --git a/app/Mail/ConfirmationCommande.php b/app/Mail/ConfirmationCommande.php
index ab6052ce..9b74db5b 100644
--- a/app/Mail/ConfirmationCommande.php
+++ b/app/Mail/ConfirmationCommande.php
@@ -3,15 +3,14 @@
 namespace App\Mail;
 
 use App\Models\Core\Mail\MailTemplate;
+use App\Repositories\Shop\Traits\MailCustomers;
 use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Mailables\Address;
-use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
 use Spatie\MailTemplates\TemplateMailable;
 
 class ConfirmationCommande extends TemplateMailable
 {
-    use Queueable, SerializesModels;
+    use MailCustomers, Queueable, SerializesModels;
 
     protected static $templateModelClass = MailTemplate::class;
 
@@ -21,20 +20,10 @@ class ConfirmationCommande extends TemplateMailable
 
     public $subject;
 
-    public $url;
-
     public function __construct($user, $subject = '')
     {
         $this->user = $user;
         $this->male = $user->gender == 1;
         $this->subject = $subject;
     }
-
-    public function envelope()
-    {
-        return new Envelope(
-            from: new Address('boutique@jardinenvie.com', 'Boutique Jardin\'Envie'),
-            subject: $this->subject,
-        );
-    }
 }
diff --git a/app/Mail/Preparation.php b/app/Mail/Preparation.php
index f605be0a..4f142d72 100644
--- a/app/Mail/Preparation.php
+++ b/app/Mail/Preparation.php
@@ -3,38 +3,33 @@
 namespace App\Mail;
 
 use App\Models\Core\Mail\MailTemplate;
+use App\Repositories\Shop\Traits\MailCustomers;
 use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Mailables\Address;
-use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
 use Spatie\MailTemplates\TemplateMailable;
 
 class Preparation extends TemplateMailable
 {
-    use Queueable, SerializesModels;
+    use MailCustomers, Queueable, SerializesModels;
 
     protected static $templateModelClass = MailTemplate::class;
 
-    public $user;
+    public $email;
 
-    public $male;
+    public $nom;
+
+    public $prenom;
+
+    public $societe;
 
     public $subject;
 
-    public $url;
-
     public function __construct($user, $subject = '')
     {
-        $this->user = $user;
-        $this->male = $user->gender == 1;
+        $this->prenom = $user->first_name;
+        $this->nom = $user->last_name;
+        $this->societe = $user->society;
+        $this->email = $user->email;
         $this->subject = $subject;
     }
-
-    public function envelope()
-    {
-        return new Envelope(
-            from: new Address('boutique@jardinenvie.com', 'Boutique Jardin\'Envie'),
-            subject: $this->subject,
-        );
-    }
 }
diff --git a/app/Repositories/Core/Mail/MailTemplates.php b/app/Repositories/Core/Mail/MailTemplates.php
index 2ce1bc93..6100f8df 100644
--- a/app/Repositories/Core/Mail/MailTemplates.php
+++ b/app/Repositories/Core/Mail/MailTemplates.php
@@ -38,16 +38,17 @@ class MailTemplates
 
         return [
             'id' => $id,
-            'users' => $mailable::getUsers(),
+            'list' => $mailable::getContext(),
         ];
     }
 
-    public static function preview($id, $user_id)
+    public static function preview($id, $model_id)
     {
         $template = self::get($id);
         $mailable = $template->mailable;
-        $data = $mailable::getDataByUser($user_id);
-        $html_template = $template->toArray()['html_template_translations'][$data['lang']] ?? false;
+        $data = $mailable::getData($model_id);
+
+        $html_template = $template->toArray()['html_template_translations'][$data['lang'] ?? 'fr'] ?? false;
         if ($html_template) {
             $m = new Mustache_Engine();
 
diff --git a/app/Repositories/Shop/Customers.php b/app/Repositories/Shop/Customers.php
index 4950d62d..04d2d941 100644
--- a/app/Repositories/Shop/Customers.php
+++ b/app/Repositories/Shop/Customers.php
@@ -18,6 +18,11 @@ class Customers
         return Customer::count();
     }
 
+    public static function getOptions()
+    {
+        return Customer::pluck('last_name', 'id');
+    }
+
     public static function editProfile($id = false)
     {
         $id = $id ? $id : self::getId();
diff --git a/app/Repositories/Shop/Traits/MailCustomers.php b/app/Repositories/Shop/Traits/MailCustomers.php
new file mode 100644
index 00000000..884be200
--- /dev/null
+++ b/app/Repositories/Shop/Traits/MailCustomers.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Repositories\Shop\Traits;
+
+use App\Repositories\Shop\Customers;
+use App\Repositories\Core\DateTime;
+use Illuminate\Mail\Mailables\Address;
+use Illuminate\Mail\Mailables\Envelope;
+
+trait MailCustomers
+{
+    public static function getContext()
+    {
+        return Customers::getOptions();
+    }
+
+    public static function getData($id)
+    {
+        $user = self::getUser($id);
+
+        return $user ? [
+            'prenom' => $user->first_name,
+            'nom' => $user->last_name,
+            'societe' => $user->society,
+            'email' => $user->email,
+        ] : false;
+    }
+
+    public static function getUser($id)
+    {
+        return Customers::get($id);
+    }
+
+    public function envelope()
+    {
+        return new Envelope(
+            from: new Address('boutique@jardinenvie.com', 'Jardin\'en\'Vie'),
+            subject: $this->subject,
+        );
+    }
+}
diff --git a/resources/views/Admin/Core/Mail/MailTemplate/partials/modalPreview.blade.php b/resources/views/Admin/Core/Mail/MailTemplate/partials/modalPreview.blade.php
index 0256d3b0..ce34bca1 100644
--- a/resources/views/Admin/Core/Mail/MailTemplate/partials/modalPreview.blade.php
+++ b/resources/views/Admin/Core/Mail/MailTemplate/partials/modalPreview.blade.php
@@ -5,9 +5,9 @@
     <div class="row mb-3">
         <div class="col-6">
             @include('components.form.select', [
-                'id_name' => 'user_id',
-                'name' => 'user_id',
-                'list' => $users,
+                'id_name' => 'model_id',
+                'name' => 'model_id',
+                'list' => $list,
                 'class' => 'select2',
                 'with_empty' => '',
                 'label' => __('Core.users.name'),
@@ -23,13 +23,10 @@
 
 <script>
     initSelect2();
-    $('#user_id').change(function() {
-        console.log('ici');
-        var user_id = $(this).find(":selected").val();
+    $('#model_id').change(function() {
+        var model_id = $(this).find(":selected").val();
         var template_id = $('#template_id').val();
-        console.log(user_id);
-        console.log(template_id);
-        var url = "{{ route('Admin.Core.Mail.MailTemplate.preview') }}/" + template_id + '/' + user_id;
+        var url = "{{ route('Admin.Core.Mail.MailTemplate.preview') }}/" + template_id + '/' + model_id;
         $.get(url, function(data) {
             $('#previewTemplate').html(data);
         });
diff --git a/resources/views/Admin/Shop/Deliveries/form.blade.php b/resources/views/Admin/Shop/Deliveries/form.blade.php
index 423c2d52..27547196 100644
--- a/resources/views/Admin/Shop/Deliveries/form.blade.php
+++ b/resources/views/Admin/Shop/Deliveries/form.blade.php
@@ -32,7 +32,7 @@
 		<div class="row mb-3">
 			<div class="col-12">
 				{{ Form::label('', __('Description')) }}
-				<textarea name="description" class="form-control">{{ $delivery['description'] }}</textarea>
+				<textarea name="description" class="form-control">{{ $delivery['description'] ?? '' }}</textarea>
 			</div>
 		</div>
 
diff --git a/routes/Admin/Core/Mail/MailTemplate.php b/routes/Admin/Core/Mail/MailTemplate.php
index e4a2aa41..62503a6d 100644
--- a/routes/Admin/Core/Mail/MailTemplate.php
+++ b/routes/Admin/Core/Mail/MailTemplate.php
@@ -7,6 +7,6 @@ Route::prefix('MailTemplate')->name('MailTemplate.')->group(function () {
     Route::post('storeAjax', 'MailTemplateController@storeAjax')->name('storeAjax');
     Route::any('', 'MailTemplateController@index')->name('index');
     Route::get('getVars/{mailable?}', 'MailTemplateController@getVarsByMailable')->name('getVarsByMailable');
-    Route::get('preview/{template_id?}/{user_id?}', 'MailTemplateController@preview')->name('preview');
+    Route::get('preview/{template_id?}/{model_id?}', 'MailTemplateController@preview')->name('preview');
     Route::get('modalPreview/{template_id?}', 'MailTemplateController@modalPreview')->name('modalPreview');
 });