Merge branch 'develop' into trunk

app/Http/Controllers/EmployeesController.php

@@ -244,11 +244,11 @@ class EmployeesController extends Controller
 
             // Is employee locked down ?
             if ($employee->password_attempts >= 3) {
-                SendEmployeeLockedDownMailToEmployee::dispatchAfterResponse(
+                SendEmployeeLockedDownMailToEmployee::dispatch(
                     new EmployeeLockedDown($employee),
                     $employee
                 );
-                SendEmployeeLockedDownMailToSiteRH::dispatchAfterResponse(
+                SendEmployeeLockedDownMailToSiteRH::dispatch(
                     new EmployeeYourAccountIsLockedDown($employee),
                     $employee
                 );

app/Mail/EmployeeLockedDown.php

@@ -34,8 +34,8 @@ class EmployeeLockedDown extends Mailable
     {
         return $this
             ->subject(sprintf('%s : Un compte salarié vient d\'être verrouillé', config('app.name')))
-            ->view('emails.employee-lockedDown')
+            ->view('emails.employee-own-lockedDown')
-            ->text('emails.employee-lockedDown-plain')
+            ->text('emails.employee-own-lockedDown-plain')
             ->with('employee', $this->employee);
     }
 }

app/Mail/EmployeeYourAccountIsLockedDown.php

@@ -34,8 +34,8 @@ class EmployeeYourAccountIsLockedDown extends Mailable
     {
         return $this
             ->subject(sprintf('%s : Votre compte salarié vient d\'être verrouillé', config('app.name')))
-            ->view('emails.employee-own-lockedDown')
+            ->view('emails.employee-lockedDown')
-            ->text('emails.employee-own-lockedDown-plain')
+            ->text('emails.employee-lockedDown-plain')
             ->with('employee', $this->employee);
     }
 }

config/cors.php

@@ -19,9 +19,7 @@ return [
 
     'allowed_methods' => ['*'],
 
-    'allowed_origins' => ['
+    'allowed_origins' => ['*'],
-        http://portsalaries.test
-    '],
 
     'allowed_origins_patterns' => [],