From 2e95ac301e7cd7eea3d33538c3b8a93b81f765ea Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Mon, 5 Aug 2019 17:41:20 +0800
Subject: [PATCH 1/8] Hardcode limit of 5 to getting nearest partners API call
 #243

---
 src/Controller/APIController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index b43c0ad7..f23cbbe6 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -2094,7 +2094,8 @@ class APIController extends Controller
         $long = $req->query->get('longitude');
         $lat = $req->query->get('latitude');
         $service_id = $req->query->get('service_id');
-        $limit = $req->query->get('limit');
+        // $limit = $req->query->get('limit');
+        $limit = 5;
 
         // get partners within range
         $query = $em->createQuery('SELECT p, st_distance(p.coordinates, point(:lng, :lat)) as dist FROM App\Entity\Partner p

From a0c8f01c4b9367e35900de43011ebca4ced785bb Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Mon, 5 Aug 2019 15:28:53 +0000
Subject: [PATCH 2/8] Revert "Merge branch
 '243-limit-nearest-partner-api-call-to-5' into 'master'"

This reverts merge request !286
---
 src/Controller/APIController.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index f23cbbe6..b43c0ad7 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -2094,8 +2094,7 @@ class APIController extends Controller
         $long = $req->query->get('longitude');
         $lat = $req->query->get('latitude');
         $service_id = $req->query->get('service_id');
-        // $limit = $req->query->get('limit');
-        $limit = 5;
+        $limit = $req->query->get('limit');
 
         // get partners within range
         $query = $em->createQuery('SELECT p, st_distance(p.coordinates, point(:lng, :lat)) as dist FROM App\Entity\Partner p

From 871609fe5d91a56828a86aa0606110c2643ceeba Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Wed, 7 Aug 2019 05:41:40 +0000
Subject: [PATCH 3/8] Change display of mobile session id to mobile phone
 number when listing reviews and when viewing review details. #244

---
 src/Controller/ReviewController.php | 2 +-
 templates/review/form.html.twig     | 8 ++++----
 templates/review/list.html.twig     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Controller/ReviewController.php b/src/Controller/ReviewController.php
index b5acae33..7d6d6e7d 100644
--- a/src/Controller/ReviewController.php
+++ b/src/Controller/ReviewController.php
@@ -87,7 +87,7 @@ class ReviewController extends Controller
             $row['partner'] = $orow->getPartner()->getName();
             $row['rating'] = $orow->getRating();
             $row['message'] = $orow->getMessage();
-            $row['mobile_session'] = $orow->getMobileSession()->getID();
+            $row['mobile_number'] = $orow->getMobileSession()->getPhoneNumber();
 
             // add row metadata
             $row['meta'] = [
diff --git a/templates/review/form.html.twig b/templates/review/form.html.twig
index 5b173816..a497a7f7 100644
--- a/templates/review/form.html.twig
+++ b/templates/review/form.html.twig
@@ -54,11 +54,11 @@
                         </div>
                         <div class="form-group m-form__group row no-border">
                             <div class="col-lg-6">
-                                <label for="mobile_session" data-field="mobile_session">
-                                   Mobile Session
+                                <label for="mobile_number" data-field="mobile_number">
+                                   Mobile Number
                                 </label>
-                                <input type="text" name="mobile_session" class="form-control m-input" value="{{ obj.getMobileSession.getID|default('') }}" disabled>
-                                <div class="form-control-feedback hide" data-field="mobile_session"></div>
+                                <input type="text" name="mobile_number" class="form-control m-input" value="{{ obj.getMobileSession.getPhoneNumber|default('') }}" disabled>
+                                <div class="form-control-feedback hide" data-field="mobile_number"></div>
                             </div>
                             <div class="col-lg-6">
                                 <label for="date_create" data-field="date_create">
diff --git a/templates/review/list.html.twig b/templates/review/list.html.twig
index a7fecacc..eb2a76d6 100644
--- a/templates/review/list.html.twig
+++ b/templates/review/list.html.twig
@@ -84,8 +84,8 @@
                 title: 'Message'
             },
             {
-                field: 'mobile_session',
-                title: 'Mobile'
+                field: 'mobile_number',
+                title: 'Mobile Number'
             },
             {
                 field: 'Actions',

From bccbeda83af6860f3e46dbb9e19881cd3f4a215c Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Wed, 7 Aug 2019 05:55:52 +0000
Subject: [PATCH 4/8] Remove the time element from date purchase, date expiry,
 and date claim. #245

---
 src/Controller/APIController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index b43c0ad7..1032ecdc 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -1946,10 +1946,10 @@ class APIController extends Controller
             $sap_batt = $warranty->getSAPBattery()->getID();
         }
         if (!(is_null($warranty->getDateClaim()))) {
-            $claim_date = $warranty->getDateClaim()->format("d M Y g:i A");
+            $claim_date = $warranty->getDateClaim()->format("d M Y");
         }
         if (!(is_null($warranty->getDateExpire()))) {
-            $expiry_date = $warranty->getDateExpire()->format("d M Y g:i A");
+            $expiry_date = $warranty->getDateExpire()->format("d M Y");
         }
 
         $warr[] = [
@@ -1965,7 +1965,7 @@ class APIController extends Controller
             'sap_battery' => $sap_batt,
             'status' => $warranty->getStatus(),
             'date_create' => $warranty->getDateCreate()->format("d M Y g:i A"),
-            'date_purchase' => $warranty->getDatePurchase()->format("d M Y g:i A"),
+            'date_purchase' => $warranty->getDatePurchase()->format("d M Y"),
             'date_expire' => $expiry_date,
             'date_claim' => $claim_date,
             'claim_from' => $warranty->getClaimedFrom(),

From 3df29fc842402a37c01357ab18ea965086848105 Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Wed, 7 Aug 2019 16:06:10 +0800
Subject: [PATCH 5/8] Add special number for app store testing #246

---
 src/Controller/APIController.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index 1032ecdc..0f077c40 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -245,6 +245,17 @@ class APIController extends Controller
 
         $otp_mode = $_ENV['OTP_MODE'];
 
+        // check for hardcoded phone number for app store testing
+        if ($phone_number = '639991112233')
+        {
+            $code = '123456';
+            $this->session->setConfirmCode($code)
+                ->setPhoneNumber($phone_number);
+            $em->flush();
+
+            return $res->getReturnResponse();
+        }
+        
         // check if otp_mode is test
         if ($otp_mode == 'test')
         {

From e0bcfefead21dded6971ae249fdd173c8df51826 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Wed, 7 Aug 2019 08:24:09 +0000
Subject: [PATCH 6/8] Fix if statement for the phone number. #246

---
 src/Controller/APIController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index 0f077c40..fcd49749 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -246,7 +246,7 @@ class APIController extends Controller
         $otp_mode = $_ENV['OTP_MODE'];
 
         // check for hardcoded phone number for app store testing
-        if ($phone_number = '639991112233')
+        if ($phone_number == '639991112233')
         {
             $code = '123456';
             $this->session->setConfirmCode($code)

From e3bca2c07d332ee243466808e77c1a84d3c5d698 Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Wed, 7 Aug 2019 22:37:08 +0800
Subject: [PATCH 7/8] Add null checks and set to '' for json data #247

---
 src/Controller/APIController.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index fcd49749..e6b778c7 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -701,11 +701,11 @@ class APIController extends Controller
         $cvs = $cust->getVehicles();
         foreach ($cvs as $cv)
         {
-            $battery_id = null;
+            $battery_id = '';
             if ($cv->getCurrentBattery() != null)
                 $battery_id = $cv->getCurrentBattery()->getID();
 
-            $wty_ex = null;
+            $wty_ex = '';
             if ($cv->getWarrantyExpiration() != null)
                 $wty_ex = $cv->getWarrantyExpiration()->format('Y-m-d');
 
@@ -721,7 +721,7 @@ class APIController extends Controller
                 'color' => $cv->getColor(),
                 'condition' => $cv->getStatusCondition(),
                 'fuel_type' => $cv->getFuelType(),
-                'wty_code' => $cv->getWarrantyCode(),
+                'wty_code' => $cv->getWarrantyCode() ?? $cv->getWarrantyCode() : '',
                 'wty_expire' => $wty_ex,
                 'curr_batt_id' => $battery_id,
                 'is_motolite' => $cv->hasMotoliteBattery() ? 1 : 0,
@@ -1950,12 +1950,15 @@ class APIController extends Controller
         if (!(is_null($warranty->getBatteryModel()))) {
             $batt_model = $warranty->getBatteryModel()->getName();
         }
+
         if (!(is_null($warranty->getBatterySize()))) {
             $batt_size = $warranty->getBatterySize()->getName();
         }
+
         if (!(is_null($warranty->getSAPBattery()))) {
             $sap_batt = $warranty->getSAPBattery()->getID();
         }
+            
         if (!(is_null($warranty->getDateClaim()))) {
             $claim_date = $warranty->getDateClaim()->format("d M Y");
         }
@@ -1965,7 +1968,7 @@ class APIController extends Controller
 
         $warr[] = [
             'id' => $warranty->getID(),
-            'serial' => $warranty->getSerial(),
+            'serial' => $warranty->getSerial() ?? $warranty->getSerial() : '',
             'warranty_class' => $warranty->getWarrantyClass(),
             'plate_number' => $warranty->getPlateNumber(),
             'first_name' => $warranty->getFirstName(),
@@ -1979,7 +1982,7 @@ class APIController extends Controller
             'date_purchase' => $warranty->getDatePurchase()->format("d M Y"),
             'date_expire' => $expiry_date,
             'date_claim' => $claim_date,
-            'claim_from' => $warranty->getClaimedFrom(),
+            'claim_from' => $warranty->getClaimedFrom() ?? $warranty->getClaimedFrom() : '',
             'is_activated' => $warranty->isActivated() ? 1 : 0,
         ];
 

From a703cbf2bf92336d320e04d7f443f1462b0236f1 Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Wed, 7 Aug 2019 17:20:48 +0000
Subject: [PATCH 8/8] Revert "Merge branch
 '247-warranty-data-fixes-for-android' into 'master'"

This reverts merge request !291
---
 src/Controller/APIController.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index e6b778c7..fcd49749 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -701,11 +701,11 @@ class APIController extends Controller
         $cvs = $cust->getVehicles();
         foreach ($cvs as $cv)
         {
-            $battery_id = '';
+            $battery_id = null;
             if ($cv->getCurrentBattery() != null)
                 $battery_id = $cv->getCurrentBattery()->getID();
 
-            $wty_ex = '';
+            $wty_ex = null;
             if ($cv->getWarrantyExpiration() != null)
                 $wty_ex = $cv->getWarrantyExpiration()->format('Y-m-d');
 
@@ -721,7 +721,7 @@ class APIController extends Controller
                 'color' => $cv->getColor(),
                 'condition' => $cv->getStatusCondition(),
                 'fuel_type' => $cv->getFuelType(),
-                'wty_code' => $cv->getWarrantyCode() ?? $cv->getWarrantyCode() : '',
+                'wty_code' => $cv->getWarrantyCode(),
                 'wty_expire' => $wty_ex,
                 'curr_batt_id' => $battery_id,
                 'is_motolite' => $cv->hasMotoliteBattery() ? 1 : 0,
@@ -1950,15 +1950,12 @@ class APIController extends Controller
         if (!(is_null($warranty->getBatteryModel()))) {
             $batt_model = $warranty->getBatteryModel()->getName();
         }
-
         if (!(is_null($warranty->getBatterySize()))) {
             $batt_size = $warranty->getBatterySize()->getName();
         }
-
         if (!(is_null($warranty->getSAPBattery()))) {
             $sap_batt = $warranty->getSAPBattery()->getID();
         }
-            
         if (!(is_null($warranty->getDateClaim()))) {
             $claim_date = $warranty->getDateClaim()->format("d M Y");
         }
@@ -1968,7 +1965,7 @@ class APIController extends Controller
 
         $warr[] = [
             'id' => $warranty->getID(),
-            'serial' => $warranty->getSerial() ?? $warranty->getSerial() : '',
+            'serial' => $warranty->getSerial(),
             'warranty_class' => $warranty->getWarrantyClass(),
             'plate_number' => $warranty->getPlateNumber(),
             'first_name' => $warranty->getFirstName(),
@@ -1982,7 +1979,7 @@ class APIController extends Controller
             'date_purchase' => $warranty->getDatePurchase()->format("d M Y"),
             'date_expire' => $expiry_date,
             'date_claim' => $claim_date,
-            'claim_from' => $warranty->getClaimedFrom() ?? $warranty->getClaimedFrom() : '',
+            'claim_from' => $warranty->getClaimedFrom(),
             'is_activated' => $warranty->isActivated() ? 1 : 0,
         ];