From 6f04470dfc0bb21ef31863af2eb749372acf0e60 Mon Sep 17 00:00:00 2001
From: Louis Jeckel <louis.jeckel@outlook.cm>
Date: Fri, 11 Sep 2020 16:16:53 +0200
Subject: [PATCH] add fin essai

---
 app/Nova/DiscoverUsers.php | 16 ++++++++++++++++
 app/Nova/User.php          | 12 ++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/Nova/DiscoverUsers.php b/app/Nova/DiscoverUsers.php
index f5350a1..963a12d 100644
--- a/app/Nova/DiscoverUsers.php
+++ b/app/Nova/DiscoverUsers.php
@@ -4,6 +4,9 @@
 namespace App\Nova;
 
 
+use Carbon\Carbon;
+use Laravel\Nova\Fields\DateTime;
+use Laravel\Nova\Fields\Text;
 use Laravel\Nova\Http\Requests\NovaRequest;
 
 class DiscoverUsers extends User
@@ -24,5 +27,18 @@ class DiscoverUsers extends User
     }
 
 
+    protected function extraFields()
+    {
+        return [
+            Text::make('Fin essai', function() {
+                /** @var Carbon $date */
+               $date = $this->trial_ends_at ?? $this->discover_ends_at;
+               return $date === null ?
+                   null :
+                   $date->format('d/m/Y');
+            })
+        ];
+    }
+
 
 }
diff --git a/app/Nova/User.php b/app/Nova/User.php
index 4e88bd4..b096d46 100644
--- a/app/Nova/User.php
+++ b/app/Nova/User.php
@@ -59,7 +59,7 @@ class User extends Resource
      */
     public function fields(Request $request)
     {
-        return [
+        return array_merge([
 //            ID::make()->sortable(),
             Text::make('Prénom', 'first_name'),
             Text::make('Nom', 'last_name'),
@@ -70,6 +70,7 @@ class User extends Resource
             new Panel('Affiliation', [
                 BelongsTo::make('Organisation', 'organization', Organization::class)->searchable()->nullable(),
             ]),
+            ], $this->extraFields(), [
             Boolean::make('Compte activé', 'reg_complete')->hideWhenCreating(),
             Select::make('Type')->options([
                 AppUser::TYPE_SUBSCRIBER => 'Abonné',
@@ -79,9 +80,16 @@ class User extends Resource
             ])->hideFromIndex()->required()->withMeta(['value' => $this->type ?? static::$type ?? AppUser::TYPE_SUBSCRIBER]),
             Badge::make('Etat', fn() => AppUser::STATUSES[$this->status]['label'])
                 ->map(Arr::pluck(AppUser::STATUSES, 'badge', 'label')),
-        ];
+        ]);
     }
 
+    /**
+     * @return array
+     */
+    protected function extraFields()
+    {
+        return [];
+    }
 
     /**
      * Get the address fields for the resource.
-- 
2.39.5