From 45b2a2e8f62a4832a0f3ed4ccbcbe6a5fd32b456 Mon Sep 17 00:00:00 2001
From: Manish Verma <alerts@ladybirdweb.com>
Date: Thu, 15 Nov 2018 12:56:01 +0530
Subject: [PATCH] Plugin updates

Updated faveodate method to work with old configuration
---
 .../Agent/helpdesk/TicketController.php          |  2 ++
 app/Http/helpers.php                             | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php
index ddc515bd5..2ac703f83 100644
--- a/app/Http/Controllers/Agent/helpdesk/TicketController.php
+++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php
@@ -1048,6 +1048,8 @@ class TicketController extends Controller
                 }
             }
         }
+        \Event::fire('after.ticket.created', array(['ticket' => $ticket, 'form_data' => $form_data]));
+
         // store collaborators
         $this->storeCollaborators($headers, $id);
         if ($this->ticketThread($subject, $body, $id, $user_id) == true) {
diff --git a/app/Http/helpers.php b/app/Http/helpers.php
index e97f8fe92..63bcd4a91 100644
--- a/app/Http/helpers.php
+++ b/app/Http/helpers.php
@@ -191,21 +191,21 @@ function faveoDate($date = '', $format = '', $tz = '')
     if (!is_object($date)) {
         $date = carbon($date);
     }
+
     if (!$format || !$tz) {
         $system = App\Model\helpdesk\Settings\System::select('time_zone', 'date_time_format')->first();
     }
     if (!$format) {
-        $format = $system->date_time_format;
+        $format = is_numeric($system->date_time_format) ? DB::table('date_time_format')->where('id', $system->date_time_format)->value('format') :  $system->date_time_format;
     }
     if (!$tz) {
-        $tz = $system->time_zone;
+        $tz = is_numeric($system->time_zone) ? DB::table('timezone')->where('id', $system->time_zone)->value('name') : $system->time_zone;
     }
 
     try {
         if ($format == 'human-read') {
             return $date->tz($tz)->diffForHumans();
         }
-
         return $date->tz($tz)->format($format);
     } catch (\Exception $ex) {
         return 'invalid';
@@ -290,3 +290,13 @@ function createDB(string $dbName)
     // populated
     \DB::disconnect('mysql');
 }
+
+/**
+ * parse the carbon
+ * @param string $date
+ * @return \Carbon\Carbon
+ */
+function carbon($date)
+{
+    return \Carbon\Carbon::parse($date);
+}