From 3112efcdeddf4e94476026074bd8334868bf341d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Tue, 17 Nov 2020 14:46:22 +0100
Subject: [PATCH 1/2] Support for .description

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

diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php
index 2043d73eaaa0..c5174df408b3 100644
--- a/app/Services/PdfMaker/Design.php
+++ b/app/Services/PdfMaker/Design.php
@@ -367,7 +367,7 @@ class Design extends BaseDesign
                         $element['elements'][] = ['element' => 'td', 'content' => $row['$task.cost']];
                     } else if ($cell == '$task.hours') {
                         $element['elements'][] = ['element' => 'td', 'content' => $row['$task.quantity']];
-                    } else if ($cell == '$task.notes') {
+                    } else if ($cell == '$task.description') {
                         $_element = ['element' => 'td', 'content' => '', 'elements' => [
                             ['element' => 'span', 'content' => $row[$cell]],
                         ]];

From 1b70f24dbc6ded71c47eb62cf1d4cfefa7881265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Tue, 17 Nov 2020 14:47:32 +0100
Subject: [PATCH 2/2] Update logic for rendering task hours

---
 .../PdfMaker/Designs/Utilities/DesignHelpers.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
index 94dde6b32362..c59a31ec8d2e 100644
--- a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
+++ b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
@@ -236,9 +236,19 @@ trait DesignHelpers
             return [];
         }
 
-        foreach (json_decode($task['time_log']) as $log) {
-            info($log);
-            $logs[] = sprintf('%s - %s', \Carbon\Carbon::createFromTimestamp($log[0])->toDateTimeString(), \Carbon\Carbon::createFromTimestamp($log[1])->toDateTimeString());
+        $logs = [];
+        $_logs = json_decode($task->time_log);
+
+        if (!$_logs) {
+            $_logs = [];
+        }
+
+        foreach ($_logs as $log) {
+            $logs[] = sprintf(
+                '%s - %s',
+                \Carbon\Carbon::createFromTimestamp($log[0])->format($task->client->date_format() . ' h:i:s'),
+                \Carbon\Carbon::createFromTimestamp($log[1])->format($task->client->date_format() . ' h:i:s')
+            );
         }
 
         return $logs;