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

Working on email refactor

Browse Source
This commit is contained in:
David Bomba 2023-03-07 23:17:03 +11:00
parent 0d01f4b773
commit 9052a16b82
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/EmailController.php
View File

@ -130,11 +130,13 @@ class EmailController extends BaseController
]; ];
$mo = new EmailObject; $mo = new EmailObject;
$mo->subject = empty($subject) ? null : $subject; $mo->subject = strlen($subject) > 3 ? $subject : null;
$mo->body = empty($body) ? null : $body; $mo->body = strlen($body) > 3 ? $body : null;
$mo->entity_id = $request->input('entity_id'); $mo->entity_id = $request->input('entity_id');
$mo->template = $template; $mo->template = $template;
$mo->entity_class = $this->resolveClass($entity); $mo->entity_class = $this->resolveClass($entity);
$mo->email_template_body = "email_template_{$template}";
$mo->email_template_subject = "email_subject_{$template}";
if (Ninja::isHosted() && !$entity_obj->company->account->account_sms_verified) { if (Ninja::isHosted() && !$entity_obj->company->account->account_sms_verified) {
return response(['message' => 'Please verify your account to send emails.'], 400); return response(['message' => 'Please verify your account to send emails.'], 400);
@ -151,7 +153,7 @@ class EmailController extends BaseController
// EmailEntity::dispatch($invitation->fresh(), $invitation->company, $template, $data); // EmailEntity::dispatch($invitation->fresh(), $invitation->company, $template, $data);
$mo->invitation_id = $invitation->id; $mo->invitation_id = $invitation->id;
Email::dispatch($mo, $invitation->company); Email::dispatch($mo, $invitation->company);
// MailEntity::dispatch($invitation, $invitation->company->db, $mo); // MailEntity::dispatch($invitation, $invitation->company->db, $mo);
} }

14
app/Services/Email/Email.php
View File

@ -117,7 +117,7 @@ class Email implements ShouldQueue
$this->email_object->client_contact_id ? $this->email_object->contact = ClientContact::withTrashed()->find($this->email_object->client_contact_id) : null; $this->email_object->client_contact_id ? $this->email_object->contact = ClientContact::withTrashed()->find($this->email_object->client_contact_id) : null;
} }
$this->email_object->user_id ? $this->email_object->user = User::withTrashed()->find($this->email_object->user_id) : $this->email_object->user = $this->company->owner(); $this->email_object->user_id ? $this->email_object->user = User::withTrashed()->find($this->email_object->user_id) : $this->email_object->user = $this->company->owner();
$this->email_object->company_key = $this->company->company_key; $this->email_object->company_key = $this->company->company_key;
@ -139,12 +139,12 @@ class Email implements ShouldQueue
private function resolveVariables(): self private function resolveVariables(): self
{ {
match(get_class($this->email_object->entity)){ match(class_basename($this->email_object->entity)){
Invoice::class => $this->email_object->variables = (new HtmlEngine($this->email_object->invitation))->generateLabelsAndValues(), "Invoice" => $this->email_object->variables = (new HtmlEngine($this->email_object->invitation))->makeValues(),
Quote::class => $this->email_object->variables = (new HtmlEngine($this->email_object->invitation))->generateLabelsAndValues(), "Quote" => $this->email_object->variables = (new HtmlEngine($this->email_object->invitation))->makeValues(),
Credit::class => $this->email_object->variables = (new HtmlEngine($this->email_object->invitation))->generateLabelsAndValues(), "Credit" => $this->email_object->variables = (new HtmlEngine($this->email_object->invitation))->makeValues(),
PurchaseOrder::class => $this->email_object->variables = (new VendorHtmlEngine($this->email_object->invitation))->generateLabelsAndValues(), "PurchaseOrder" => $this->email_object->variables = (new VendorHtmlEngine($this->email_object->invitation))->makeValues(),
default => null default => $this->email_object->variables = []
}; };
return $this; return $this;

10
app/Services/Email/EmailDefaults.php
View File

@ -151,8 +151,8 @@ class EmailDefaults
{ {
if ($this->email->email_object->body) { if ($this->email->email_object->body) {
$this->email->email_object->body = $this->email->email_object->body; $this->email->email_object->body = $this->email->email_object->body;
} elseif (isset($this->email->email_object->email_template_body) && strlen($this->email->email_object->settings->{$this->email->email_object->email_template_body}) > 3) { } elseif (strlen($this->email->email_object->settings?->{$this->email->email_object->email_template_body}) > 3) {
$this->email->email_object->body = $this->email->email_object->settings->{$this->email->email_object->email_template_body}; $this->email->email_object->body = $this->email->email_object->settings?->{$this->email->email_object->email_template_body};
} else { } else {
$this->email->email_object->body = EmailTemplateDefaults::getDefaultTemplate($this->email->email_object->email_template_body, $this->locale); $this->email->email_object->body = EmailTemplateDefaults::getDefaultTemplate($this->email->email_object->email_template_body, $this->locale);
} }
@ -171,8 +171,8 @@ class EmailDefaults
{ {
if ($this->email->email_object->subject) { //where the user updates the subject from the UI if ($this->email->email_object->subject) { //where the user updates the subject from the UI
return $this; return $this;
} elseif (isset($this->email->email_object->email_template_subject) && strlen($this->email->email_object->settings->{$this->email->email_object->email_template_subject}) > 3) { } elseif (strlen($this->email->email_object?->settings->{$this->email->email_object->email_template_subject}) > 3) {
$this->email->email_object->subject = $this->email->email_object->settings->{$this->email->email_object->email_template_subject}; $this->email->email_object->subject = $this->email->email_object->settings?->{$this->email->email_object->email_template_subject};
} else { } else {
$this->email->email_object->subject = EmailTemplateDefaults::getDefaultTemplate($this->email->email_object->email_template_subject, $this->locale); $this->email->email_object->subject = EmailTemplateDefaults::getDefaultTemplate($this->email->email_object->email_template_subject, $this->locale);
} }
@ -207,7 +207,7 @@ class EmailDefaults
if ($this->template != 'custom') { if ($this->template != 'custom') {
$this->email->email_object->body = $this->parseMarkdownToHtml($this->email->email_object->body); $this->email->email_object->body = $this->parseMarkdownToHtml($this->email->email_object->body);
} }
nlog($this->email->email_object->subject);
return $this; return $this;
} }