From 222cd28836a2d7c8d399fec4709ab2dc35aea22a Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 18 Feb 2021 11:12:49 +1100
Subject: [PATCH] Fix for mail refactor

---
 app/Jobs/Mail/NinjaMailerJob.php       | 2 +-
 tests/Feature/Import/ImportCsvTest.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php
index d1b4134bfc54..598c0cfcd0c9 100644
--- a/app/Jobs/Mail/NinjaMailerJob.php
+++ b/app/Jobs/Mail/NinjaMailerJob.php
@@ -104,7 +104,7 @@ class NinjaMailerJob implements ShouldQueue
         }
 
         if ($this->nmo->to_user instanceof ClientContact) 
-            $this->logMailError($e->getMessage(), $this->nmo->to_user->client);
+            $this->logMailError($message, $this->nmo->to_user->client);
     }
 
     private function setMailDriver()
diff --git a/tests/Feature/Import/ImportCsvTest.php b/tests/Feature/Import/ImportCsvTest.php
index 380f2c0ee42e..0b06ac646ed1 100644
--- a/tests/Feature/Import/ImportCsvTest.php
+++ b/tests/Feature/Import/ImportCsvTest.php
@@ -56,7 +56,7 @@ class ImportCsvTest extends TestCase
 
     public function testInvoiceCsvImport()
     {
-        $this->markTestSkipped();
+        // $this->markTestSkipped();
 
         $csv = file_get_contents(base_path().'/tests/Feature/Import/invoice.csv');
         $hash = Str::random(32);
@@ -98,7 +98,7 @@ class ImportCsvTest extends TestCase
 
     public function testClientCsvImport()
     {
-        $this->markTestSkipped();
+        // $this->markTestSkipped();
 
         $csv = file_get_contents(base_path().'/tests/Feature/Import/clients.csv');
         $hash = Str::random(32);
@@ -132,7 +132,7 @@ class ImportCsvTest extends TestCase
 
     public function testProductCsvImport()
     {
-        $this->markTestSkipped();
+        // $this->markTestSkipped();
 
 
         $csv = file_get_contents(base_path().'/tests/Feature/Import/products.csv');