From c48b02a69068d3dce521dddc4fc4df5bde2d8a65 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 9 Oct 2020 13:28:33 +1100
Subject: [PATCH] Static template data

---
 app/DataMapper/EmailTemplateDefaults.php |  6 +--
 app/Http/Middleware/StartupCheck.php     | 50 +++++++++++++++++++-----
 app/Utils/Statics.php                    |  3 ++
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/app/DataMapper/EmailTemplateDefaults.php b/app/DataMapper/EmailTemplateDefaults.php
index 6302fdfd9fdb..a8423105aafc 100644
--- a/app/DataMapper/EmailTemplateDefaults.php
+++ b/app/DataMapper/EmailTemplateDefaults.php
@@ -201,17 +201,17 @@ class EmailTemplateDefaults
 
     public static function emailReminderEndlessTemplate()
     {
-        return Parsedown::instance()->line('Endless Email Reminder Text');
+        return ctrans('Endless Email Reminder Text');
     }
 
     public static function emailStatementSubject()
     {
-        return Parsedown::instance()->line('Statement Subject needs texts record!');
+        return ctrans('Statement Subject needs texts record!');
     }
 
     public static function emailStatementTemplate()
     {
-        return Parsedown::instance()->line('Statement Templates needs texts record!');
+        return ctrans('Statement Templates needs texts record!');
     }
 
     private static function transformText($string)
diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php
index cc3e89247591..78b93c87f942 100644
--- a/app/Http/Middleware/StartupCheck.php
+++ b/app/Http/Middleware/StartupCheck.php
@@ -11,6 +11,7 @@
 
 namespace App\Http\Middleware;
 
+use App\DataMapper\EmailTemplateDefaults;
 use App\Models\Account;
 use App\Models\Language;
 use App\Utils\CurlUtils;
@@ -67,11 +68,8 @@ class StartupCheck
 
 
         /*Build template cache*/
-        $name = 'templates';
-
-        if ($request->has('clear_cache') || ! Cache::has($name)) {
-
-        }
+        if ($request->has('clear_cache') || ! Cache::has('templates')) 
+            $this->buildTemplates();
 
         $response = $next($request);
 
@@ -79,13 +77,45 @@ class StartupCheck
     }
 
 
-    private function buildTemplates()
+    private function buildTemplates($name = 'templates')
     {
-        $data = [];
+        $data = [
 
-        $data['invoice'][
+        'invoice' => [
             'subject' => EmailTemplateDefaults::emailInvoiceSubject(),
-            'body' => EmailTemplateDefaults::emailInvoiceTemplate),
-        ]
+            'body' => EmailTemplateDefaults::emailInvoiceTemplate(),
+            ],
+        
+        'quote' => [
+            'subject' => EmailTemplateDefaults::emailQuoteSubject(),
+            'body' => EmailTemplateDefaults::emailQuoteTemplate(),
+            ],
+        'payment' => [
+            'subject' => EmailTemplateDefaults::emailPaymentSubject(),
+            'body' => EmailTemplateDefaults::emailPaymentTemplate(),
+            ],
+        'reminder1' => [
+            'subject' => EmailTemplateDefaults::emailReminder1Subject(),
+            'body' => EmailTemplateDefaults::emailReminder1Template(),
+            ],
+        'reminder2' => [
+            'subject' => EmailTemplateDefaults::emailReminder2Subject(),
+            'body' => EmailTemplateDefaults::emailReminder2Template(),
+            ],
+        'reminder3' => [
+            'subject' => EmailTemplateDefaults::emailReminder3Subject(),
+            'body' => EmailTemplateDefaults::emailReminder3Template(),
+            ],
+        'reminder_endless' => [
+            'subject' => EmailTemplateDefaults::emailReminderEndlessSubject(),
+            'body' => EmailTemplateDefaults::emailReminderEndlessTemplate(),
+            ],
+        'statement' => [
+            'subject' => EmailTemplateDefaults::emailStatementSubject(),
+            'body' => EmailTemplateDefaults::emailStatementTemplate(),
+            ],
+        ];
+
+        Cache::forever($name, $data);
     }
 }
diff --git a/app/Utils/Statics.php b/app/Utils/Statics.php
index 9f78e42a16be..890d84af849e 100644
--- a/app/Utils/Statics.php
+++ b/app/Utils/Statics.php
@@ -104,6 +104,9 @@ class Statics
             })->sortBy(function ($currency) {
                 return $currency->name;
             })->values();
+
+            $data['templates'] = Cache::get('templates');
+            
         }
 
         return $data;