From e5abaeaadcba92c93c6da3e41a646369bc9ee0b3 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 15 Jan 2018 22:51:16 +0200
Subject: [PATCH] Merge custom contact field fix

---
 app/Http/Controllers/ClientPortalController.php | 2 ++
 app/Models/Invoice.php                          | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/Http/Controllers/ClientPortalController.php b/app/Http/Controllers/ClientPortalController.php
index e276867b0a6a..92e04ecd77d5 100644
--- a/app/Http/Controllers/ClientPortalController.php
+++ b/app/Http/Controllers/ClientPortalController.php
@@ -111,6 +111,8 @@ class ClientPortalController extends BaseController
             'last_name',
             'email',
             'phone',
+            'custom_value1',
+            'custom_value2',
         ]);
 
         // translate the country names
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 97599d585ebb..e478e3d50c76 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -972,6 +972,8 @@ class Invoice extends EntityModel implements BalanceAffecting
             'custom_value2',
             'custom_client_label1',
             'custom_client_label2',
+            'custom_contact_label1',
+            'custom_contact_label2',
             'primary_color',
             'secondary_color',
             'hide_quantity',