tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for notifications

Browse source
This commit is contained in:
David Bomba 2021-07-23 08:04:01 +10:00
parent dc3cf85e2c
commit da7e368d63
5 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Jobs/Mail/NinjaMailerJob.php
View file

@ -193,8 +193,6 @@ class NinjaMailerJob implements ShouldQueue
return $this->setMailDriver();
}
/*
* Now that our token is refreshed and valid we can boot the
* mail driver at runtime and also set the token which will persist

2
app/Listeners/Invoice/InvoiceEmailedNotification.php
View file

@ -63,7 +63,7 @@ class InvoiceEmailedNotification implements ShouldQueue
$methods = $this->findUserNotificationTypes($event->invitation, $company_user, 'invoice', ['all_notifications', 'invoice_sent', 'invoice_sent_all']);
/* If one of the methods is email then we fire the EntitySentMailer */
if (($key = array_search('mail', $methods))) {
if (($key = array_search('mail', $methods)) !== false) {
unset($methods[$key]);
$nmo->to_user = $user;

2
app/Listeners/Invoice/InvoiceFailedEmailNotification.php
View file

@ -58,7 +58,7 @@ class InvoiceFailedEmailNotification
$methods = $this->findUserNotificationTypes($event->invitation, $company_user, 'invoice', ['all_notifications', 'invoice_sent', 'invoice_sent_all']);
if (($key = array_search('mail', $methods))) {
if (($key = array_search('mail', $methods)) !== false) {
unset($methods[$key]);
$nmo->to_user = $user;

2
app/Listeners/Quote/QuoteCreatedNotification.php
View file

@ -60,7 +60,7 @@ class QuoteCreatedNotification implements ShouldQueue
$methods = $this->findUserNotificationTypes($quote->invitations()->first(), $company_user, 'quote', ['all_notifications', 'quote_created', 'quote_created_all']);
/* If one of the methods is email then we fire the EntitySentMailer */
if (($key = array_search('mail', $methods))) {
if (($key = array_search('mail', $methods)) !== false) {
unset($methods[$key]);

1
tests/Feature/CompanyTest.php
View file

@ -100,7 +100,6 @@ class CompanyTest extends TestCase
$settings->invoice_design_id = '2';
$settings->quote_design_id = '1';
nlog($settings);
$company->settings = $settings;
$response = $this->withHeaders([