registreation options

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 25bb4c91c4696f4aee29c851a643d388cfa6c7fc..c972f45850052d075b7ee20692376eb599844fc7 100644 (file)
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -86,9 +86,6 @@ class AccountController extends Controller
             'wants_pdf' => $request->boolean('wantsPdf'),
         ]);
 
-        $user->markEmailAsVerified();
-
-
         LoginToken::where('token', $request->input('login_token'))->delete();
 
         Session::flash('message', "Informations enregistrées avec succès !");

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 9539c3a69b05d71f331e37e738ca4fe0acba166d..5c9ec415086844141a189a2c1ed807830ce4bb86 100644 (file)
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -106,7 +106,9 @@ class RegisterController extends Controller
             ]
         );
 
-        $user->startTrial();
+        if(! request()->boolean('no_trial')){
+            $user->startTrial();
+        }
 
 //        $user->sendEmailVerificationNotification();
 

diff --git a/app/Http/Middleware/ForceJsonResponse.php b/app/Http/Middleware/ForceJsonResponse.php
new file mode 100644 (file)
index 0000000..9f6fdb0
--- /dev/null
+++ b/app/Http/Middleware/ForceJsonResponse.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class ForceJsonResponse
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        $request->headers->set('Accept', 'application/json');
+
+        return $next($request);
+    }
+}

diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 82f1c5667e1b0e6f71fed6c0ffcdddcf50625c8d..bcce159772cf4380a21956baaab01034619904f8 100644 (file)
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -104,6 +104,19 @@
                                 <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required autocomplete="new-password">
                             </div>
                         </div>
+                        <div class="form-group row">
+                            <div class="col-md-6 offset-md-4">
+                                <div class="form-check">
+                                    <input class="form-check-input" type="checkbox" id="no_trial" name="no_trial" {{old('no_trial', false) ? 'checked' : ''}}>
+
+                                    <label class="form-check-label" for="no_trial">
+                                        Je ne souhaite PAS reçevoir les prochains numéros gratuitement pednant 2 semaines.
+                                    </label>
+                                </div>
+
+                            </div>
+                        </div>
+
 
                         <div class="form-group row">
                             <div class="col-4"></div>

diff --git a/routes/web.php b/routes/web.php
index da27e72b3747df94b46aec9c7b2e003fafe69b68..f1ee2689eb7cd035fa571d724bc32a3b8189aade 100644 (file)
--- a/routes/web.php
+++ b/routes/web.php
@@ -29,8 +29,6 @@ Route::domain(env('ADMIN_DOMAIN_NAME'))->middleware('auth:twill_users')->group(f
 });
 
 
-Route::get('/login-now', function() { \Auth::loginUsingId(2555); });
-
 /** Client routes */
 Route::domain(env('CLIENT_DOMAIN_NAME'))->group(function() {
     /** Home */