#7898 @0.25

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/KimplayOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/KimplayOperation.php
index a800615974b8942b7f4a2694e473558a3e00f20e..a9c71e02d94a55640dd01bb45cee0cd6973e07aa 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/KimplayOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/KimplayOperation.php
@@ -6,14 +6,13 @@ use App\Http\Middleware\Authenticate;
 use App\Http\Middleware\CheckIfAdmin;
 use App\Http\Middleware\VerifyCsrfToken;
 use App\Mail\Base;
+use Cubist\Backpack\Middleware\CORSMiddleware;
 use Cubist\Util\Files\Files;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Route;
-use Cubist\Backpack\Middleware\CORSMiddleware;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
-use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\Exception;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
@@ -28,11 +27,12 @@ trait KimplayOperation
     protected function setupKimplayRoutes($segment, $routeName, $controller)
     {
         foreach (['services', 's'] as $s) {
-            Route::match(['post'], $s . '/kimplay', $controller . '@kimplay')->withoutMiddleware([VerifyCsrfToken::class]);
+            Route::match(['post'], $s . '/kimplay', $controller . '@kimplay')->middleware([CORSMiddleware::class])->withoutMiddleware([CheckIfAdmin::class, Authenticate::class, VerifyCsrfToken::class]);
         }
     }
 
-    public function kimplay(Request $request) {
+    public function kimplay(Request $request)
+    {
 
         $validator = Validator::make($request->all(), [
             'company' => 'required|max:255',
@@ -65,7 +65,8 @@ trait KimplayOperation
         $this->sendMail($file, request('mail'));
     }
 
-    public function getCsv($cart_items, $user_details) {
+    public function getCsv($cart_items, $user_details)
+    {
         $column_headings = [
             'ref' => 'Réference',
             'name' => 'Désignation',
@@ -174,11 +175,15 @@ trait KimplayOperation
         return $xls_file;
     }
 
-    public function sendMail($xls_file, $user_email) {
-        $email_for_kimplay = 'frederic@compos-it.fr';
-        $return_address = 'postmaster@fluidbook.com';
+    public function sendMail($xls_file, $user_email)
+    {
+
+        $admin = 'frederic@compos-it.fr';
+
+        $email_for_kimplay = $admin;
+        $return_address = 'toolbox@fluidbook.com';
         $email_from_name = "Kim'Play";
-        $email_reply_to = "frederic@compos-it.fr";
+        $email_reply_to = $admin;
         $bcc = 'jfcastel@cubedesigners.com';
         $email_kimplay_subject = 'Demande catalogue Kim\'Play';
         $email_user_subject = 'Récapitulatif de votre demande Kim\'Play';
@@ -216,7 +221,7 @@ trait KimplayOperation
             Mail::send($mail_to_user);
             return true;
         } catch (Exception $e) {
-            Log::warn('#### Bastide: Failed sending message via Mailjet ####');
+            Log::warn('#### Kimplay: Failed sending message via Mailjet ####');
             Log::warn('ERROR: ' . $e->getMessage());
             return false;
         }