From 33df867438eeba357280e0587052331a92f72e98 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 1 Mar 2023 07:14:07 +1100
Subject: [PATCH 1/2] Allow client registration fields to be both visible and
 required

---
 app/DataMapper/ClientRegistrationFields.php   | 20 +++++++++++++++++++
 .../Requests/ClientPortal/RegisterRequest.php |  4 ++--
 .../portal/ninja2020/auth/register.blade.php  |  2 +-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/app/DataMapper/ClientRegistrationFields.php b/app/DataMapper/ClientRegistrationFields.php
index 22c97817037c..04e64fadf921 100644
--- a/app/DataMapper/ClientRegistrationFields.php
+++ b/app/DataMapper/ClientRegistrationFields.php
@@ -20,82 +20,102 @@ class ClientRegistrationFields
             [
                 'key' => 'first_name',
                 'required' => true,
+                'visible' => true,
             ],
             [
                 'key' => 'last_name',
                 'required' => true,
+                'visible' => true,
             ],
             [
                 'key' => 'email',
                 'required' => true,
+                'visible' => true,
             ],
             [
                 'key' => 'phone',
                 'required' => false,
+                'visible' => true,
             ],
             [
                 'key' => 'password',
                 'required' => true,
+                'visible' => true,
             ],
             [
                 'key' => 'name',
                 'required' => false,
+                'visible' => false,
             ],
             [
                 'key' => 'website',
                 'required' => false,
+                'visible' => false,
             ],
             [
                 'key' => 'address1',
                 'required' => false,
+                'visible' => false,
             ],
             [
                 'key' => 'address2',
                 'required' => false,
+                'visible' => false,
             ],
             [
                 'key' => 'city',
                 'required' => false,
+                'visible' => false,
             ],
             [
                 'key' => 'state',
                 'required' => false,
+                'visible' => false,
             ],
             [
                 'key' => 'postal_code',
                 'required' => false,
+                'visible' => false,
             ],
             [
                 'key' => 'country_id',
                 'required' => false,
+                'visible' => false,
             ],
             [
                 'key' => 'custom_value1',
                 'required' => false,
+                'visible' => false,
             ],
             [
                 'key' => 'custom_value2',
                 'required' => false,
+                'visible' => false,
             ],
             [
                 'key' => 'custom_value3',
                 'required' => false,
+                'visible' => false,
             ],
             [
                 'key' => 'custom_value4',
                 'required' => false,
+                'visible' => false,
             ],
             [
                 'key' => 'public_notes',
                 'required' => false,
+                'visible' => false,
             ],
             [
                 'key' => 'vat_number',
                 'required' => false,
+                'visible' => false,
             ],
             [
                 'key' => 'currency_id',
                 'required' => false,
+                'visible' => false,
             ],
         ];
 
diff --git a/app/Http/Requests/ClientPortal/RegisterRequest.php b/app/Http/Requests/ClientPortal/RegisterRequest.php
index 52a37b985ac7..b1e4763075cc 100644
--- a/app/Http/Requests/ClientPortal/RegisterRequest.php
+++ b/app/Http/Requests/ClientPortal/RegisterRequest.php
@@ -40,8 +40,8 @@ class RegisterRequest extends FormRequest
         $rules = [];
 
         foreach ($this->company()->client_registration_fields as $field) {
-            if ($field['required']) {
-                $rules[$field['key']] = ['bail','required'];
+            if ($field['visible']) {
+                $rules[$field['key']] = $field['required'] ? ['bail','required'] : ['sometimes'];
             }
         }
 
diff --git a/resources/views/portal/ninja2020/auth/register.blade.php b/resources/views/portal/ninja2020/auth/register.blade.php
index 34b78f406de4..1020e826dd88 100644
--- a/resources/views/portal/ninja2020/auth/register.blade.php
+++ b/resources/views/portal/ninja2020/auth/register.blade.php
@@ -29,7 +29,7 @@
                 <div class="grid grid-cols-12 gap-4 mt-10">
                     @if($register_company->client_registration_fields)
                     @foreach($register_company->client_registration_fields as $field)
-                        @if($field['required'])
+                        @if($field['visible'])
                             <div class="col-span-12 md:col-span-6">
                                 <section class="flex items-center">
                                     <label 

From 52d4997945ca93ab9facf177f2f854f4c35869ba Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 1 Mar 2023 10:20:22 +1100
Subject: [PATCH 2/2] migration for client registration fields

---
 ...56_add_visible_prop_to_companies_table.php | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 database/migrations/2023_02_28_200056_add_visible_prop_to_companies_table.php

diff --git a/database/migrations/2023_02_28_200056_add_visible_prop_to_companies_table.php b/database/migrations/2023_02_28_200056_add_visible_prop_to_companies_table.php
new file mode 100644
index 000000000000..f600fb6370d0
--- /dev/null
+++ b/database/migrations/2023_02_28_200056_add_visible_prop_to_companies_table.php
@@ -0,0 +1,41 @@
+<?php
+
+use App\Models\Company;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Company::query()->cursor()->each(function ($company){
+
+            $crfs = $company->client_registration_fields;
+            
+            foreach($crfs as $key => $crf)
+            {
+                $crfs[$key]['visible'] = $crfs[$key]['required'];
+            }
+
+            $company->client_registration_fields = $crfs;
+            $company->save();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        
+    }
+};