Date EST issue fix

app/Helpers/helpers.php

@@ -128,21 +128,21 @@ if(!function_exists('friendly_date_time')) {
     function friendly_date_time($value, $includeTime = true, $default = '-', $long_year=false) {
         if(!$value || empty($value)) return $default;
         try {
-
-            $realTimezone = 'US/Eastern';
-            $date = new DateTime($value);
-            $date->setTimezone(new DateTimeZone($realTimezone));
-
-            return $date->format("m/d/y" . ($includeTime ? ", h:ia" : "")) . ($includeTime ? ' EST' : '');
-
-            /*$result = strtotime($value);
-            if($long_year){
-                $result = date("m/d/Y" . ($includeTime ? ", h:ia" : ""), $result);
-            }else{
-                $result = date("m/d/y" . ($includeTime ? ", h:ia" : ""), $result);
+            if($includeTime) {
+                $realTimezone = 'US/Eastern';
+                $date = new DateTime($value);
+                $date->setTimezone(new DateTimeZone($realTimezone));
+                return $date->format("m/d/y" . ($includeTime ? ", h:ia" : "")) . ($includeTime ? ' EST' : '');
+            }
+            else {
+                $result = strtotime($value);
+                if($long_year){
+                    $result = date("m/d/Y" . ($includeTime ? ", h:ia" : ""), $result);
+                }else{
+                    $result = date("m/d/y" . ($includeTime ? ", h:ia" : ""), $result);
+                }
+                return $result;
             }
-
-            return $result;*/
         }
         catch (Exception $e) {
             return $value;
@@ -152,22 +152,7 @@ if(!function_exists('friendly_date_time')) {
 
 if(!function_exists('friendlier_date_time')) {
     function friendlier_date_time($value, $includeTime = true, $default = '-') {
-        if(!$value || empty($value)) return $default;
-        try {
-
-            $realTimezone = 'US/Eastern';
-            $date = new DateTime($value);
-            $date->setTimezone(new DateTimeZone($realTimezone));
-
-            return $date->format("m/d/y" . ($includeTime ? ", h:ia" : "")) . ($includeTime ? ' EST' : '');
-
-            /*$result = strtotime($value);
-            $result = date("m/d/Y" . ($includeTime ? ", h:i a" : ""), $result);
-            return $result;*/
-        }
-        catch (Exception $e) {
-            return $value;
-        }
+        return friendly_date_time($value, $includeTime, $default);
     }
 }