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

Fixes for email invoice

Browse Source
This commit is contained in:
David Bomba 2020-10-20 10:37:33 +11:00
parent f0e4a94bee
commit 840696ad3c
8 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Jobs/User/UserEmailChanged.php
View File

@ -93,6 +93,7 @@ class UserEmailChanged extends BaseMailerJob implements ShouldQueue
'signature' => $this->company->owner()->signature, 'signature' => $this->company->owner()->signature,
'logo' => $this->company->present()->logo(), 'logo' => $this->company->present()->logo(),
'settings' => $this->settings, 'settings' => $this->settings,
'whitelabel' => $this->client->user->account->isPaid() ? true : false,
]; ];
} }
} }

4
app/Listeners/Invoice/InvoiceEmailedNotification.php
View File

@ -46,6 +46,10 @@ class InvoiceEmailedNotification implements ShouldQueue
$first_notification_sent = true; $first_notification_sent = true;
// $invoice = $event->invitation->invoice;
// $invoice->last_sent_date = now();
// $invoice->save();
foreach ($event->invitation->company->company_users as $company_user) { foreach ($event->invitation->company->company_users as $company_user) {
$user = $company_user->user; $user = $company_user->user;

1
app/Mail/Admin/EntityPaidObject.php
View File

@ -90,6 +90,7 @@ class EntityPaidObject
'signature' => $settings->email_signature, 'signature' => $settings->email_signature,
'logo' => $this->company->present()->logo(), 'logo' => $this->company->present()->logo(),
'settings' => $settings, 'settings' => $settings,
'whitelabel' => $this->company->account->isPaid() ? true : false,
]; ];
return $data; return $data;

2
app/Mail/Admin/EntitySentObject.php
View File

@ -85,7 +85,7 @@ class EntitySentObject
'signature' => $settings->email_signature, 'signature' => $settings->email_signature,
'logo' => $this->company->present()->logo(), 'logo' => $this->company->present()->logo(),
'settings' => $settings, 'settings' => $settings,
'whitelabel' => $this->company->account->isPaid() ? true : false,
]; ];
} }
} }

2
app/Mail/Admin/EntityViewedObject.php
View File

@ -85,7 +85,7 @@ class EntityViewedObject
'signature' => $settings->email_signature, 'signature' => $settings->email_signature,
'logo' => $this->company->present()->logo(), 'logo' => $this->company->present()->logo(),
'settings' => $settings, 'settings' => $settings,
'whitelabel' => $this->company->account->isPaid() ? true : false,
]; ];
return $data; return $data;

2
app/Mail/Admin/PaymentFailureObject.php
View File

@ -77,7 +77,7 @@ class PaymentFailureObject
'signature' => $signature, 'signature' => $signature,
'logo' => $this->company->present()->logo(), 'logo' => $this->company->present()->logo(),
'settings' => $this->client->getMergedSettings(), 'settings' => $this->client->getMergedSettings(),
'whitelabel' => $this->company->account->isPaid() ? true : false,
]; ];
return $data; return $data;

2
app/Mail/TemplateEmail.php
View File

@ -60,6 +60,8 @@ class TemplateEmail extends Mailable
->text('email.template.plain', [ ->text('email.template.plain', [
'body' => $this->build_email->getBody(), 'body' => $this->build_email->getBody(),
'footer' => $this->build_email->getFooter(), 'footer' => $this->build_email->getFooter(),
'whitelabel' => $this->client->user->account->isPaid() ? true : false,
'settings' => $settings,
]) ])
->view($template_name, [ ->view($template_name, [
'body' => $this->build_email->getBody(), 'body' => $this->build_email->getBody(),

2
app/Notifications/BaseNotification.php
View File

@ -124,7 +124,7 @@ class BaseNotification extends Notification implements ShouldQueue
'logo' => $this->entity->company->present()->logo(), 'logo' => $this->entity->company->present()->logo(),
'signature' => $this->settings->email_signature, 'signature' => $this->settings->email_signature,
'settings' => $this->settings, 'settings' => $this->settings,
'whitelabel' => $this->entity->company->account->isPaid() ? true : false,
]; ];
return $data; return $data;