Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for emails prior to attempting a send

This commit is contained in:
David Bomba 2024-11-17 21:58:56 +11:00
parent 9817158076
commit a089b7809f
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/Jobs/Invoice/BulkInvoiceJob.php
View File

@ -34,6 +34,8 @@ class BulkInvoiceJob implements ShouldQueue
public $timeout = 3600; public $timeout = 3600;
private bool $contact_has_email = false;
private array $templates = [ private array $templates = [
'email_template_invoice', 'email_template_invoice',
'email_template_quote', 'email_template_quote',
@ -80,27 +82,32 @@ class BulkInvoiceJob implements ShouldQueue
$template = $this->resolveTemplateString($this->reminder_template); $template = $this->resolveTemplateString($this->reminder_template);
$mo = new EmailObject(); if($invitation->contact->email)
$mo->entity_id = $invitation->invoice_id; {
$mo->template = $template; //full template name in use $this->contact_has_email = true;
$mo->email_template_body = $template;
$mo->email_template_subject = str_replace("template", "subject", $template);
$mo->entity_class = get_class($invitation->invoice); $mo = new EmailObject();
$mo->invitation_id = $invitation->id; $mo->entity_id = $invitation->invoice_id;
$mo->client_id = $invitation->contact->client_id ?? null; $mo->template = $template; //full template name in use
$mo->vendor_id = $invitation->contact->vendor_id ?? null; $mo->email_template_body = $template;
$mo->email_template_subject = str_replace("template", "subject", $template);
Email::dispatch($mo, $invitation->company->withoutRelations()); $mo->entity_class = get_class($invitation->invoice);
$mo->invitation_id = $invitation->id;
$mo->client_id = $invitation->contact->client_id ?? null;
$mo->vendor_id = $invitation->contact->vendor_id ?? null;
Email::dispatch($mo, $invitation->company->withoutRelations());
}
}); });
if ($invoice->invitations->count() >= 1) { if ($invoice->invitations->count() >= 1 && $this->contact_has_email) {
$invoice->entityEmailEvent($invoice->invitations->first(), 'invoice', $this->reminder_template); $invoice->entityEmailEvent($invoice->invitations->first(), 'invoice', $this->reminder_template);
$invoice->sendEvent(Webhook::EVENT_SENT_INVOICE, "client"); $invoice->sendEvent(Webhook::EVENT_SENT_INVOICE, "client");
} }
sleep(1); // this is needed to slow down the amount of data that is pushed into cache sleep(1); // this is needed to slow down the amount of data that is pushed into cache
$this->contact_has_email = false;
}); });
} }