Merge pull request #4712 from turbo124/v5-stable

V5.0.49

.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

VERSION.txt

@@ -1 +1 @@
-5.0.48
+5.0.49

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;

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),