From a4309cbe207b964b64135ae642ca8dee41121b74 Mon Sep 17 00:00:00 2001
From: Catalin Tudorache <tumf87@gmail.com>
Date: Sat, 30 Sep 2017 17:25:43 +0300
Subject: [PATCH] Fixed the date range field when laravel date mutators were
 not configured.

---
 .../views/fields/date_range.blade.php         | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/resources/views/fields/date_range.blade.php b/src/resources/views/fields/date_range.blade.php
index 204619c829..2e04604d36 100644
--- a/src/resources/views/fields/date_range.blade.php
+++ b/src/resources/views/fields/date_range.blade.php
@@ -3,18 +3,22 @@
 <?php
     // if the column has been cast to Carbon or Date (using attribute casting)
     // get the value as a date string
-    if ( isset($entry) && ($entry->{$field['start_name']} instanceof \Carbon\Carbon || $entry->{$field['start_name']} instanceof \Jenssegers\Date\Date) ) {
-        $start_name = $entry->{$field['start_name']}->format( 'Y-m-d H:i:s' );
-    } else {
-        $start_name = null;
+    function formatDate($entry, $dateFieldName)
+    {
+        $formattedDate = null;
+        if (isset($entry) && !empty($entry->{$dateFieldName})) {
+            $dateField = $entry->{$dateFieldName};
+            if ($dateField instanceof \Carbon\Carbon || $dateField instanceof \Jenssegers\Date\Date) {
+                $formattedDate = $dateField->format('Y-m-d H:i:s');
+            } else {
+                $formattedDate = date('Y-m-d H:i:s', strtotime($entry->{$dateFieldName}));
+            }
+        }
+        return $formattedDate;
     }
 
-    //Do the same as the above but for the range end field
-    if ( isset($entry) && ($entry->{$field['end_name']} instanceof \Carbon\Carbon || $entry->{$field['end_name']} instanceof \Jenssegers\Date\Date) ) {
-        $end_name = $entry->{$field['end_name']}->format( 'Y-m-d H:i:s' );
-    } else {
-        $end_name = null;
-    }
+    $start_name = formatDate($entry, $field['start_name']);
+    $end_name = formatDate($entry, $field['end_name']);
 ?>
 
 <div @include('crud::inc.field_wrapper_attributes') >