mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-24 02:14:21 -04:00
Fixes for send_email bulk routes
This commit is contained in:
parent
44ec3fdd50
commit
9a3a1b92f6
@ -601,7 +601,18 @@ class CreditController extends BaseController
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'email':
|
case 'email':
|
||||||
// EmailCredit::dispatch($credit, $credit->company);
|
|
||||||
|
$credit->invitations->load('contact.client.country', 'credit.client.country', 'credit.company')->each(function ($invitation) use ($credit) {
|
||||||
|
EmailEntity::dispatch($invitation, $credit->company, 'credit');
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
if (! $bulk) {
|
||||||
|
return response()->json(['message'=>'email sent'], 200);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'send_email':
|
||||||
|
|
||||||
$credit->invitations->load('contact.client.country', 'credit.client.country', 'credit.company')->each(function ($invitation) use ($credit) {
|
$credit->invitations->load('contact.client.country', 'credit.client.country', 'credit.company')->each(function ($invitation) use ($credit) {
|
||||||
EmailEntity::dispatch($invitation, $credit->company, 'credit');
|
EmailEntity::dispatch($invitation, $credit->company, 'credit');
|
||||||
|
@ -745,13 +745,7 @@ class InvoiceController extends BaseController
|
|||||||
$this->itemResponse($invoice);
|
$this->itemResponse($invoice);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
// case 'reverse':
|
|
||||||
// $invoice = $invoice->service()->handleReversal()->deletePdf()->save();
|
|
||||||
|
|
||||||
// if (! $bulk) {
|
|
||||||
// $this->itemResponse($invoice);
|
|
||||||
// }
|
|
||||||
// break;
|
|
||||||
case 'email':
|
case 'email':
|
||||||
//check query parameter for email_type and set the template else use calculateTemplate
|
//check query parameter for email_type and set the template else use calculateTemplate
|
||||||
|
|
||||||
@ -769,6 +763,24 @@ class InvoiceController extends BaseController
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'send_email':
|
||||||
|
//check query parameter for email_type and set the template else use calculateTemplate
|
||||||
|
|
||||||
|
|
||||||
|
if (request()->has('email_type') && property_exists($invoice->company->settings, request()->input('email_type'))) {
|
||||||
|
$this->reminder_template = $invoice->client->getSetting(request()->input('email_type'));
|
||||||
|
} else {
|
||||||
|
$this->reminder_template = $invoice->calculateTemplate('invoice');
|
||||||
|
}
|
||||||
|
|
||||||
|
BulkInvoiceJob::dispatch($invoice, $this->reminder_template);
|
||||||
|
|
||||||
|
if (! $bulk) {
|
||||||
|
return response()->json(['message' => 'email sent'], 200);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return response()->json(['message' => ctrans('texts.action_unavailable', ['action' => $action])], 400);
|
return response()->json(['message' => ctrans('texts.action_unavailable', ['action' => $action])], 400);
|
||||||
break;
|
break;
|
||||||
|
@ -648,6 +648,15 @@ class PurchaseOrderController extends BaseController
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'send_email':
|
||||||
|
//check query parameter for email_type and set the template else use calculateTemplate
|
||||||
|
PurchaseOrderEmail::dispatch($purchase_order, $purchase_order->company);
|
||||||
|
|
||||||
|
if (! $bulk) {
|
||||||
|
return response()->json(['message' => 'email sent'], 200);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case 'add_to_inventory':
|
case 'add_to_inventory':
|
||||||
|
|
||||||
$purchase_order->service()->add_to_inventory();
|
$purchase_order->service()->add_to_inventory();
|
||||||
|
@ -722,6 +722,13 @@ class QuoteController extends BaseController
|
|||||||
|
|
||||||
return response()->json(['message'=> ctrans('texts.sent_message')], 200);
|
return response()->json(['message'=> ctrans('texts.sent_message')], 200);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'send_email':
|
||||||
|
$quote->service()->sendEmail();
|
||||||
|
|
||||||
|
return response()->json(['message'=> ctrans('texts.sent_message')], 200);
|
||||||
|
break;
|
||||||
|
|
||||||
case 'mark_sent':
|
case 'mark_sent':
|
||||||
$quote->service()->markSent()->save();
|
$quote->service()->markSent()->save();
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user