From 76446c940295011e3b3544327ca9e00bd2584ae4 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 21 Sep 2023 20:44:16 +1000
Subject: [PATCH 1/2] Fixes for encoded entities

---
 app/Models/Design.php              | 2 +-
 app/Services/PdfMaker/PdfMaker.php | 6 +++++-
 composer.json                      | 2 +-
 composer.lock                      | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Models/Design.php b/app/Models/Design.php
index 1b0bf79a8347..32c677357464 100644
--- a/app/Models/Design.php
+++ b/app/Models/Design.php
@@ -68,7 +68,7 @@ class Design extends BaseModel
         'name',
         'design',
         'is_active',
-        'is_template',
+        // 'is_template',
     ];
 
     public function company()
diff --git a/app/Services/PdfMaker/PdfMaker.php b/app/Services/PdfMaker/PdfMaker.php
index 00da860c3877..cf77c6acb532 100644
--- a/app/Services/PdfMaker/PdfMaker.php
+++ b/app/Services/PdfMaker/PdfMaker.php
@@ -85,7 +85,11 @@ class PdfMaker
 
                 $loader = new \Twig\Loader\FilesystemLoader(storage_path());
                 $twig = new \Twig\Environment($loader);
-                $template = $twig->createTemplate($template);
+
+                $string_extension = new \Twig\Extension\StringLoaderExtension();
+                $twig->addExtension($string_extension);
+               
+                $template = $twig->createTemplate(html_entity_decode($template));
                 $template = $template->render($this->options);
 
                 $f = $this->document->createDocumentFragment();
diff --git a/composer.json b/composer.json
index 45d160ff2958..5520a24c5d38 100644
--- a/composer.json
+++ b/composer.json
@@ -94,7 +94,7 @@
         "symfony/mailgun-mailer": "^6.1",
         "symfony/postmark-mailer": "^6.1",
         "turbo124/beacon": "^1.5",
-        "twig/twig": "^3.0",
+        "twig/twig": "^3",
         "twilio/sdk": "^6.40",
         "webpatser/laravel-countries": "dev-master#75992ad",
         "wepay/php-sdk": "^0.3",
diff --git a/composer.lock b/composer.lock
index e0e6996e1fc7..2ac417355fe4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a3cef8412df6b0cc9371807991ab699a",
+    "content-hash": "08bc4729962b495b68162a069269f74f",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",

From 65be91aa47b7f8fe7ec500786a4b0637bb33dd92 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 21 Sep 2023 23:32:34 +1000
Subject: [PATCH 2/2] Fixes for encoded entities

---
 app/Services/PdfMaker/PdfMaker.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Services/PdfMaker/PdfMaker.php b/app/Services/PdfMaker/PdfMaker.php
index cf77c6acb532..701222bf359e 100644
--- a/app/Services/PdfMaker/PdfMaker.php
+++ b/app/Services/PdfMaker/PdfMaker.php
@@ -114,14 +114,14 @@ class PdfMaker
     /**
      * Final method to get compiled HTML.
      *
-     * @param bool $final @deprecated // is it? i still see it being called elsewhere
+     * @param bool $final
      * @return mixed
      */
     public function getCompiledHTML($final = false)
     {
 
         $html = $this->document->saveHTML();
-        nlog($html);
+        // nlog($html);
         return str_replace('%24', '$', $html);
     }
 }