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

Use email queues in API

Browse Source
This commit is contained in:
Hillel Coren 2017-01-11 19:37:42 +02:00
parent 91a4ce1f37
commit 029353ff47
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/InvoiceApiController.php
View File

@ -12,12 +12,13 @@ use App\Models\Product;
use App\Ninja\Repositories\ClientRepository; use App\Ninja\Repositories\ClientRepository;
use App\Ninja\Repositories\PaymentRepository; use App\Ninja\Repositories\PaymentRepository;
use App\Ninja\Repositories\InvoiceRepository; use App\Ninja\Repositories\InvoiceRepository;
use App\Ninja\Mailers\ContactMailer as Mailer;
use App\Http\Requests\InvoiceRequest; use App\Http\Requests\InvoiceRequest;
use App\Http\Requests\CreateInvoiceAPIRequest; use App\Http\Requests\CreateInvoiceAPIRequest;
use App\Http\Requests\UpdateInvoiceAPIRequest; use App\Http\Requests\UpdateInvoiceAPIRequest;
use App\Services\InvoiceService; use App\Services\InvoiceService;
use App\Services\PaymentService; use App\Services\PaymentService;
use App\Jobs\SendInvoiceEmail;
use App\Jobs\SendPaymentEmail;
class InvoiceApiController extends BaseAPIController class InvoiceApiController extends BaseAPIController
{ {
@ -25,7 +26,7 @@ class InvoiceApiController extends BaseAPIController
protected $entityType = ENTITY_INVOICE; protected $entityType = ENTITY_INVOICE;
public function __construct(InvoiceService $invoiceService, InvoiceRepository $invoiceRepo, ClientRepository $clientRepo, PaymentRepository $paymentRepo, Mailer $mailer, PaymentService $paymentService) public function __construct(InvoiceService $invoiceService, InvoiceRepository $invoiceRepo, ClientRepository $clientRepo, PaymentRepository $paymentRepo, PaymentService $paymentService)
{ {
parent::__construct(); parent::__construct();
@ -33,7 +34,6 @@ class InvoiceApiController extends BaseAPIController
$this->clientRepo = $clientRepo; $this->clientRepo = $clientRepo;
$this->paymentRepo = $paymentRepo; $this->paymentRepo = $paymentRepo;
$this->invoiceService = $invoiceService; $this->invoiceService = $invoiceService;
$this->mailer = $mailer;
$this->paymentService = $paymentService; $this->paymentService = $paymentService;
} }
@ -185,9 +185,9 @@ class InvoiceApiController extends BaseAPIController
if ($isEmailInvoice) { if ($isEmailInvoice) {
if ($payment) { if ($payment) {
$this->mailer->sendPaymentConfirmation($payment); $this->dispatch(new SendPaymentEmail($payment));
} elseif ( ! $invoice->is_recurring) { } elseif ( ! $invoice->is_recurring) {
$this->mailer->sendInvoice($invoice); $this->dispatch(new SendInvoiceEmail($invoice));
} }
} }
@ -293,7 +293,7 @@ class InvoiceApiController extends BaseAPIController
{ {
$invoice = $request->entity(); $invoice = $request->entity();
$this->mailer->sendInvoice($invoice); $this->dispatch(new SendInvoiceEmail($invoice));
$response = json_encode(RESULT_SUCCESS, JSON_PRETTY_PRINT); $response = json_encode(RESULT_SUCCESS, JSON_PRETTY_PRINT);
$headers = Utils::getApiHeaders(); $headers = Utils::getApiHeaders();