From a7ffb58fc81df382297c9bc58b463e8e1184d959 Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Sun, 11 Mar 2018 02:44:44 +0800
Subject: [PATCH] Fix ticket functionality related to contact numbers #UAT

---
 src/Controller/TicketController.php | 8 +-------
 templates/ticket/form.html.twig     | 7 +++++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Controller/TicketController.php b/src/Controller/TicketController.php
index d4437b2d..fbcd17c6 100644
--- a/src/Controller/TicketController.php
+++ b/src/Controller/TicketController.php
@@ -208,13 +208,7 @@ class TicketController extends BaseController
             // set autopopulated fields
             $first_name = $customer->getFirstName();
             $last_name = $customer->getLastName();
-            $contact_num = '';
-
-            $mobile_numbers = $customer->getMobileNumbers();
-
-            if (count($mobile_numbers) > 0) {
-                $contact_num = $mobile_numbers[0]->getID();
-            }
+            $contact_num = $customer->getPhoneMobile();
 
             // get job order data
             if ($job_order_id) {
diff --git a/templates/ticket/form.html.twig b/templates/ticket/form.html.twig
index c44cacfb..0d498d1d 100644
--- a/templates/ticket/form.html.twig
+++ b/templates/ticket/form.html.twig
@@ -70,8 +70,11 @@
 								<div class="form-group m-form__group row no-border">
 									<div class="col-lg-4">
 										<label data-field="contact_num">Contact Number</label>
-										<input type="text" name="contact_num" class="form-control m-input" value="{{ customer and mode == 'create' and customer.getMobileNumbers is not empty ? customer.getMobileNumbers[0].getID : obj.getContactNumber }}"{{ customer ? ' disabled' }}>
-										<div class="form-control-feedback hide" data-field="contact_num"></div>
+                                        <div class="input-group m-input-group">
+                                            <span class="input-group-addon">+63</span>
+                                            <input type="text" name="contact_num" class="form-control m-input" value="{{ customer and mode == 'create' and customer.getPhoneMobile is not empty ? customer.getPhoneMobile : obj.getContactNumber }}"{{ customer ? ' disabled' }}>
+                                            <div class="form-control-feedback hide" data-field="contact_num"></div>
+                                        </div>
 									</div>
 								</div>
 								<div class="form-group m-form__group row no-border">