datetime

TypiCMS · Mar 15, 2015 · fbf0d97 · fbf0d97
1 parent 27c8658
commit fbf0d97
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/Presenters/Presenter.php b/src/Presenters/Presenter.php
@@ -37,6 +37,18 @@ public function __get($property)
         return $this->entity->{$property};
     }
 
+    /**
+     * Return resource's datetime or curent date and time if empty
+     *
+     * @param  string $column
+     * @return Carbon
+     */
+    public function datetimeOrNow($column = 'date')
+    {
+        $date = $this->entity->$column ? : Carbon::now() ;
+        return $date->format('Y-m-d G:i:s');
+    }
+
     /**
      * Return resource's date or curent date if empty
      *
@@ -58,7 +70,7 @@ public function dateOrNow($column = 'date')
     public function timeOrNow($column = 'date')
     {
         $date = $this->entity->$column ? : Carbon::now() ;
-        return $date->format('H:i');
+        return $date->format('G:i');
     }
 
     /**