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

Include reminder number in email notification subject

Browse Source
This commit is contained in:
Hillel Coren 2017-04-16 10:06:42 +03:00
parent 81764778d0
commit 93dad4be94
6 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Events/InvoiceWasEmailed.php
View File

@ -17,13 +17,19 @@ class InvoiceWasEmailed extends Event
*/ */
public $invoice; public $invoice;
/**
* @var string
*/
public $notes;
/** /**
* Create a new event instance. * Create a new event instance.
* *
* @param Invoice $invoice * @param Invoice $invoice
*/ */
public function __construct(Invoice $invoice) public function __construct(Invoice $invoice, $notes)
{ {
$this->invoice = $invoice; $this->invoice = $invoice;
$this->notes = $notes;
} }
} }

8
app/Events/QuoteWasEmailed.php
View File

@ -12,13 +12,19 @@ class QuoteWasEmailed extends Event
use SerializesModels; use SerializesModels;
public $quote; public $quote;
/**
* @var string
*/
public $notes;
/** /**
* Create a new event instance. * Create a new event instance.
* *
* @param $quote * @param $quote
*/ */
public function __construct($quote) public function __construct($quote, $notes)
{ {
$this->quote = $quote; $this->quote = $quote;
$this->notes = $notes;
} }
} }

10
app/Jobs/SendNotificationEmail.php
View File

@ -35,6 +35,11 @@ class SendNotificationEmail extends Job implements ShouldQueue
*/ */
protected $payment; protected $payment;
/**
* @var string
*/
protected $notes;
/** /**
* Create a new job instance. * Create a new job instance.
@ -46,12 +51,13 @@ class SendNotificationEmail extends Job implements ShouldQueue
* @param mixed $type * @param mixed $type
* @param mixed $payment * @param mixed $payment
*/ */
public function __construct($user, $invoice, $type, $payment) public function __construct($user, $invoice, $type, $payment, $notes)
{ {
$this->user = $user; $this->user = $user;
$this->invoice = $invoice; $this->invoice = $invoice;
$this->type = $type; $this->type = $type;
$this->payment = $payment; $this->payment = $payment;
$this->notes = $notes;
} }
/** /**
@ -61,6 +67,6 @@ class SendNotificationEmail extends Job implements ShouldQueue
*/ */
public function handle(UserMailer $userMailer) public function handle(UserMailer $userMailer)
{ {
$userMailer->sendNotification($this->user, $this->invoice, $this->type, $this->payment); $userMailer->sendNotification($this->user, $this->invoice, $this->type, $this->payment, $this->notes);
} }
} }

8
app/Listeners/NotificationListener.php
View File

@ -20,13 +20,13 @@ class NotificationListener
* @param $type * @param $type
* @param null $payment * @param null $payment
*/ */
private function sendEmails($invoice, $type, $payment = null) private function sendEmails($invoice, $type, $payment = null, $notes = false)
{ {
foreach ($invoice->account->users as $user) foreach ($invoice->account->users as $user)
{ {
if ($user->{"notify_{$type}"}) if ($user->{"notify_{$type}"})
{ {
dispatch(new SendNotificationEmail($user, $invoice, $type, $payment)); dispatch(new SendNotificationEmail($user, $invoice, $type, $payment, $notes));
} }
} }
} }
@ -36,7 +36,7 @@ class NotificationListener
*/ */
public function emailedInvoice(InvoiceWasEmailed $event) public function emailedInvoice(InvoiceWasEmailed $event)
{ {
$this->sendEmails($event->invoice, 'sent'); $this->sendEmails($event->invoice, 'sent', null, $event->notes);
dispatch(new SendPushNotification($event->invoice, 'sent')); dispatch(new SendPushNotification($event->invoice, 'sent'));
} }
@ -45,7 +45,7 @@ class NotificationListener
*/ */
public function emailedQuote(QuoteWasEmailed $event) public function emailedQuote(QuoteWasEmailed $event)
{ {
$this->sendEmails($event->quote, 'sent'); $this->sendEmails($event->quote, 'sent', null, $event->notes);
dispatch(new SendPushNotification($event->quote, 'sent')); dispatch(new SendPushNotification($event->quote, 'sent'));
} }

4
app/Ninja/Mailers/ContactMailer.php
View File

@ -105,9 +105,9 @@ class ContactMailer extends Mailer
if ($sent === true) { if ($sent === true) {
if ($invoice->isType(INVOICE_TYPE_QUOTE)) { if ($invoice->isType(INVOICE_TYPE_QUOTE)) {
event(new QuoteWasEmailed($invoice)); event(new QuoteWasEmailed($invoice, $reminder));
} else { } else {
event(new InvoiceWasEmailed($invoice)); event(new InvoiceWasEmailed($invoice, $reminder));
} }
} }

7
app/Ninja/Mailers/UserMailer.php
View File

@ -48,7 +48,8 @@ class UserMailer extends Mailer
User $user, User $user,
Invoice $invoice, Invoice $invoice,
$notificationType, $notificationType,
Payment $payment = null Payment $payment = null,
$notes = false
) { ) {
if (! $user->email || $user->cannot('view', $invoice)) { if (! $user->email || $user->cannot('view', $invoice)) {
return; return;
@ -81,6 +82,10 @@ class UserMailer extends Mailer
'client' => $client->getDisplayName(), 'client' => $client->getDisplayName(),
]); ]);
if ($notes) {
$subject .= ' [' . trans('texts.notes_' . $notes) . ']';
}
$this->sendTo($user->email, CONTACT_EMAIL, CONTACT_NAME, $subject, $view, $data); $this->sendTo($user->email, CONTACT_EMAIL, CONTACT_NAME, $subject, $view, $data);
} }