create basic users

diff --git a/app/Nova/BasicUsers.php b/app/Nova/BasicUsers.php
new file mode 100644 (file)
index 0000000..29e8aa1
--- /dev/null
+++ b/app/Nova/BasicUsers.php
@@ -0,0 +1,25 @@
+<?php
+
+
+namespace App\Nova;
+
+
+class BasicUsers extends User
+{
+    public static $group = "Annuaire";
+
+    public static $type = \App\User::TYPE_PLATFORM_ONLY;
+
+    public static $globallySearchable = true;
+
+    public static function label()
+    {
+        return "Utilisateurs site";
+    }
+
+    public static function singularLabel()
+    {
+        return 'Utilisateur site';
+    }
+
+}

diff --git a/app/Nova/SpecialUsers.php b/app/Nova/SpecialUsers.php
index f6c433344a43412ff4dd68af4e168fa72ff3084b..5874b8b8960a2054856f5a2d23405aaef8bce855 100644 (file)
--- a/app/Nova/SpecialUsers.php
+++ b/app/Nova/SpecialUsers.php
@@ -17,14 +17,13 @@ class SpecialUsers extends User
 
     public static function label()
     {
-        return "Autres utilisateurs";
+        return "Autres contacts";
     }
 
     public static function singularLabel()
     {
-        return "Utilisateur (autre)";
+        return "Contact (autre)";
     }
 
 
-
 }

diff --git a/app/TemplateVariables.php b/app/TemplateVariables.php
index f9f3cded47b5b6564cd0fc8205a233560782659b..0a23c3262a01feb573459efac90ae12834076fcd 100644 (file)
--- a/app/TemplateVariables.php
+++ b/app/TemplateVariables.php
@@ -66,9 +66,9 @@ trait TemplateVariables
      * @return string
      * @throws \Throwable
      */
-    public function getLoginButtonTemplate()
+    public function getHomeButtonTemplate()
     {
-        return EmailTemplate::button(route('login'), 'Login');
+        return EmailTemplate::button(url('/'), 'Cliquez ici');
     }
 
     /**

diff --git a/app/User.php b/app/User.php
index 251a5d70b1d97d47f99dc5ce3573960abe5688d8..ea073b33e50d0add798ab47492aad8024f1d506e 100644 (file)
--- a/app/User.php
+++ b/app/User.php
@@ -269,6 +269,7 @@ class User extends Authenticatable implements MustVerifyEmail
      */
     public function startTrial(?Carbon $endDate = null): void
     {
+        $this->type = self::TYPE_DISCOVER;
         $this->trial_ends_at = $endDate ?? now()->addDays(self::TRIAL_DURATION_DAYS)->endOfDay();
         $this->save();
     }
@@ -279,6 +280,7 @@ class User extends Authenticatable implements MustVerifyEmail
      */
     public function startDiscover(?Carbon $endDate = null): void
     {
+        $this->type = self::TYPE_DISCOVER;
         $this->discover_ends_at = $endDate ?? now()->addDays( self::DISCOVER_DURATION_DAYS)->endOfDay();
         $this->type = self::TYPE_DISCOVER;
         $this->save();

diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index e777ef9ee29a5da79423332f6b195179c25e6c68..560250dfd7f19341012d0b95554bbead480b0060 100644 (file)
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -4,6 +4,12 @@
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-8">
+
+            <div class="alert alert-info">
+                <p class="mb-0"><a href="{{route('register', ['redirect_to' => request()->redirect_to])}}">Cliquez ici si vous n'avez pas encore de compte.</a> </p>
+
+            </div>
+
             <div class="card">
                 <div class="card-header">{{ __('Login') }}</div>
 

diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index ad6f4cfe229b5bd8449c359d838d81d19f7586b1..e081121b81537ea208d1db9648f83adf194ab910 100644 (file)
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -11,7 +11,8 @@
             </div>
             @if(request()->has('payment_process'))
             <div class="alert-info alert">
-                <p class="mb-0">Veuillez vous inscrire afin de procéder à votre achat. Cela ne vous prendra pas plus d'une minute !</p>
+                <p>Veuillez vous inscrire afin de procéder à votre achat. Cela ne vous prendra pas plus d'une minute !</p>
+                <p class="mb-0"><a href="{{route('login', ['redirect_to' => request()->redirect_to])}}">Cliquez ici pour vous connecter si vous disposez déjà d'un compte.</a> </p>
             </div>
             @endif