From 97b49f8df69f657b604bc13c07fa117d45b0ae0f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 14 May 2021 13:32:37 +1000
Subject: [PATCH] Fixes for download export button

---
 .../ClientPortal/ContactHashLoginController.php            | 4 ++--
 app/Http/Middleware/ContactKeyLogin.php                    | 2 +-
 app/Jobs/Company/CompanyExport.php                         | 6 ++++--
 resources/views/email/admin/download_files.blade.php       | 7 ++++++-
 tests/Feature/Export/ExportCompanyTest.php                 | 4 ++--
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/ClientPortal/ContactHashLoginController.php b/app/Http/Controllers/ClientPortal/ContactHashLoginController.php
index bffbf0ff6450..4a6a7470cf71 100644
--- a/app/Http/Controllers/ClientPortal/ContactHashLoginController.php
+++ b/app/Http/Controllers/ClientPortal/ContactHashLoginController.php
@@ -24,12 +24,12 @@ class ContactHashLoginController extends Controller
      */
     public function login(string $contact_key)
     {
-        return redirect('/client/login');
+        return redirect('/client/invoices');
     }
 
     public function magicLink(string $magic_link)
     {
-        return redirect('/client/login');
+        return redirect('/client/invoices');
     }
 
     public function errorPage()
diff --git a/app/Http/Middleware/ContactKeyLogin.php b/app/Http/Middleware/ContactKeyLogin.php
index 9de9034bda2f..4ababf873a0b 100644
--- a/app/Http/Middleware/ContactKeyLogin.php
+++ b/app/Http/Middleware/ContactKeyLogin.php
@@ -42,7 +42,7 @@ class ContactKeyLogin
             if (MultiDB::findAndSetDbByContactKey($request->segment(3))) {
 
             if($client_contact = ClientContact::where('contact_key', $request->segment(3))->first()){
-                auth()->guard('contact')->login($client_contact, true);
+                Auth::guard('contact')->login($client_contact, true);
                 return redirect()->to('client/dashboard');
              }
 
diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php
index 935b088c401b..8a4fede84ca5 100644
--- a/app/Jobs/Company/CompanyExport.php
+++ b/app/Jobs/Company/CompanyExport.php
@@ -66,7 +66,7 @@ class CompanyExport implements ShouldQueue
      *
      * @return CompanyToken|null
      */
-    public function handle() : void
+    public function handle()
     {
 
         MultiDB::setDb($this->company->db);
@@ -405,7 +405,9 @@ class CompanyExport implements ShouldQueue
 
         //write to tmp and email to owner();
 
-        $this->zipAndSend();        
+        $this->zipAndSend();  
+
+        return true;      
     }
 
     private function transformBasicEntities($model)
diff --git a/resources/views/email/admin/download_files.blade.php b/resources/views/email/admin/download_files.blade.php
index d1f58b786d25..f1ca9d417c62 100644
--- a/resources/views/email/admin/download_files.blade.php
+++ b/resources/views/email/admin/download_files.blade.php
@@ -1,7 +1,7 @@
 @component('email.template.master', ['design' => 'light', 'settings' =>$settings])
 
 @slot('header')
-    @component('email.components.header', ['p' => '', 'logo' => $url])
+    @component('email.components.header', ['p' => '', 'logo' => $logo])
     	@lang('texts.download')
     @endcomponent
 
@@ -12,6 +12,11 @@
 
 @lang('texts.download_timeframe')
 
+
+    @component('email.components.button', ['url' => $url])
+        @lang('texts.download')
+    @endcomponent
+
 @slot('signature')
     InvoiceNinja (contact@invoiceninja.com)
 @endslot
diff --git a/tests/Feature/Export/ExportCompanyTest.php b/tests/Feature/Export/ExportCompanyTest.php
index c30e85417a0e..82bb57e9f318 100644
--- a/tests/Feature/Export/ExportCompanyTest.php
+++ b/tests/Feature/Export/ExportCompanyTest.php
@@ -44,8 +44,8 @@ class ExportCompanyTest extends TestCase
 
     public function testCompanyExport()
     {
-        CompanyExport::dispatchNow($this->company, $this->company->users->first());
+        $res = CompanyExport::dispatchNow($this->company, $this->company->users->first());
 
-        $this->assertTrue(true);
+        $this->assertTrue($res);
     }
 }