Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 08:21:34 +02:00
Code Issues Releases Activity

Improve custom label replacements in emails

Browse Source
This commit is contained in:
David Bomba 2021-03-31 12:55:33 +11:00
parent 6747d02779
commit 89a271e59c
8 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Jobs/Payment/EmailPayment.php
View File

@ -77,8 +77,13 @@ class EmailPayment implements ShouldQueue
$email_builder = (new PaymentEmailEngine($this->payment, $this->contact))->build();
$invitation = null;
if($this->payment->invoices()->exists())
$invitation = $this->payment->invoices()->first()->invitations()->first();
$nmo = new NinjaMailerObject;
$nmo->mailable = new TemplateEmail($email_builder, $this->contact);
$nmo->mailable = new TemplateEmail($email_builder, $this->contact, $invitation);
$nmo->to_user = $this->contact;
$nmo->settings = $this->settings;
$nmo->company = $this->company;

3
app/Mail/Admin/AutoBillingFailureObject.php
View File

@ -12,6 +12,7 @@
namespace App\Mail\Admin;
use App\Models\Invoice;
use App\Utils\HtmlEngine;
use App\Utils\Number;
use App\Utils\Traits\MakesHash;
use stdClass;
@ -84,6 +85,8 @@ class AutoBillingFailureObject
private function getData()
{
$signature = $this->client->getSetting('email_signature');
$html_variables = (new HtmlEngine($this->invoices->first()->invitations->first()))->makeValues();
$signature = str_replace(array_keys($html_variables), array_values($html_variables), $signature);
$data = [
'title' => ctrans(

3
app/Mail/Admin/ClientPaymentFailureObject.php
View File

@ -12,6 +12,7 @@
namespace App\Mail\Admin;
use App\Models\Invoice;
use App\Utils\HtmlEngine;
use App\Utils\Number;
use App\Utils\Traits\MakesHash;
use stdClass;
@ -88,6 +89,8 @@ class ClientPaymentFailureObject
private function getData()
{
$signature = $this->client->getSetting('email_signature');
$html_variables = (new HtmlEngine($this->invoices->first()->invitations->first()))->makeValues();
$signature = str_replace(array_keys($html_variables), array_values($html_variables), $signature);
$data = [
'title' => ctrans(

7
app/Mail/Admin/EntityFailedSendObject.php
View File

@ -11,6 +11,7 @@
namespace App\Mail\Admin;
use App\Utils\HtmlEngine;
use App\Utils\Number;
use stdClass;
@ -121,6 +122,10 @@ class EntityFailedSendObject
private function getData()
{
$settings = $this->entity->client->getMergedSettings();
$signature = $settings->email_signature;
$html_variables = (new HtmlEngine($this->invitation)->makeValues();
$signature = str_replace(array_keys($html_variables), array_values($html_variables), $signature);
return [
'title' => $this->getSubject(),
@ -136,7 +141,7 @@ class EntityFailedSendObject
),
'url' => $this->invitation->getAdminLink(),
'button' => ctrans("texts.view_{$this->entity_type}"),
'signature' => $settings->email_signature,
'signature' => $signature,
'logo' => $this->company->present()->logo(),
'settings' => $settings,
'whitelabel' => $this->company->account->isPaid() ? true : false,

13
app/Mail/Admin/EntityPaidObject.php
View File

@ -11,6 +11,7 @@
namespace App\Mail\Admin;
use App\Mail\Engine\PaymentEmailEngine;
use App\Utils\Number;
use stdClass;
@ -62,6 +63,8 @@ class EntityPaidObject
{
$settings = $this->payment->client->getMergedSettings();
$signature = $this->generateSignature($settings);
$amount = Number::formatMoney($this->payment->amount, $this->payment->client);
$invoice_texts = ctrans('texts.invoice_number_short');
@ -85,7 +88,6 @@ class EntityPaidObject
]
),
'url' => config('ninja.app_url'),
// 'url' => config('ninja.app_url') . '/payments/' . $this->payment->hashed_id, //because we have no deep linking we cannot use this
'button' => ctrans('texts.view_payment'),
'signature' => $settings->email_signature,
'logo' => $this->company->present()->logo(),
@ -95,4 +97,13 @@ class EntityPaidObject
return $data;
}
private function generateSignature($settings)
{
$html_variables = (new PaymentEmailEngine($this->payment, $this->payment->client->primary_contact()->first()))->makeValues();
$signature = str_replace(array_keys($html_variables), array_values($html_variables), $settings->email_signature);
return $signature;
}
}

1
app/Mail/Engine/BaseEmailEngine.php
View File

@ -69,6 +69,7 @@ class BaseEmailEngine implements EngineInterface
{
if (! empty($this->variables)) {
$body = str_replace(array_keys($this->variables), array_values($this->variables), $body);
$body = str_replace(array_keys($this->variables), array_values($this->variables), $body);
}
$this->body = $body;

2
app/Mail/Engine/PaymentEmailEngine.php
View File

@ -76,7 +76,7 @@ class PaymentEmailEngine extends BaseEmailEngine
}
private function makePaymentVariables()
public function makePaymentVariables()
{
$data = [];

11
app/Mail/TemplateEmail.php
View File

@ -53,9 +53,14 @@ class TemplateEmail extends Mailable
$company = $this->client->company;
$html_variables = (new HtmlEngine($this->invitation))->makeValues();
if($this->invitation)
{
$html_variables = (new HtmlEngine($this->invitation))->makeValues();
$signature = str_replace(array_keys($html_variables), array_values($html_variables), $settings->email_signature);
}
else
$signature = $settings->email_signature;
//str_replace(array_keys($html_variables), array_values($html_variables), $settings->email_signature)
$this->from(config('mail.from.address'), $this->company->present()->name());
if (strlen($settings->bcc_email) > 1)
@ -75,7 +80,7 @@ class TemplateEmail extends Mailable
'view_link' => $this->build_email->getViewLink(),
'view_text' => $this->build_email->getViewText(),
'title' => '',
'signature' => str_replace(array_keys($html_variables), array_values($html_variables), $settings->email_signature),
'signature' => $signature,
'settings' => $settings,
'company' => $company,
'whitelabel' => $this->client->user->account->isPaid() ? true : false,