From 53525dc93fe17b2ca59f504537aca475de5dee58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Tue, 8 Dec 2020 16:10:29 +0100
Subject: [PATCH 1/2] rename task.service to task.product key

---
 app/DataMapper/CompanySettings.php      | 2 +-
 app/Services/PdfMaker/Design.php        | 6 +++---
 app/Utils/HtmlEngine.php                | 2 +-
 app/Utils/Traits/MakesInvoiceValues.php | 1 +
 app/Utils/Traits/MakesTemplateData.php  | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index b1febefdab7a..b5afe3bb2b71 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -636,7 +636,7 @@ class CompanySettings extends BaseSettings
                 '$product.line_total',
             ],
             'task_columns' =>[
-                '$task.product_key',
+                '$task.service',
                 '$task.description',
                 '$task.rate',
                 '$task.hours',
diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php
index 3c5115facb17..ea479e3055a3 100644
--- a/app/Services/PdfMaker/Design.php
+++ b/app/Services/PdfMaker/Design.php
@@ -300,9 +300,7 @@ class Design extends BaseDesign
         $elements = [];
 
         // Some of column can be aliased. This is simple workaround for these.
-        $aliases = [
-            '$task.product_key' => '$task.service',
-        ];
+        $aliases = [];
 
         foreach ($this->context['pdf_variables']["{$type}_columns"] as $column) {
             if (array_key_exists($column, $aliases)) {
@@ -379,6 +377,8 @@ class Design extends BaseDesign
                     // $task.cost => $task.rate
                     // $task.quantity => $task.hours
 
+                    info($row);
+
                     if ($cell == '$task.rate') {
                         $element['elements'][] = ['element' => 'td', 'content' => $row['$task.cost']];
                     } elseif ($cell == '$task.hours') {
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 24da8ee03b21..af543ee6603f 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -307,7 +307,7 @@ class HtmlEngine
 
         $data['$task.date'] = ['value' => '', 'label' => ctrans('texts.date')];
         $data['$task.discount'] = ['value' => '', 'label' => ctrans('texts.discount')];
-        $data['$task.product_key'] = ['value' => '', 'label' => ctrans('texts.product_key')];
+        $data['$task.service'] = ['value' => '', 'label' => ctrans('texts.service')];
         $data['$task.description'] = ['value' => '', 'label' => ctrans('texts.description')];
         $data['$task.rate'] = ['value' => '', 'label' => ctrans('texts.rate')];
         $data['$task.hours'] = ['value' => '', 'label' => ctrans('texts.hours')];
diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php
index 5b3245ca8c01..a10a4783c228 100644
--- a/app/Utils/Traits/MakesInvoiceValues.php
+++ b/app/Utils/Traits/MakesInvoiceValues.php
@@ -617,6 +617,7 @@ trait MakesInvoiceValues
             }
 
             $data[$key][$table_type.'.product_key'] = $item->product_key;
+            $data[$key][$table_type.'.service'] = is_null(optional($item)->service) ? $item->product_key : $item->service;
             $data[$key][$table_type.'.notes'] = $item->notes;
             $data[$key][$table_type.'.description'] = $item->notes;
             $data[$key][$table_type.'.custom_value1'] = $item->custom_value1;
diff --git a/app/Utils/Traits/MakesTemplateData.php b/app/Utils/Traits/MakesTemplateData.php
index 599157576da7..28ccb2d6a1e9 100644
--- a/app/Utils/Traits/MakesTemplateData.php
+++ b/app/Utils/Traits/MakesTemplateData.php
@@ -191,7 +191,7 @@ trait MakesTemplateData
         $data['$product.line_total'] = ['value' => '$20.00', 'label' => ctrans('texts.line_total')];
         $data['$task.date'] = ['value' => '2010-02-03', 'label' => ctrans('texts.date')];
         $data['$task.discount'] = ['value' => '5%', 'label' => ctrans('texts.discount')];
-        $data['$task.product_key'] = ['value' => 'key', 'label' => ctrans('texts.product_key')];
+        $data['$task.service'] = ['value' => 'key', 'label' => ctrans('texts.service')];
         $data['$task.notes'] = ['value' => 'Note for Tasks', 'label' => ctrans('texts.notes')];
         $data['$task.rate'] = ['value' => '$100.00', 'label' => ctrans('texts.rate')];
         $data['$task.hours'] = ['value' => '1', 'label' => ctrans('texts.hours')];

From 0f62c6c2f23a404c8e56bbd34c65a0c08daa5c79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Tue, 8 Dec 2020 16:15:36 +0100
Subject: [PATCH 2/2] remove info()

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

diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php
index ea479e3055a3..d99a4a2c4c60 100644
--- a/app/Services/PdfMaker/Design.php
+++ b/app/Services/PdfMaker/Design.php
@@ -377,8 +377,6 @@ class Design extends BaseDesign
                     // $task.cost => $task.rate
                     // $task.quantity => $task.hours
 
-                    info($row);
-
                     if ($cell == '$task.rate') {
                         $element['elements'][] = ['element' => 'td', 'content' => $row['$task.cost']];
                     } elseif ($cell == '$task.hours') {