Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixeS

Browse Source
This commit is contained in:
David Bomba 2021-07-13 08:07:09 +10:00
parent 21636e21b2
commit 8f5afaacd4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Jobs/Util/Import.php
View File

@ -1241,7 +1241,8 @@ class Import implements ShouldQueue
$try_quote = false; $try_quote = false;
$exception = false; $exception = false;
$entity = false;
try{ try{
$invoice_id = $this->transformId('invoices', $resource['invoice_id']); $invoice_id = $this->transformId('invoices', $resource['invoice_id']);
$entity = Invoice::where('id', $invoice_id)->withTrashed()->first(); $entity = Invoice::where('id', $invoice_id)->withTrashed()->first();

2
app/Mail/SupportMessageSent.php
View File

@ -62,7 +62,7 @@ class SupportMessageSent extends Mailable
else else
$subject = "Self Host {$user->present()->name} - [{$plan} - {$company->db}]"; $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()) ->replyTo($user->email, $user->present()->name())
->subject($subject) ->subject($subject)
->view('email.support.message', [ ->view('email.support.message', [