tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove email fix from master

Browse source
This commit is contained in:
Hillel Coren 2018-09-19 23:41:30 +03:00
parent 211b01406e
commit 9ecff34cb4
2 changed files with 2 additions and 2 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()
{
return $this->hasFeature(FEATURE_CUSTOM_EMAILS) ? $this->account_email_settings->email_design_id : EMAIL_DESIGN_PLAIN;
return $this->hasFeature(FEATURE_CUSTOM_EMAILS) ? $this->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 />';
if ($this->hasFeature(FEATURE_CUSTOM_EMAILS) && $this->account_email_settings->email_design_id != EMAIL_DESIGN_PLAIN) {
if ($this->hasFeature(FEATURE_CUSTOM_EMAILS) && $this->email_design_id != EMAIL_DESIGN_PLAIN) {
$template .= '<div>' . trans("texts.{$entityType}_message_button", ['amount' => '$amount']) . '</div><br />' .
'<div style="text-align:center;">$viewButton</div><br />';
} else {