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

Fix for failed() method returning an error instead of exception

Browse Source
This commit is contained in:
David Bomba 2021-01-21 10:02:39 +11:00
parent 62bc55cf0b
commit 7d5b679214
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Invoice/ZipInvoices.php
View File

@ -96,7 +96,7 @@ class ZipInvoices extends BaseMailerJob implements ShouldQueue
Mail::to($this->email)
->send(new DownloadInvoices(Storage::disk(config('filesystems.default'))->url($path.$file_name), $this->company));
} catch (\Exception $e) {
$this->failed($e);
// //$this->failed($e);
}
UnlinkFile::dispatch(config('filesystems.default'), $path.$file_name)->delay(now()->addHours(1));

2
app/Jobs/Mail/EntityFailedSendMailer.php
View File

@ -96,7 +96,7 @@ class EntityFailedSendMailer extends BaseMailerJob implements ShouldQueue
->send(new EntityNotificationMailer($mail_obj));
} catch (\Exception $e) {
nlog("failing in EntityFailedSendMailer");
$this->failed($e);
//$this->failed($e);
$this->logMailError($e->getMessage(), $this->entity->client);
}
}

2
app/Jobs/Mail/EntityPaidMailer.php
View File

@ -83,7 +83,7 @@ class EntityPaidMailer extends BaseMailerJob implements ShouldQueue
Mail::to($this->user->email)
->send(new EntityNotificationMailer($mail_obj));
} catch (\Exception $e) {
$this->failed($e);
// //$this->failed($e);
$this->logMailError($e->getMessage(), $this->payment->client);
}
}

2
app/Jobs/Mail/EntitySentMailer.php
View File

@ -90,7 +90,7 @@ class EntitySentMailer extends BaseMailerJob implements ShouldQueue
Mail::to($this->user->email)
->send(new EntityNotificationMailer($mail_obj));
} catch (\Exception $e) {
$this->failed($e);
// //$this->failed($e);
$this->logMailError($e->getMessage(), $this->entity->client);
}
}

2
app/Jobs/Mail/EntityViewedMailer.php
View File

@ -88,7 +88,7 @@ class EntityViewedMailer extends BaseMailerJob implements ShouldQueue
Mail::to($this->user->email)
->send(new EntityNotificationMailer($mail_obj));
} catch (\Exception $e) {
$this->failed($e);
//$this->failed($e);
$this->logMailError($e->getMessage(), $this->entity->client);
}
}

2
app/Jobs/Mail/MailRouter.php
View File

@ -73,7 +73,7 @@ class MailRouter extends BaseMailerJob implements ShouldQueue
Mail::to($this->to_user->email)
->send($this->mailable);
} catch (\Exception $e) {
$this->failed($e);
//$this->failed($e);
if ($this->to_user instanceof ClientContact) {
$this->logMailError($e->getMessage(), $this->to_user->client);

2
app/Jobs/Mail/PaymentFailureMailer.php
View File

@ -98,7 +98,7 @@ class PaymentFailureMailer extends BaseMailerJob implements ShouldQueue
Mail::to($company_user->user->email)
->send(new EntityNotificationMailer($mail_obj));
} catch (\Exception $e) {
$this->failed($e);
//$this->failed($e);
$this->logMailError($e->getMessage(), $this->client);
}
}

2
app/Jobs/Payment/EmailPayment.php
View File

@ -84,7 +84,7 @@ class EmailPayment extends BaseMailerJob implements ShouldQueue
} catch (\Exception $e) {
nlog("mailing failed with message " . $e->getMessage());
event(new PaymentWasEmailedAndFailed($this->payment, $this->company, Mail::failures(), Ninja::eventVars()));
$this->failed($e);
//$this->failed($e);
return $this->logMailError($e->getMessage(), $this->payment->client);
}

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

@ -79,7 +79,7 @@ class UserEmailChanged extends BaseMailerJob implements ShouldQueue
Mail::to($this->new_email)
->send(new UserNotificationMailer($mail_obj));
} catch (\Exception $e) {
$this->failed($e);
//$this->failed($e);
$this->logMailError($e->getMessage(), $this->company->owner());
}
}