From bbce6b8ce8d774bc1f814f31986758e9a236b664 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 21 Feb 2017 15:27:04 +0200
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20require=20client=20email=20addr?=
 =?UTF-8?q?ess?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Requests/CreateClientRequest.php   |  4 +---
 app/Http/Requests/CreateInvoiceRequest.php  |  2 +-
 app/Http/Requests/UpdateClientRequest.php   |  4 +---
 app/Http/Requests/UpdateInvoiceRequest.php  |  2 +-
 app/Providers/AppServiceProvider.php        | 14 --------------
 resources/lang/en/texts.php                 |  2 +-
 resources/views/invoices/edit.blade.php     | 10 ++++------
 resources/views/invoices/knockout.blade.php |  6 +++---
 8 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/app/Http/Requests/CreateClientRequest.php b/app/Http/Requests/CreateClientRequest.php
index 3d7b3df8c985..f2e581abe4dd 100644
--- a/app/Http/Requests/CreateClientRequest.php
+++ b/app/Http/Requests/CreateClientRequest.php
@@ -21,9 +21,7 @@ class CreateClientRequest extends ClientRequest
      */
     public function rules()
     {
-        $rules = [
-            'contacts' => 'valid_contacts',
-        ];
+        $rules = [];
 
         if ($this->user()->account->client_number_counter) {
             $rules['id_number'] = 'unique:clients,id_number,,id,account_id,' . $this->user()->account_id;
diff --git a/app/Http/Requests/CreateInvoiceRequest.php b/app/Http/Requests/CreateInvoiceRequest.php
index 5a1b119d0403..4f391da217bb 100644
--- a/app/Http/Requests/CreateInvoiceRequest.php
+++ b/app/Http/Requests/CreateInvoiceRequest.php
@@ -24,7 +24,7 @@ class CreateInvoiceRequest extends InvoiceRequest
     public function rules()
     {
         $rules = [
-            'client.contacts' => 'valid_contacts',
+            'client' => 'required',
             'invoice_items' => 'valid_invoice_items',
             'invoice_number' => 'required|unique:invoices,invoice_number,,id,account_id,' . $this->user()->account_id,
             'discount' => 'positive',
diff --git a/app/Http/Requests/UpdateClientRequest.php b/app/Http/Requests/UpdateClientRequest.php
index c72fede00fa2..a539234196d2 100644
--- a/app/Http/Requests/UpdateClientRequest.php
+++ b/app/Http/Requests/UpdateClientRequest.php
@@ -21,9 +21,7 @@ class UpdateClientRequest extends ClientRequest
      */
     public function rules()
     {
-        $rules = [
-            'contacts' => 'valid_contacts',
-        ];
+        $rules = [];
 
         if ($this->user()->account->client_number_counter) {
             $rules['id_number'] = 'unique:clients,id_number,'.$this->entity()->id.',id,account_id,' . $this->user()->account_id;
diff --git a/app/Http/Requests/UpdateInvoiceRequest.php b/app/Http/Requests/UpdateInvoiceRequest.php
index 5edf6c719c1b..775a80b54f56 100644
--- a/app/Http/Requests/UpdateInvoiceRequest.php
+++ b/app/Http/Requests/UpdateInvoiceRequest.php
@@ -26,7 +26,7 @@ class UpdateInvoiceRequest extends InvoiceRequest
         $invoiceId = $this->entity()->id;
 
         $rules = [
-            'client.contacts' => 'valid_contacts',
+            'client' => 'required',
             'invoice_items' => 'valid_invoice_items',
             'invoice_number' => 'required|unique:invoices,invoice_number,' . $invoiceId . ',id,account_id,' . $this->user()->account_id,
             'discount' => 'positive',
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 9f85ad22ea33..5f1d5dad7a81 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -178,20 +178,6 @@ class AppServiceProvider extends ServiceProvider
             return ! $value || strstr($value, '{$counter}');
         });
 
-        Validator::extend('valid_contacts', function ($attribute, $value, $parameters) {
-            foreach ($value as $contact) {
-                $validator = Validator::make($contact, [
-                        'email' => 'email|required_without:first_name',
-                        'first_name' => 'required_without:email',
-                    ]);
-                if ($validator->fails()) {
-                    return false;
-                }
-            }
-
-            return true;
-        });
-
         Validator::extend('valid_invoice_items', function ($attribute, $value, $parameters) {
             $total = 0;
             foreach ($value as $item) {
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 0a0e0f24a444..5b1b8a09291a 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -523,7 +523,7 @@ $LANG = array(
     'www' => 'www',
     'logo' => 'Logo',
     'subdomain' => 'Subdomain',
-    'provide_name_or_email' => 'Please provide a contact name or email',
+    'provide_name_or_email' => 'Please provide a name or email',
     'charts_and_reports' => 'Charts & Reports',
     'chart' => 'Chart',
     'report' => 'Report',
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 85411176c1e8..4bf0e263abb3 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -122,11 +122,11 @@
 			@endif
 
 			<div data-bind="with: client" class="invoice-contact">
-				<div style="display:none" class="form-group" data-bind="visible: contacts().length > 0 &amp;&amp; (contacts()[0].email() || contacts()[0].first_name()), foreach: contacts">
+				<div style="display:none" class="form-group" data-bind="visible: contacts().length > 0, foreach: contacts">
 					<div class="col-lg-8 col-lg-offset-4 col-sm-offset-4">
 						<label class="checkbox" data-bind="attr: {for: $index() + '_check'}" onclick="refreshPDF(true)">
                             <input type="hidden" value="0" data-bind="attr: {name: 'client[contacts][' + $index() + '][send_invoice]'}">
-							<input type="checkbox" value="1" data-bind="checked: send_invoice, attr: {id: $index() + '_check', name: 'client[contacts][' + $index() + '][send_invoice]'}">
+							<input type="checkbox" value="1" data-bind="visible: email || first_name || last_name, checked: send_invoice, attr: {id: $index() + '_check', name: 'client[contacts][' + $index() + '][send_invoice]'}">
 							<span data-bind="html: email.display"></span>
                         </label>
                         @if ( ! $invoice->is_deleted && ! $invoice->client->is_deleted)
@@ -1466,13 +1466,11 @@
     }
 
 	function isSaveValid() {
-		var isValid = false;
+		var isValid = model.invoice().client().name ? true : false;
 		for (var i=0; i<model.invoice().client().contacts().length; i++) {
 			var contact = model.invoice().client().contacts()[i];
-			if (isValidEmailAddress(contact.email()) || contact.first_name()) {
+			if (isValidEmailAddress(contact.email()) || contact.first_name() || contact.last_name()) {
 				isValid = true;
-			} else {
-				isValid = false;
 				break;
 			}
 		}
diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php
index 740802ec55d9..04aa9e197785 100644
--- a/resources/views/invoices/knockout.blade.php
+++ b/resources/views/invoices/knockout.blade.php
@@ -96,11 +96,11 @@ function ViewModel(data) {
             name = email;
         }
 
-        var isValid = true;
+        var isValid = name ? true : false;
         var contacts = self.invoice().client().contacts();
         $(contacts).each(function(item, value) {
-            if (!value.isValid()) {
-                isValid = false;
+            if (value.isValid()) {
+                isValid = true;
             }
         });
         if (!isValid) {