From 1a066f2f9f5fdffe5771316a538939d189ca9b88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Tue, 1 Dec 2020 15:18:48 +0100
Subject: [PATCH] add alias to task searvice from task product

---
 app/Services/PdfMaker/Design.php | 13 +++++++++++--
 app/Utils/HtmlEngine.php         |  1 +
 resources/lang/en/texts.php      |  2 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php
index 12502c74bed9..f4897c8aa9a7 100644
--- a/app/Services/PdfMaker/Design.php
+++ b/app/Services/PdfMaker/Design.php
@@ -292,8 +292,17 @@ class Design extends BaseDesign
 
         $elements = [];
 
+        // Some of column can be aliased. This is simple workaround for these.
+        $aliases = [
+            '$task.product_key' => '$task.service',
+        ];
+
         foreach ($this->context['pdf_variables']["{$type}_columns"] as $column) {
-            $elements[] = ['element' => 'th', 'content' => $column . '_label'];
+            if (array_key_exists($column, $aliases)) {
+                $elements[] = ['element' => 'th', 'content' => $aliases[$column] . '_label'];
+            } else {
+                $elements[] = ['element' => 'th', 'content' => $column . '_label'];
+            }
         }
 
         return $elements;
@@ -322,7 +331,7 @@ class Design extends BaseDesign
                 $element['elements'][] = ['element' => 'td', 'content' => $row['delivery_note.product_key']];
                 $element['elements'][] = ['element' => 'td', 'content' => $row['delivery_note.notes']];
                 $element['elements'][] = ['element' => 'td', 'content' => $row['delivery_note.quantity']];
-                
+
                 $elements[] = $element;
             }
 
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 302c4c697c9f..7fd2c709a0d1 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -316,6 +316,7 @@ class HtmlEngine
         $data['$task.tax_name2'] = ['value' => '', 'label' => ctrans('texts.tax')];
         $data['$task.tax_name3'] = ['value' => '', 'label' => ctrans('texts.tax')];
         $data['$task.line_total'] = ['value' => '', 'label' => ctrans('texts.line_total')];
+        $data['$task.service'] = ['value' => '', 'label' => ctrans('texts.service')];
 
         if ($this->settings->signature_on_pdf) {
             $data['$contact.signature'] = ['value' => $this->invitation->signature_base64, 'label' => ctrans('texts.signature')];
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 32028ac5422b..f4bd490bfd9f 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -3311,4 +3311,6 @@ return [
 
     'billing_country' => 'Billing Country',
     'shipping_country' => 'Shipping Country',
+
+    'service' => 'Service',
 ];