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

Uses queue when sending email through API

Browse source
This commit is contained in:
Hillel Coren 2017-10-24 11:16:00 +03:00
parent b110702487
commit 640d9323a2
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/Http/Controllers/InvoiceApiController.php
View file

@ -200,15 +200,13 @@ class InvoiceApiController extends BaseAPIController
if ($isEmailInvoice) {
if ($payment) {
app('App\Ninja\Mailers\ContactMailer')->sendPaymentConfirmation($payment);
//$this->dispatch(new SendPaymentEmail($payment));
$this->dispatch(new SendPaymentEmail($payment));
} else {
if ($invoice->is_recurring && $recurringInvoice = $this->invoiceRepo->createRecurringInvoice($invoice)) {
$invoice = $recurringInvoice;
}
$reminder = isset($data['email_type']) ? $data['email_type'] : false;
app('App\Ninja\Mailers\ContactMailer')->sendInvoice($invoice, $reminder);
//$this->dispatch(new SendInvoiceEmail($invoice));
$this->dispatch(new SendInvoiceEmail($invoice, auth()->user()->id, $reminder));
}
}
@ -335,11 +333,13 @@ class InvoiceApiController extends BaseAPIController
$invoice = $recurringInvoice;
}
//$this->dispatch(new SendInvoiceEmail($invoice));
$result = app('App\Ninja\Mailers\ContactMailer')->sendInvoice($invoice);
if ($result !== true) {
return $this->errorResponse($result, 500);
if (config('queue.default') !== 'sync') {
$this->dispatch(new SendInvoiceEmail($invoice, auth()->user()->id));
} else {
$result = app('App\Ninja\Mailers\ContactMailer')->sendInvoice($invoice);
if ($result !== true) {
return $this->errorResponse($result, 500);
}
}
$headers = Utils::getApiHeaders();