From 9c2205235cc7a7a44ee2353db0bdbe5e6d2ba9cd Mon Sep 17 00:00:00 2001
From: Avior <florian.bouillon@delta-wings.net>
Date: Thu, 13 Feb 2020 11:18:00 +0100
Subject: [PATCH] Changmenet Gestion de Emails

+ ajout d'un script pour racourcir les commandes a lancer dans docker

Signed-off-by: Avior <florian.bouillon@delta-wings.net>
---
 app/Http/Controllers/ContactUSController.php | 34 +++++-----------
 app/Mail/ContactEmail.php                    | 40 +++++++++++++++++++
 app/Mail/EmailReceipt.php                    | 41 ++++++++++++++++++++
 artprox                                      |  2 +
 resources/views/contactUS.blade.php          |  7 +++-
 5 files changed, 99 insertions(+), 25 deletions(-)
 create mode 100644 app/Mail/ContactEmail.php
 create mode 100644 app/Mail/EmailReceipt.php
 create mode 100755 artprox

diff --git a/app/Http/Controllers/ContactUSController.php b/app/Http/Controllers/ContactUSController.php
index d9d1f25..02eedf1 100644
--- a/app/Http/Controllers/ContactUSController.php
+++ b/app/Http/Controllers/ContactUSController.php
@@ -5,7 +5,11 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use App\Http\Requests;
 use App\ContactUS;
+use App\Mail\EmailReceipt;
+use Illuminate\Support\Facades\Form;
+use App\Mail\ContactEmail;
 use Mail;
+use Exception;
 
 class ContactUSController extends Controller
 {
@@ -19,31 +23,13 @@ class ContactUSController extends Controller
         $this->validate($request, ['name' => 'required', 'email' => 'required|email', 'message' => 'required']);
         ContactUS::create($request->all());
 
+        try {
+            Mail::send(new ContactEmail(array('name' => $request->get('name'),'email' => $request->get('email'),'user_message' => $request->get('message'))));
+        } catch (Exception $e) {
+            return back()->with('error', 'Erreur lors de l\'envoie du Mail, Réessayer');
+        }
+        Mail::to($request->get('email'))->send(new EmailReceipt(array('name' => $request->get('name'))));
 
-        $email_sender = $request->get('email');
-
-        Mail::send(
-            'email',
-            array(
-                'name' => $request->get('name'),
-                'email' => $request->get('email'),
-                'user_message' => $request->get('message')
-            ),
-            function ($message) {
-                $message->from('pouet@avior.me');
-                $message->to('brossard.nicolas09@gmail.com', 'Admin')->subject('Super Cours Laravel');
-            }
-        );
-        Mail::send(
-            'email_receipt',
-            array(
-                'name' => $request->get('name'),
-            ),
-            function ($message) use ($email_sender) {
-                $message->from('pouet@avior.me');
-                $message->to($email_sender)->subject('Accusé de reception');
-            }
-        );
         return back()->with('success', 'Bien joué mec!');
     }
 }
diff --git a/app/Mail/ContactEmail.php b/app/Mail/ContactEmail.php
new file mode 100644
index 0000000..4a392dd
--- /dev/null
+++ b/app/Mail/ContactEmail.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class ContactEmail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    private $template = array();
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct($template)
+    {
+        $this->template = $template;
+    }
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        return $this
+            ->from('pouet@avior.me')
+            ->to('pouet@avior.me')
+            ->view('email')
+            ->with($this->template)
+        ;
+    }
+}
diff --git a/app/Mail/EmailReceipt.php b/app/Mail/EmailReceipt.php
new file mode 100644
index 0000000..31572e9
--- /dev/null
+++ b/app/Mail/EmailReceipt.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Form;
+
+class EmailReceipt extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    private $template = array();
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct($template)
+    {
+        $this->template = $template;
+    }
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        return $this
+            ->from('pouet@avior.me')
+            ->subject('Accusé de reception')
+            ->view('email_receipt')
+            ->with($this->template)
+        ;
+    }
+}
diff --git a/artprox b/artprox
new file mode 100755
index 0000000..1b7f00c
--- /dev/null
+++ b/artprox
@@ -0,0 +1,2 @@
+#!/bin/sh
+docker-compose exec php php artisan $@
diff --git a/resources/views/contactUS.blade.php b/resources/views/contactUS.blade.php
index 2f3df93..67168de 100644
--- a/resources/views/contactUS.blade.php
+++ b/resources/views/contactUS.blade.php
@@ -12,6 +12,11 @@
      {{ Session::get('success') }}
    </div>
 @endif
+@if(Session::has('error'))
+   <div class="alert alert-danger">
+     {{ Session::get('error') }}
+   </div>
+@endif
 {!! Form::open(['route'=>'contactus.store']) !!}
 <div class="form-group {{ $errors->has('name') ? 'has-error' : '' }}">
 {!! Form::label('Nom:') !!}
@@ -34,4 +39,4 @@
 {!! Form::close() !!}
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>