From 14b11ecbbd8065f8a7d2111b36705d1cf9f57b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <benjamin@pop-os.localdomain>
Date: Wed, 4 Nov 2020 11:22:43 +0100
Subject: [PATCH] Refactor total table columns: - $task.cost => $task.rate -
 $task.quantity => $task.hours

---
 app/DataMapper/CompanySettings.php     | 4 ++--
 app/Utils/HtmlEngine.php               | 4 ++--
 app/Utils/Traits/MakesTemplateData.php | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index 24d668064b6c..25297e263bab 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -624,8 +624,8 @@ class CompanySettings extends BaseSettings
             'task_columns' =>[
                 '$task.product_key',
                 '$task.notes',
-                '$task.cost',
-                '$task.quantity',
+                '$task.rate',
+                '$task.hours',
                 '$task.discount',
                 '$task.tax',
                 '$task.line_total',
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index e7e75a6c5764..4c33bf564fd6 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -304,8 +304,8 @@ class HtmlEngine
         $data['$task.discount'] = ['value' => '', 'label' => ctrans('texts.discount')];
         $data['$task.product_key'] = ['value' => '', 'label' => ctrans('texts.product_key')];
         $data['$task.notes'] = ['value' => '', 'label' => ctrans('texts.notes')];
-        $data['$task.cost'] = ['value' => '', 'label' => ctrans('texts.cost')];
-        $data['$task.quantity'] = ['value' => '', 'label' => ctrans('texts.quantity')];
+        $data['$task.rate'] = ['value' => '', 'label' => ctrans('texts.rate')];
+        $data['$task.hours'] = ['value' => '', 'label' => ctrans('texts.hours')];
         $data['$task.tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
         $data['$task.tax_name1'] = ['value' => '', 'label' => ctrans('texts.tax')];
         $data['$task.tax_name2'] = ['value' => '', 'label' => ctrans('texts.tax')];
diff --git a/app/Utils/Traits/MakesTemplateData.php b/app/Utils/Traits/MakesTemplateData.php
index edf69302edc1..599157576da7 100644
--- a/app/Utils/Traits/MakesTemplateData.php
+++ b/app/Utils/Traits/MakesTemplateData.php
@@ -193,8 +193,8 @@ trait MakesTemplateData
         $data['$task.discount'] = ['value' => '5%', 'label' => ctrans('texts.discount')];
         $data['$task.product_key'] = ['value' => 'key', 'label' => ctrans('texts.product_key')];
         $data['$task.notes'] = ['value' => 'Note for Tasks', 'label' => ctrans('texts.notes')];
-        $data['$task.cost'] = ['value' => '$100.00', 'label' => ctrans('texts.cost')];
-        $data['$task.quantity'] = ['value' => '1', 'label' => ctrans('texts.quantity')];
+        $data['$task.rate'] = ['value' => '$100.00', 'label' => ctrans('texts.rate')];
+        $data['$task.hours'] = ['value' => '1', 'label' => ctrans('texts.hours')];
         $data['$task.tax_name1'] = ['value' => 'GST', 'label' => ctrans('texts.tax')];
         $data['$task.tax_name2'] = ['value' => 'VAT', 'label' => ctrans('texts.tax')];
         $data['$task.tax_name3'] = ['value' => 'CA Sales Tax', 'label' => ctrans('texts.tax')];