From 7a594fae4d248c4f06581cbe43bb0fef9e504002 Mon Sep 17 00:00:00 2001
From: Muhammad Shahrukh <>
Date: Wed, 14 Aug 2024 13:22:54 +0500
Subject: [PATCH] COMCL-704: Fix quotation template

---
 CRM/Civicase/Upgrader/Steps/Step0020.php      | 32 +++++++++++++++++++
 .../MessageTemplate/QuotationInvoice.tpl      | 14 ++++----
 2 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 CRM/Civicase/Upgrader/Steps/Step0020.php

diff --git a/CRM/Civicase/Upgrader/Steps/Step0020.php b/CRM/Civicase/Upgrader/Steps/Step0020.php
new file mode 100644
index 000000000..9cd7f747b
--- /dev/null
+++ b/CRM/Civicase/Upgrader/Steps/Step0020.php
@@ -0,0 +1,32 @@
+<?php
+
+use CRM_Civicase_Setup_Manage_QuotationTemplateManager as QuotationTemplateManager;
+
+/**
+ * Update sales order invoice message template.
+ */
+class CRM_Civicase_Upgrader_Steps_Step0020 {
+
+  /**
+   * Runs the upgrader changes.
+   *
+   * @return bool
+   *   Return value in boolean.
+   */
+  public function apply(): bool {
+    try {
+      (new QuotationTemplateManager())->create();
+    }
+    catch (\Throwable $th) {
+      \Civi::log()->error('Error upgrading Civicase', [
+        'context' => [
+          'backtrace' => $th->getTraceAsString(),
+          'message' => $th->getMessage(),
+        ],
+      ]);
+    }
+
+    return TRUE;
+  }
+
+}
diff --git a/templates/CRM/Civicase/MessageTemplate/QuotationInvoice.tpl b/templates/CRM/Civicase/MessageTemplate/QuotationInvoice.tpl
index 4e4918993..ee542a97d 100644
--- a/templates/CRM/Civicase/MessageTemplate/QuotationInvoice.tpl
+++ b/templates/CRM/Civicase/MessageTemplate/QuotationInvoice.tpl
@@ -24,8 +24,8 @@
         </tr>
         <tr>
           <td><font size="1" align="center">
-          {if $sales_order.clientAddress.street_address }{$sales_order.clientAddress.street_address}{/if}
-          {if $sales_order.clientAddress.supplemental_address_1 }{$sales_order.clientAddress.supplemental_address_1}{/if}
+          {if !empty($sales_order.clientAddress.street_address) }{$sales_order.clientAddress.street_address}{/if}
+          {if !empty($sales_order.clientAddress.supplemental_address_1) }{$sales_order.clientAddress.supplemental_address_1}{/if}
           </font></td>
           <td><font size="1" align="right">{$sales_order.quotation_date|crmDate}</font></td>
           <td style="white-space: nowrap"><font size="1" align="right">
@@ -35,8 +35,8 @@
         </tr>
         <tr>
           <td><font size="1" align="center">
-          {if $sales_order.clientAddress.supplemental_address_2  }{$sales_order.clientAddress.supplemental_address_2 }{/if}
-          {if $sales_order.clientAddress.state }{$sales_order.clientAddress.state}{/if}
+          {if !empty($sales_order.clientAddress.supplemental_address_2)  }{$sales_order.clientAddress.supplemental_address_2 }{/if}
+          {if !empty($sales_order.clientAddress.state) }{$sales_order.clientAddress.state}{/if}
           </font></td>
           <td><b><font size="1" align="right">Quote Number</font></b></td>
           <td style="white-space: nowrap"><font size="1" align="right">
@@ -46,8 +46,8 @@
         </tr>
         <tr>
           <td><font size="1" align="center">
-          {if $sales_order.clientAddress.city  }{$sales_order.clientAddress.city }{/if}
-          {if $sales_order.clientAddress.postal_code }{$sales_order.clientAddress.postal_code}{/if}
+          {if !empty($sales_order.clientAddress.city)  }{$sales_order.clientAddress.city }{/if}
+          {if !empty($sales_order.clientAddress.postal_code) }{$sales_order.clientAddress.postal_code}{/if}
           </font></td>
           <td><font size="1" align="right">{$sales_order.id}</font></td>
           <td style="white-space: nowrap"><font size="1" align="right">
@@ -57,7 +57,7 @@
         </tr>
         <tr>
           <td><font size="1" align="center">
-          {if $sales_order.clientAddress.country  }{$sales_order.clientAddress.country}{/if}
+          {if !empty($sales_order.clientAddress.country)  }{$sales_order.clientAddress.country}{/if}
           </font></td>
           <td></td>
           <td style="white-space: nowrap"><font size="1" align="right">