mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-09 20:52:56 +01:00
Roll back notification queue changes
This commit is contained in:
parent
03367d1b60
commit
ae357efaeb
@ -1,20 +1,46 @@
|
||||
<?php namespace App\Listeners;
|
||||
|
||||
use App\Ninja\Mailers\UserMailer;
|
||||
use App\Ninja\Mailers\ContactMailer;
|
||||
use App\Events\InvoiceWasEmailed;
|
||||
use App\Events\QuoteWasEmailed;
|
||||
use App\Events\InvoiceInvitationWasViewed;
|
||||
use App\Events\QuoteInvitationWasViewed;
|
||||
use App\Events\QuoteInvitationWasApproved;
|
||||
use App\Events\PaymentWasCreated;
|
||||
use App\Jobs\SendPaymentEmail;
|
||||
use App\Jobs\SendNotificationEmail;
|
||||
use App\Jobs\SendPushNotification;
|
||||
use App\Services\PushService;
|
||||
|
||||
/**
|
||||
* Class NotificationListener
|
||||
*/
|
||||
class NotificationListener
|
||||
{
|
||||
/**
|
||||
* @var UserMailer
|
||||
*/
|
||||
protected $userMailer;
|
||||
/**
|
||||
* @var ContactMailer
|
||||
*/
|
||||
protected $contactMailer;
|
||||
/**
|
||||
* @var PushService
|
||||
*/
|
||||
protected $pushService;
|
||||
|
||||
/**
|
||||
* NotificationListener constructor.
|
||||
* @param UserMailer $userMailer
|
||||
* @param ContactMailer $contactMailer
|
||||
* @param PushService $pushService
|
||||
*/
|
||||
public function __construct(UserMailer $userMailer, ContactMailer $contactMailer, PushService $pushService)
|
||||
{
|
||||
$this->userMailer = $userMailer;
|
||||
$this->contactMailer = $contactMailer;
|
||||
$this->pushService = $pushService;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $invoice
|
||||
* @param $type
|
||||
@ -37,7 +63,7 @@ class NotificationListener
|
||||
public function emailedInvoice(InvoiceWasEmailed $event)
|
||||
{
|
||||
$this->sendEmails($event->invoice, 'sent', null, $event->notes);
|
||||
dispatch(new SendPushNotification($event->invoice, 'sent'));
|
||||
$this->pushService->sendNotification($event->invoice, 'sent');
|
||||
}
|
||||
|
||||
/**
|
||||
@ -46,7 +72,7 @@ class NotificationListener
|
||||
public function emailedQuote(QuoteWasEmailed $event)
|
||||
{
|
||||
$this->sendEmails($event->quote, 'sent', null, $event->notes);
|
||||
dispatch(new SendPushNotification($event->quote, 'sent'));
|
||||
$this->pushService->sendNotification($event->quote, 'sent');
|
||||
}
|
||||
|
||||
/**
|
||||
@ -59,7 +85,7 @@ class NotificationListener
|
||||
}
|
||||
|
||||
$this->sendEmails($event->invoice, 'viewed');
|
||||
dispatch(new SendPushNotification($event->invoice, 'viewed'));
|
||||
$this->pushService->sendNotification($event->invoice, 'viewed');
|
||||
}
|
||||
|
||||
/**
|
||||
@ -72,7 +98,7 @@ class NotificationListener
|
||||
}
|
||||
|
||||
$this->sendEmails($event->quote, 'viewed');
|
||||
dispatch(new SendPushNotification($event->quote, 'viewed'));
|
||||
$this->pushService->sendNotification($event->quote, 'viewed');
|
||||
}
|
||||
|
||||
/**
|
||||
@ -81,7 +107,7 @@ class NotificationListener
|
||||
public function approvedQuote(QuoteInvitationWasApproved $event)
|
||||
{
|
||||
$this->sendEmails($event->quote, 'approved');
|
||||
dispatch(new SendPushNotification($event->quote, 'approved'));
|
||||
$this->pushService->sendNotification($event->quote, 'approved');
|
||||
}
|
||||
|
||||
/**
|
||||
@ -94,9 +120,10 @@ class NotificationListener
|
||||
return;
|
||||
}
|
||||
|
||||
$this->contactMailer->sendPaymentConfirmation($event->payment);
|
||||
$this->sendEmails($event->payment->invoice, 'paid', $event->payment);
|
||||
dispatch(new SendPaymentEmail($event->payment));
|
||||
dispatch(new SendPushNotification($event->payment->invoice, 'paid'));
|
||||
|
||||
$this->pushService->sendNotification($event->payment->invoice, 'paid');
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user