From 8f5afaacd4cbd568bfe9f4efb3bd627bc6df31c6 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 13 Jul 2021 08:07:09 +1000 Subject: [PATCH] Minor fixeS --- app/Jobs/Util/Import.php | 3 ++- app/Mail/SupportMessageSent.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index cd8d1931d004..99856931a0e5 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -1241,7 +1241,8 @@ class Import implements ShouldQueue $try_quote = false; $exception = false; - + $entity = false; + try{ $invoice_id = $this->transformId('invoices', $resource['invoice_id']); $entity = Invoice::where('id', $invoice_id)->withTrashed()->first(); diff --git a/app/Mail/SupportMessageSent.php b/app/Mail/SupportMessageSent.php index e781d8542e55..db5c7f6bb2c4 100644 --- a/app/Mail/SupportMessageSent.php +++ b/app/Mail/SupportMessageSent.php @@ -62,7 +62,7 @@ class SupportMessageSent extends Mailable else $subject = "Self Host {$user->present()->name} - [{$plan} - {$company->db}]"; - return $this->from(config('mail.from.address'), config('mail.from.name')) + return $this->from(config('mail.from.address'), $user->present()->name()) ->replyTo($user->email, $user->present()->name()) ->subject($subject) ->view('email.support.message', [