From 183d04ca48e5f9f19a5fc7a95237a036d457a791 Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Sun, 14 Jan 2018 22:57:16 +0800
Subject: [PATCH] Fix outlet add form bug

---
 src/Controller/OutletController.php | 6 +++---
 src/Entity/Outlet.php               | 7 +++++++
 templates/outlet/form.html.twig     | 4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Controller/OutletController.php b/src/Controller/OutletController.php
index 654d0468..eb22b2cb 100644
--- a/src/Controller/OutletController.php
+++ b/src/Controller/OutletController.php
@@ -86,8 +86,8 @@ class OutletController extends BaseController
             $row['name'] = $orow->getName();
             $row['address'] = $orow->getAddress();
             $row['contact_nums'] = $orow->getContactNumbers();
-            $row['time_open'] = $orow->getTimeOpen()->format('h:i A');
-            $row['time_close'] = $orow->getTimeClose()->format('h:i A');
+            $row['time_open'] = $orow->getTimeOpen()->format('g:i A');
+            $row['time_close'] = $orow->getTimeClose()->format('g:i A');
 
             // add row metadata
             $row['meta'] = [
@@ -129,7 +129,7 @@ class OutletController extends BaseController
         $point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat'));
 
         // times
-        $format = 'h:i A';
+        $format = 'g:i A';
         $time_open = DateTime::createFromFormat($format, $req->request->get('time_open'));
         $time_close = DateTime::createFromFormat($format, $req->request->get('time_close'));
 
diff --git a/src/Entity/Outlet.php b/src/Entity/Outlet.php
index 8f3efc0e..8b343a30 100644
--- a/src/Entity/Outlet.php
+++ b/src/Entity/Outlet.php
@@ -61,6 +61,13 @@ class Outlet
     protected $time_close;
 
 
+    public function __construct()
+    {
+        $this->time_open = new DateTime();
+        $this->time_close = new DateTime();
+    }
+
+
     public function getID()
     {
         return $this->id;
diff --git a/templates/outlet/form.html.twig b/templates/outlet/form.html.twig
index 23fd3204..682daf85 100644
--- a/templates/outlet/form.html.twig
+++ b/templates/outlet/form.html.twig
@@ -69,7 +69,7 @@
                                     Time Open
                                 </label>
                                 <div class="input-group timepicker">
-                                    <input id="timepicker_open" type="text" name="time_open" class="form-control m-input" readonly placeholder="Select time" type="text" value="{{ obj.getTimeOpen.format('h:i A') }}" />
+                                    <input id="timepicker_open" type="text" name="time_open" class="form-control m-input" readonly placeholder="Select time" type="text" value="{{ obj.getTimeOpen.format('g:i A') }}" />
                                     <span class="input-group-addon">
                                         <i class="la la-clock-o"></i>
                                     </span>
@@ -81,7 +81,7 @@
                                     Time Close
                                 </label>
                                 <div class="input-group timepicker">
-                                    <input id="timepicker_close" type="text" name="time_close" class="form-control m-input" readonly placeholder="Select time" type="text" value="{{ obj.getTimeClose.format('h:i A') }}" />
+                                    <input id="timepicker_close" type="text" name="time_close" class="form-control m-input" readonly placeholder="Select time" type="text" value="{{ obj.getTimeClose.format('g:i A') }}" />
                                     <span class="input-group-addon">
                                         <i class="la la-clock-o"></i>
                                     </span>