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

Changes for the mobile app

Browse Source
This commit is contained in:
Hillel Coren 2018-08-15 14:06:46 +03:00
parent baaaa12a9c
commit 87ad60b71f
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,10 +365,13 @@ class InvoiceApiController extends BaseAPIController
$invoice = $recurringInvoice; $invoice = $recurringInvoice;
} }
$reminder = request()->reminder;
$template = request()->template;
if (config('queue.default') !== 'sync') { if (config('queue.default') !== 'sync') {
$this->dispatch(new SendInvoiceEmail($invoice, auth()->user()->id)); $this->dispatch(new SendInvoiceEmail($invoice, auth()->user()->id, $reminder, $template));
} else { } else {
$result = app('App\Ninja\Mailers\ContactMailer')->sendInvoice($invoice); $result = app('App\Ninja\Mailers\ContactMailer')->sendInvoice($invoice, $reminder, $template);
if ($result !== true) { if ($result !== true) {
return $this->errorResponse($result, 500); return $this->errorResponse($result, 500);
} }

25
app/Ninja/Transformers/UserAccountTransformer.php
View File

@ -187,18 +187,19 @@ class UserAccountTransformer extends EntityTransformer
'custom_fields' => $account->custom_fields ?: '', 'custom_fields' => $account->custom_fields ?: '',
'invoice_fields' => $account->invoice_fields ?: '', 'invoice_fields' => $account->invoice_fields ?: '',
'custom_messages' => $account->custom_messages, 'custom_messages' => $account->custom_messages,
'email_subject_invoice' => $account->account_email_settings->email_subject_invoice, 'email_footer' => $account->getEmailFooter(),
'email_subject_quote' => $account->account_email_settings->email_subject_quote, 'email_subject_invoice' => $account->getEmailSubject(ENTITY_INVOICE),
'email_subject_payment' => $account->account_email_settings->email_subject_payment, 'email_subject_quote' => $account->getEmailSubject(ENTITY_QUOTE),
'email_template_invoice' => $account->account_email_settings->email_template_invoice, 'email_subject_payment' => $account->getEmailSubject(ENTITY_PAYMENT),
'email_template_quote' => $account->account_email_settings->email_template_quote, 'email_template_invoice' => $account->getEmailTemplate(ENTITY_INVOICE),
'email_template_payment' => $account->account_email_settings->email_template_payment, 'email_template_quote' => $account->getEmailTemplate(ENTITY_QUOTE),
'email_subject_reminder1' => $account->account_email_settings->email_subject_reminder1, 'email_template_payment' => $account->getEmailTemplate(ENTITY_PAYMENT),
'email_subject_reminder2' => $account->account_email_settings->email_subject_reminder2, 'email_subject_reminder1' => $account->getEmailSubject('reminder1'),
'email_subject_reminder3' => $account->account_email_settings->email_subject_reminder3, 'email_subject_reminder2' => $account->getEmailSubject('reminder2'),
'email_template_reminder1' => $account->account_email_settings->email_template_reminder1, 'email_subject_reminder3' => $account->getEmailSubject('reminder3'),
'email_template_reminder2' => $account->account_email_settings->email_template_reminder2, 'email_template_reminder1' => $account->getEmailTemplate('reminder1'),
'email_template_reminder3' => $account->account_email_settings->email_template_reminder3, 'email_template_reminder2' => $account->getEmailTemplate('reminder2'),
'email_template_reminder3' => $account->getEmailTemplate('reminder3'),
]; ];
} }
} }