From 9ecff34cb48aa332fabde05099009d1ce2e09d92 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 19 Sep 2018 23:41:30 +0300 Subject: [PATCH] Remove email fix from master --- app/Models/Account.php | 2 +- app/Models/Traits/SendsEmails.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/Account.php b/app/Models/Account.php index b5642927f2..76d6f04411 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -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; } /** diff --git a/app/Models/Traits/SendsEmails.php b/app/Models/Traits/SendsEmails.php index 13e3d5cafd..617fd0e27a 100644 --- a/app/Models/Traits/SendsEmails.php +++ b/app/Models/Traits/SendsEmails.php @@ -64,7 +64,7 @@ trait SendsEmails $template = '
$client,

'; - 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 .= '
' . trans("texts.{$entityType}_message_button", ['amount' => '$amount']) . '

' . '
$viewButton

'; } else {