From 7907eae103cfc7b752a133d5618e3f589416565f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 19 Jan 2021 11:46:00 +1100
Subject: [PATCH 1/3] raw subject and raw body

---
 app/Utils/TemplateEngine.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index 898a304465..81a3c936f4 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -44,6 +44,10 @@ class TemplateEngine
 
     private $settings;
 
+    private $raw_body;
+
+    private $raw_subject;
+
     public function __construct($body, $subject, $entity, $entity_id, $template)
     {
         $this->body = $body;
@@ -121,6 +125,9 @@ class TemplateEngine
 
     private function replaceValues()
     {
+        $this->raw_body = $this->body;
+        $this->raw_subject  = $this->subject;
+
         if ($this->entity_obj) {
             $this->entityValues($this->entity_obj->client->primary_contact()->first());
         } else {
@@ -157,6 +164,7 @@ class TemplateEngine
         $this->body = strtr($this->body, $data['values']);
         $this->body = str_replace("\n", "<br>", $this->body);
 
+
         $this->subject = strtr($this->subject, $data['labels']);
         $this->subject = strtr($this->subject, $data['values']);
 
@@ -197,9 +205,10 @@ class TemplateEngine
             'subject' => $this->subject,
             'body' => $this->body,
             'wrapper' => $wrapper,
+            'raw_body' => $this->raw_body,
+            'raw_subject' => $this->raw_subject
         ];
-
-
+        
         $this->tearDown();
 
         return $data;

From 47dedaf96eb90b18c96f775ba0ac7e0a8ace1205 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 19 Jan 2021 15:14:45 +1100
Subject: [PATCH 2/3] fix for release

---
 .github/workflows/release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9e08efd48a..7b89c436d4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -37,6 +37,7 @@ jobs:
           php artisan storage:link
           sudo php artisan cache:clear
           sudo find ./ -type f -exec chmod 644 {} \;
+          sudo find ./vendor/bin/ -type f -exec chmod +x {} \;
           sudo find ./ -type d -exec chmod 755 {} \;
           
       - name: Prepare JS/CSS assets

From 46fb0ec9ae8ea33fa056da5d9865f0495c07ac9f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 19 Jan 2021 17:01:54 +1100
Subject: [PATCH 3/3] V5.0.49

---
 VERSION.txt      | 2 +-
 config/ninja.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index d7979b95c5..af0ed60a33 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.0.48
\ No newline at end of file
+5.0.49
\ No newline at end of file
diff --git a/config/ninja.php b/config/ninja.php
index 0165417e6f..480d996a64 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -13,7 +13,7 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', ''),
-    'app_version' => '5.0.48',
+    'app_version' => '5.0.49',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),