From 0ac5acda827f12153fcda130a217d9492be55ca3 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 1 Jul 2022 18:35:52 +1000
Subject: [PATCH] Fixes for templates

---
 app/Utils/TemplateEngine.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index fb848bd6adb4..4e0b6580de6d 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -84,6 +84,10 @@ class TemplateEngine
 
     public function build()
     {
+        
+        if ($this->template == 'email_template_null')
+            $this->template = 'email_template_purchase_order';
+
         return $this->setEntity()
                  ->setSettingsObject()
                  ->setTemplates()
@@ -156,7 +160,7 @@ class TemplateEngine
         if($this->entity == 'purchaseOrder'){
             $this->fakerValues();
         }
-        elseif ($this->entity_obj) {
+        elseif ($this->entity_obj->client()->exists()) {
             $this->entityValues($this->entity_obj->client->primary_contact()->first());
         } 
         else {
@@ -186,7 +190,7 @@ class TemplateEngine
 
     private function entityValues($contact)
     {
-        if($this->entity == 'purchase_order')
+        if($this->entity == 'purchaseOrder')
             $this->labels_and_values = (new VendorHtmlEngine($this->entity_obj->invitations->first()))->generateLabelsAndValues();
         else
             $this->labels_and_values = (new HtmlEngine($this->entity_obj->invitations->first()))->generateLabelsAndValues();
@@ -214,7 +218,7 @@ class TemplateEngine
         $data['footer'] = '';
         $data['logo'] = auth()->user()->company()->present()->logo();
 
-        if($this->entity_obj->client)
+        if($this->entity_obj->client()->exists())
             $data = array_merge($data, Helpers::sharedEmailVariables($this->entity_obj->client));
         else{
 
@@ -323,7 +327,7 @@ class TemplateEngine
 
 
 
-        if($this->entity == 'purchase_order')
+        if($this->entity == 'purchaseOrder')
         {
 
             $vendor = Vendor::factory()->create([