mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-22 07:00:56 -04:00
fixes for mail order
This commit is contained in:
parent
02c810633a
commit
528a02db6f
2
.gitignore
vendored
2
.gitignore
vendored
@ -17,7 +17,7 @@ local_version.txt
|
|||||||
|
|
||||||
/resources/assets/bower
|
/resources/assets/bower
|
||||||
/public/logo
|
/public/logo
|
||||||
|
/storage/*
|
||||||
.env.dusk.local
|
.env.dusk.local
|
||||||
/public/vendors/*
|
/public/vendors/*
|
||||||
*.log
|
*.log
|
||||||
|
@ -45,7 +45,7 @@ class BouncedEmail extends Mailable implements ShouldQueue
|
|||||||
$subject = ctrans("texts.notification_{$entity_type}_bounced_subject", ['invoice' => $invoice->number]);
|
$subject = ctrans("texts.notification_{$entity_type}_bounced_subject", ['invoice' => $invoice->number]);
|
||||||
|
|
||||||
return
|
return
|
||||||
$this->from(config('mail.from.name'), config('mail.from.address'))
|
$this->from(config('mail.from.address'), config('mail.from.name'))
|
||||||
->text()
|
->text()
|
||||||
->subject($subject);
|
->subject($subject);
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ class DownloadInvoices extends Mailable
|
|||||||
public function build()
|
public function build()
|
||||||
{
|
{
|
||||||
|
|
||||||
return $this->from(config('mail.from.name'), config('mail.from.address'))
|
return $this->from(config('mail.from.address'), config('mail.from.name'))
|
||||||
->subject(ctrans('texts.download_files'))
|
->subject(ctrans('texts.download_files'))
|
||||||
->markdown(
|
->markdown(
|
||||||
'email.admin.download_files',
|
'email.admin.download_files',
|
||||||
|
@ -28,7 +28,7 @@ class ExistingMigration extends Mailable
|
|||||||
public function build()
|
public function build()
|
||||||
{
|
{
|
||||||
|
|
||||||
return $this->from(config('mail.from.name'), config('mail.from.address'))
|
return $this->from(config('mail.from.address'), config('mail.from.name'))
|
||||||
->view('email.migration.existing');
|
->view('email.migration.existing');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -29,7 +29,7 @@ class MigrationCompleted extends Mailable
|
|||||||
{
|
{
|
||||||
$data['settings'] = auth()->user()->company()->settings;
|
$data['settings'] = auth()->user()->company()->settings;
|
||||||
|
|
||||||
return $this->from(config('mail.from.name'), config('mail.from.address'))
|
return $this->from(config('mail.from.address'), config('mail.from.name'))
|
||||||
->view('email.migration.completed', $data);
|
->view('email.migration.completed', $data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -32,7 +32,7 @@ class MigrationFailed extends Mailable
|
|||||||
public function build()
|
public function build()
|
||||||
{
|
{
|
||||||
|
|
||||||
return $this->from(config('mail.from.name'), config('mail.from.address'))
|
return $this->from(config('mail.from.address'), config('mail.from.name'))
|
||||||
->view('email.migration.failed');
|
->view('email.migration.failed');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user