From 8ae95c90ba6552d456682f7678924b06c53bff5b Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 20 Apr 2017 13:11:42 +0300
Subject: [PATCH] Changed  to

---
 app/Models/Traits/SendsEmails.php                          | 2 +-
 app/Services/TemplateService.php                           | 1 +
 resources/views/accounts/templates_and_reminders.blade.php | 2 +-
 resources/views/partials/email_templates.blade.php         | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Models/Traits/SendsEmails.php b/app/Models/Traits/SendsEmails.php
index ecd7cd323e18..2e5ecc11e98b 100644
--- a/app/Models/Traits/SendsEmails.php
+++ b/app/Models/Traits/SendsEmails.php
@@ -69,7 +69,7 @@ trait SendsEmails
             $template .= "$message<p/>";
         }
 
-        return $template . '$footer';
+        return $template . '$emailSignature';
     }
 
     /**
diff --git a/app/Services/TemplateService.php b/app/Services/TemplateService.php
index ce7bf983eed2..5df95d2d24c6 100644
--- a/app/Services/TemplateService.php
+++ b/app/Services/TemplateService.php
@@ -47,6 +47,7 @@ class TemplateService
 
         $variables = [
             '$footer' => $account->getEmailFooter(),
+            '$emailSignature' => $account->getEmailFooter(),
             '$client' => $client->getDisplayName(),
             '$account' => $account->getDisplayName(),
             '$dueDate' => $account->formatDate($invoice->due_date),
diff --git a/resources/views/accounts/templates_and_reminders.blade.php b/resources/views/accounts/templates_and_reminders.blade.php
index f6d16aca5ab9..ea94c9427cf9 100644
--- a/resources/views/accounts/templates_and_reminders.blade.php
+++ b/resources/views/accounts/templates_and_reminders.blade.php
@@ -146,7 +146,6 @@
                     <p>{{ trans('texts.template_help_1') }}</p>
                     <ul>
                         @foreach([
-                            'footer',
                             'account',
                             'dueDate',
                             'invoiceDate',
@@ -156,6 +155,7 @@
                             'firstName',
                             'invoice',
                             'quote',
+                            'emailSignature',
                             'password',
                             'documents',
                             'viewLink',
diff --git a/resources/views/partials/email_templates.blade.php b/resources/views/partials/email_templates.blade.php
index ac9da3985485..55daf4122d53 100644
--- a/resources/views/partials/email_templates.blade.php
+++ b/resources/views/partials/email_templates.blade.php
@@ -15,6 +15,7 @@
 
         var keys = {
             'footer': {!! json_encode($account->getEmailFooter()) !!},
+            'emailSignature': {!! json_encode($account->getEmailFooter()) !!},
             'account': "{{ $account->getDisplayName() }}",
             'dueDate': "{{ $account->formatDate($account->getDateTime()) }}",
             'invoiceDate': "{{ $account->formatDate($account->getDateTime()) }}",