Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 23:37:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixes for payment notifications

Browse Source
This commit is contained in:
David Bomba 2020-10-29 15:47:44 +11:00
parent bc688985e1
commit c21ad042ce
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,11 +53,11 @@ class EntityPaidMailer extends BaseMailerJob implements ShouldQueue
* @param $user
* @param $company
*/
public function __construct($payment, $user, $company)
public function __construct($payment, $company)
{
$this->company = $company;
$this->user = $user;
$this->user = $payment->user;
$this->payment = $payment;
@ -82,6 +82,8 @@ class EntityPaidMailer extends BaseMailerJob implements ShouldQueue
//if we need to set an email driver do it now
$this->setMailDriver();
try {
$mail_obj = (new EntityPaidObject($this->payment))->build();
$mail_obj->from = [$this->payment->user->email, $this->payment->user->present()->name()];
@ -89,9 +91,16 @@ class EntityPaidMailer extends BaseMailerJob implements ShouldQueue
Mail::to($this->user->email)
->send(new EntityNotificationMailer($mail_obj));
//catch errors
if (count(Mail::failures()) > 0) {
return $this->logMailError(Mail::failures(), $this->payment->client);
} catch (Swift_TransportException $e) {
$this->failed($e->getMessage());
//$this->entityEmailFailed($e->getMessage());
}
if (count(Mail::failures()) > 0) {
$this->logMailError(Mail::failures(), $this->entity->client);
} else {
// $this->entityEmailSucceeded();
}
}
}

6
app/Listeners/Payment/PaymentNotification.php
View File

@ -62,11 +62,8 @@ class PaymentNotification implements ShouldQueue
if (($key = array_search('mail', $methods)) !== false) {
unset($methods[$key]);
//Fire mail notification here!!!
//This allows us better control of how we
//handle the mailer
EntityPaidMailer::dispatch($payment, $payment->company);
EntityPaidMailer::dispatch($payment, $user, $payment->company);
}
$notification = new NewPaymentNotification($payment, $payment->company);
@ -84,7 +81,6 @@ class PaymentNotification implements ShouldQueue
}
/*Google Analytics Track Revenue*/
if (isset($payment->company->google_analytics_key)) {
$this->trackRevenue($event);
}