From 6db9126ea6be8d23cea8335223efd6a318e09eec Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 13 Sep 2016 16:32:03 +0300
Subject: [PATCH] Made client portal link easier to share

---
 .../Controllers/ClientPortalController.php    | 25 ++++++++-----------
 app/Http/routes.php                           |  3 +--
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/ClientPortalController.php b/app/Http/Controllers/ClientPortalController.php
index fa396a68240b..e17d1eaafd44 100644
--- a/app/Http/Controllers/ClientPortalController.php
+++ b/app/Http/Controllers/ClientPortalController.php
@@ -155,18 +155,6 @@ class ClientPortalController extends BaseController
         return View::make('invoices.view', $data);
     }
 
-    public function contactIndex($contactKey) {
-        if (!$contact = Contact::where('contact_key', '=', $contactKey)->first()) {
-            return $this->returnError();
-        }
-
-        $client = $contact->client;
-
-        Session::put('contact_key', $contactKey);// track current contact
-
-        return redirect()->to($client->account->enable_client_portal_dashboard?'/client/dashboard':'/client/invoices/');
-    }
-
     private function getPaymentTypes($account, $client, $invitation)
     {
         $links = [];
@@ -201,9 +189,14 @@ class ClientPortalController extends BaseController
         return $pdfString;
     }
 
-    public function dashboard()
+    public function dashboard($contactKey = false)
     {
-        if (!$contact = $this->getContact()) {
+        if ($contactKey) {
+            if (!$contact = Contact::where('contact_key', '=', $contactKey)->first()) {
+                return $this->returnError();
+            }
+            Session::put('contact_key', $contactKey);// track current contact
+        } else if (!$contact = $this->getContact()) {
             return $this->returnError();
         }
 
@@ -212,8 +205,10 @@ class ClientPortalController extends BaseController
         $color = $account->primary_color ? $account->primary_color : '#0b4d78';
         $customer = false;
 
-        if (!$account->enable_client_portal || !$account->enable_client_portal_dashboard) {
+        if (!$account->enable_client_portal) {
             return $this->returnError();
+        } elseif (!$account->enable_client_portal_dashboard) {
+            return redirect()->to('/client/invoices/');
         }
 
         if ($paymentDriver = $account->paymentDriver(false, GATEWAY_TYPE_TOKEN)) {
diff --git a/app/Http/routes.php b/app/Http/routes.php
index a21caf588b10..6106658f6016 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -57,8 +57,7 @@ Route::group(['middleware' => 'auth:client'], function() {
     Route::post('client/invoices/auto_bill', 'ClientPortalController@setAutoBill');
     Route::get('client/documents', 'ClientPortalController@documentIndex');
     Route::get('client/payments', 'ClientPortalController@paymentIndex');
-    Route::get('client/dashboard', 'ClientPortalController@dashboard');
-    Route::get('client/dashboard/{contact_key}', 'ClientPortalController@contactIndex');
+    Route::get('client/dashboard/{contact_key?}', 'ClientPortalController@dashboard');
     Route::get('client/documents/js/{documents}/{filename}', 'ClientPortalController@getDocumentVFSJS');
     Route::get('client/documents/{invitation_key}/{documents}/{filename?}', 'ClientPortalController@getDocument');
     Route::get('client/documents/{invitation_key}/{filename?}', 'ClientPortalController@getInvoiceDocumentsZip');