From 9198cf5175647453507dd7ed42586cf1013d61b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Tue, 1 Dec 2020 15:52:12 +0100
Subject: [PATCH] support tasks as of same day

---
 .../Designs/Utilities/DesignHelpers.php        | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
index cfd1a6b9a987..d80c6c4b1a4d 100644
--- a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
+++ b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
@@ -14,6 +14,7 @@ namespace App\Services\PdfMaker\Designs\Utilities;
 
 use App\Models\Task;
 use App\Utils\Traits\MakesHash;
+use Carbon\Carbon;
 use DOMDocument;
 use DOMXPath;
 use Exception;
@@ -249,11 +250,18 @@ trait DesignHelpers
         }
 
         foreach ($_logs as $log) {
-            $logs[] = sprintf(
-                '%s - %s',
-                \Carbon\Carbon::createFromTimestamp($log[0])->format($this->entity->client->date_format() . ' h:i:s'),
-                \Carbon\Carbon::createFromTimestamp($log[1])->format($this->entity->client->date_format() . ' h:i:s')
-            );
+            $start = Carbon::createFromTimestamp($log[0]);
+            $finish = Carbon::createFromTimestamp($log[1]);
+
+            if ($start->isSameDay($finish)) {
+                $logs[] = sprintf('%s: %s - %s', $start->format($this->entity->client->date_format()), $start->format('h:i:s'), $finish->format('h:i:s'));
+            } else {
+                $logs[] = sprintf(
+                    '%s - %s',
+                    $start->format($this->entity->client->date_format() . ' h:i:s'),
+                    $finish->format($this->entity->client->date_format() . ' h:i:s')
+                );
+            }
         }
 
         return $logs;