From b957b4397b3bf9334e1ffe1322a0b827cdd2ea47 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 17 Feb 2017 09:50:41 +0200
Subject: [PATCH] Fix for invoice.services

---
 app/Http/Controllers/ClientPortalController.php | 7 ++++++-
 app/Http/Controllers/InvoiceController.php      | 5 -----
 app/Models/Account.php                          | 4 ----
 resources/views/invoices/knockout.blade.php     | 4 +++-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/ClientPortalController.php b/app/Http/Controllers/ClientPortalController.php
index 7cefa6e1e1bf..ca996ac136ea 100644
--- a/app/Http/Controllers/ClientPortalController.php
+++ b/app/Http/Controllers/ClientPortalController.php
@@ -46,6 +46,11 @@ 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();
         }
@@ -65,7 +70,7 @@ class ClientPortalController extends BaseController
 
         $account->loadLocalizationSettings($client);
 
-        if (!Input::has('phantomjs') && !Input::has('silent') && !Session::has($invitationKey)
+        if (! Input::has('phantomjs') && ! session('silent') && ! Session::has($invitationKey)
             && (!Auth::check() || Auth::user()->account_id != $invoice->account_id)) {
             if ($invoice->isType(INVOICE_TYPE_QUOTE)) {
                 event(new QuoteInvitationWasViewed($invoice, $invitation));
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index f08d82de0259..2f46ff2d60dc 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -167,11 +167,6 @@ class InvoiceController extends BaseController
                             $contact->invitation_openend = $invitation->opened_date && $invitation->opened_date != '0000-00-00 00:00:00' ? $invitation->opened_date : false;
                             $contact->invitation_status = $contact->email_error ? false : $invitation->getStatus();
                             $contact->invitation_signature_svg = $invitation->signatureDiv();
-
-                            // when using invoice.services prevent markng as viewed
-                            if (Utils::isNinja() && $account->domain_id != \Domain::INVOICENINJA_COM) {
-                                $contact->invitation_link .= '?silent=true';
-                            }
                         }
                     }
                 }
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 5f0860dd5236..5c134e8c50a8 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -717,10 +717,6 @@ class Account extends Eloquent
      */
     public function hasLogo()
     {
-        if($this->logo == ''){
-            $this->calculateLogoDetails();
-        }
-
         return !empty($this->logo);
     }
 
diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php
index bb9f3d96feaf..2143f668feaf 100644
--- a/resources/views/invoices/knockout.blade.php
+++ b/resources/views/invoices/knockout.blade.php
@@ -666,7 +666,9 @@ function ContactModel(data) {
         var str = '';
         @if (Utils::isConfirmed())
         if (self.invitation_link()) {
-            str += '<a href="' + self.invitation_link() + '" target="_blank">{{ trans('texts.view_as_recipient') }}</a>';
+            // clicking add 'silent=true' however it's removed when copying the link
+            str += '<a href="' + self.invitation_link() + '" onclick="window.open(\'' + self.invitation_link()
+                    + '?silent=true\', \'_blank\');return false;">{{ trans('texts.view_as_recipient') }}</a>';
         }
         @endif