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

Fix email bug

Browse Source
This commit is contained in:
Hillel Coren 2018-09-19 23:16:29 +03:00
parent 7ad72aa884
commit 211b01406e
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Account.php
View File

@ -1580,7 +1580,7 @@ class Account extends Eloquent
*/ */
public function getEmailDesignId() public function getEmailDesignId()
{ {
return $this->hasFeature(FEATURE_CUSTOM_EMAILS) ? $this->email_design_id : EMAIL_DESIGN_PLAIN; return $this->hasFeature(FEATURE_CUSTOM_EMAILS) ? $this->account_email_settings->email_design_id : EMAIL_DESIGN_PLAIN;
} }
/** /**

2
app/Models/Traits/SendsEmails.php
View File

@ -64,7 +64,7 @@ trait SendsEmails
$template = '<div>$client,</div><br />'; $template = '<div>$client,</div><br />';
if ($this->hasFeature(FEATURE_CUSTOM_EMAILS) && $this->email_design_id != EMAIL_DESIGN_PLAIN) { if ($this->hasFeature(FEATURE_CUSTOM_EMAILS) && $this->account_email_settings->email_design_id != EMAIL_DESIGN_PLAIN) {
$template .= '<div>' . trans("texts.{$entityType}_message_button", ['amount' => '$amount']) . '</div><br />' . $template .= '<div>' . trans("texts.{$entityType}_message_button", ['amount' => '$amount']) . '</div><br />' .
'<div style="text-align:center;">$viewButton</div><br />'; '<div style="text-align:center;">$viewButton</div><br />';
} else { } else {

1
app/Ninja/Transformers/AccountTransformer.php
View File

@ -215,7 +215,6 @@ class AccountTransformer extends EntityTransformer
'invoice_number_pattern' => $account->invoice_number_pattern, 'invoice_number_pattern' => $account->invoice_number_pattern,
'quote_number_pattern' => $account->quote_number_pattern, 'quote_number_pattern' => $account->quote_number_pattern,
'quote_terms' => $account->quote_terms, 'quote_terms' => $account->quote_terms,
'email_design_id' => $account->email_design_id,
'enable_email_markup' => (bool) $account->enable_email_markup, 'enable_email_markup' => (bool) $account->enable_email_markup,
'website' => $account->website, 'website' => $account->website,
'direction_reminder1' => (int) $account->direction_reminder1, 'direction_reminder1' => (int) $account->direction_reminder1,