From db3ccaf4bc77580adf99daf3ab57dffa9238e977 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 8 Oct 2019 06:49:16 +1000
Subject: [PATCH] validation fixes

---
 app/Http/Requests/Client/UpdateClientRequest.php   | 4 ++--
 app/Http/Requests/Company/UpdateCompanyRequest.php | 2 +-
 app/Models/Client.php                              | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Http/Requests/Client/UpdateClientRequest.php b/app/Http/Requests/Client/UpdateClientRequest.php
index 36c20c9d14c9..f862696dada3 100644
--- a/app/Http/Requests/Client/UpdateClientRequest.php
+++ b/app/Http/Requests/Client/UpdateClientRequest.php
@@ -31,7 +31,7 @@ class UpdateClientRequest extends Request
     public function rules()
     {
         /* Ensure we have a client name, and that all emails are unique*/
-        $rules['name'] = 'required';
+//        $rules['name'] = 'required';
 
         $rules['company_logo'] = 'mimes:jpeg,jpg,png,gif|max:10000';
 
@@ -48,7 +48,7 @@ class UpdateClientRequest extends Request
             {
                 for ($i = 0; $i < count($contacts); $i++) {
                     //$rules['contacts.' . $i . '.email'] = 'nullable|email|unique:client_contacts,email,' . $contacts[$i]['id'];
-                    $rules['contacts.' . $i . '.email'] = 'email';
+                    $rules['contacts.' . $i . '.email'] = 'nullable|email';
                 }
             }
             return $rules;
diff --git a/app/Http/Requests/Company/UpdateCompanyRequest.php b/app/Http/Requests/Company/UpdateCompanyRequest.php
index 22b3eda8bf97..2bb47cbbafc3 100644
--- a/app/Http/Requests/Company/UpdateCompanyRequest.php
+++ b/app/Http/Requests/Company/UpdateCompanyRequest.php
@@ -40,7 +40,7 @@ class UpdateCompanyRequest extends Request
             'size_id' => 'integer|nullable',
             'country_id' => 'integer|nullable',
             'work_email' => 'email|nullable',
-            'settings' => 'json',
+           // 'settings' => 'json',
         ];
     }
     
diff --git a/app/Models/Client.php b/app/Models/Client.php
index 2a75e7b8d7bf..bdeb84357546 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -84,6 +84,7 @@ class Client extends BaseModel
         'payment_terms',
         'vat_number',
         'id_number',
+        'group_settings_id',
     ];