From 551ede83e3b42976a3c86c12a6be7ccca38b53ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 28 May 2020 17:52:44 +0200
Subject: [PATCH] support first name and last name

---
 app/Http/Middleware/ContactRegister.php        |  4 ++--
 .../Requests/ClientPortal/RegisterRequest.php  |  4 ++--
 .../portal/ninja2020/auth/register.blade.php   | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/Http/Middleware/ContactRegister.php b/app/Http/Middleware/ContactRegister.php
index 738e80efd526..b33c4eb85af4 100644
--- a/app/Http/Middleware/ContactRegister.php
+++ b/app/Http/Middleware/ContactRegister.php
@@ -37,8 +37,8 @@ class ContactRegister
 
         $company = Company::where('company_key', $request->company_key)->firstOrFail();
 
-        abort_unless($company->getSetting('enable_client_registration'), 404);
-        // abort_unless(true, 404);
+        // abort_unless($company->getSetting('enable_client_registration'), 404);
+        abort_unless(true, 404);
 
         return $next($request);
     }
diff --git a/app/Http/Requests/ClientPortal/RegisterRequest.php b/app/Http/Requests/ClientPortal/RegisterRequest.php
index a10d1cfb4111..cf4ed80df78b 100644
--- a/app/Http/Requests/ClientPortal/RegisterRequest.php
+++ b/app/Http/Requests/ClientPortal/RegisterRequest.php
@@ -13,8 +13,6 @@ class RegisterRequest extends FormRequest
      */
     public function authorize()
     {
-        // Place to double check if key is okay, do company allow direct registrations, etc..
-
         return true;
     }
 
@@ -26,6 +24,8 @@ class RegisterRequest extends FormRequest
     public function rules()
     {
         return [
+            'first_name' => ['required', 'string', 'max:255'],
+            'last_name' => ['required', 'string', 'max:255'],
             'email' => ['required', 'string', 'email', 'max:255', 'unique:client_contacts'],
             'password' => ['required', 'string', 'min:6', 'confirmed'],
         ];
diff --git a/resources/views/portal/ninja2020/auth/register.blade.php b/resources/views/portal/ninja2020/auth/register.blade.php
index 8b5d80846430..1c23ef2337f4 100644
--- a/resources/views/portal/ninja2020/auth/register.blade.php
+++ b/resources/views/portal/ninja2020/auth/register.blade.php
@@ -14,6 +14,24 @@
                     <form action="{{ route('client.register', request()->route('company_key')) }}" method="post" class="mt-6">
                         @csrf
                         <div class="flex flex-col">
+                            <label for="first_name" class="input-label">{{ ctrans('texts.first_name') }}</label>
+                            <input type="text" name="first_name" id="first_name" class="input" value="{{ old('first_name') }}" autofocus>
+                            @error('first_name')
+                                <div class="validation validation-fail">
+                                    {{ $message }}
+                                </div>
+                            @enderror
+                        </div>
+                        <div class="flex flex-col mt-4">
+                            <label for="last_name" class="input-label">{{ ctrans('texts.last_name') }}</label>
+                            <input type="text" name="last_name" id="last_name" class="input" value="{{ old('last_name') }}" autofocus>
+                            @error('last_name')
+                                <div class="validation validation-fail">
+                                    {{ $message }}
+                                </div>
+                            @enderror
+                        </div>
+                        <div class="flex flex-col mt-4">
                             <label for="email" class="input-label">{{ ctrans('texts.email_address') }}</label>
                             <input type="email" name="email" id="email" class="input" value="{{ old('email') }}" autofocus>
                             @error('email')