From 300845c7feee778f9bf25a3c4b3621fc4a53f036 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 26 Feb 2017 13:56:54 +0200
Subject: [PATCH] Set 'silent' in the client portal at the client level

---
 .../Controllers/ClientPortalController.php    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/ClientPortalController.php b/app/Http/Controllers/ClientPortalController.php
index 8d74076c37aa..40a46176fc59 100644
--- a/app/Http/Controllers/ClientPortalController.php
+++ b/app/Http/Controllers/ClientPortalController.php
@@ -48,11 +48,6 @@ class ClientPortalController extends BaseController
 
     public function view($invitationKey)
     {
-        if (request()->silent) {
-            session(['silent' => true]);
-            return redirect(request()->url());
-        }
-
         if (! $invitation = $this->invoiceRepo->findInvoiceByInvitation($invitationKey)) {
             return $this->returnError();
         }
@@ -61,6 +56,11 @@ class ClientPortalController extends BaseController
         $client = $invoice->client;
         $account = $invoice->account;
 
+        if (request()->silent) {
+            session(['silent:' . $client->id => true]);
+            return redirect(request()->url());
+        }
+
         if (! $account->checkSubdomain(Request::server('HTTP_HOST'))) {
             return response()->view('error', [
                 'error' => trans('texts.invoice_not_found'),
@@ -69,7 +69,7 @@ class ClientPortalController extends BaseController
 
         $account->loadLocalizationSettings($client);
 
-        if (! Input::has('phantomjs') && ! session('silent') && ! Session::has($invitation->invitation_key)
+        if (! Input::has('phantomjs') && ! session('silent:' . $client->id) && ! Session::has($invitation->invitation_key)
             && (! Auth::check() || Auth::user()->account_id != $invoice->account_id)) {
             if ($invoice->isType(INVOICE_TYPE_QUOTE)) {
                 event(new QuoteInvitationWasViewed($invoice, $invitation));
@@ -228,11 +228,6 @@ class ClientPortalController extends BaseController
 
     public function dashboard($contactKey = false)
     {
-        if (request()->silent) {
-            session(['silent' => true]);
-            return redirect(request()->url());
-        }
-
         if ($contactKey) {
             if (! $contact = Contact::where('contact_key', '=', $contactKey)->first()) {
                 return $this->returnError();
@@ -244,8 +239,13 @@ class ClientPortalController extends BaseController
 
         $client = $contact->client;
         $account = $client->account;
-        $account->loadLocalizationSettings($client);
 
+        if (request()->silent) {
+            session(['silent:' . $client->id => true]);
+            return redirect(request()->url());
+        }
+
+        $account->loadLocalizationSettings($client);
         $color = $account->primary_color ? $account->primary_color : '#0b4d78';
         $customer = false;