Commit graph

166 commits

Author SHA1 Message Date
3df29fc842 Add special number for app store testing #246 2019-08-07 16:06:10 +08:00
Korina Cordero
bccbeda83a Remove the time element from date purchase, date expiry, and date claim. #245 2019-08-07 05:55:52 +00:00
a0c8f01c4b Revert "Merge branch '243-limit-nearest-partner-api-call-to-5' into 'master'"
This reverts merge request !286
2019-08-05 15:28:53 +00:00
2e95ac301e Hardcode limit of 5 to getting nearest partners API call #243 2019-08-05 17:41:20 +08:00
Korina Cordero
cb6899bfe8 Fix for undefined variable bug. Declare average_rating outside if statement. #241 2019-08-02 02:30:55 +00:00
Korina Cordero
580f79b6ef Fix the query for mobile policy in updateInfo. #239 2019-07-31 07:17:45 +00:00
Korina Cordero
6655869c4f Activate all warranties found for a plate number. #238 2019-07-31 02:19:46 +00:00
Korina Cordero
31dd5c4cf2 Add checking for otp mode for sending of confirmation code. #237 2019-07-30 03:55:50 +00:00
Korina Cordero
a18654b0d1 Add OTP_MODE variable to .env.dist. Modify checking for the confirmCode to set, depending on the value of OTP_MODE. #237 2019-07-29 05:33:12 +00:00
Korina Cordero
3c460b86c9 Use the env vars for the policy in the command. Improve the queries for privacy policy. #235 2019-07-25 03:19:20 +00:00
Korina Cordero
06adce710f Add policy ids to the .env.dist file. Modify the query to get policy in the APIController. #233 2019-07-25 00:42:40 +00:00
Korina Cordero
b657ae95d5 Add setting of privacy policy for customer when user updates info for mobile session and when user sends privacy settings for third party and promo. #233 2019-07-24 08:45:52 +00:00
Korina Cordero
fef70c36a4 Add average_rating for partner. #228 2019-07-22 04:12:20 +00:00
b87242e356 Fix findWarranty bug in API controller #232 2019-07-21 09:50:57 +08:00
da32614181 Add partner review api call #231 2019-07-20 15:15:47 +08:00
899f9df721 Remove mobile_session from review information in mobile api #231 2019-07-20 12:51:52 +08:00
7a8ff5bf42 Add longitude and latitude to partner information in mobile API calls #231 2019-07-20 12:45:28 +08:00
f1f1d9253b Remove partner list from get services mobile api call #231 2019-07-20 10:29:52 +08:00
Korina Cordero
6cde81f0ab Fix conflicts with API Controller #227 2019-07-16 00:20:22 +00:00
Korina Cordero
189bb58880 Fix merge conflicts with master. #227 2019-07-15 23:51:49 +00:00
Korina Cordero
e8b76e8810 Add getClosestPartners method to the APIController that takes in a longitude, latitude, results limit, and service id to find the closes partners. #228 2019-07-08 06:57:24 +00:00
Korina Cordero
5c70cad362 Add API call to get details and reviews for a given partner. #228 2019-07-07 09:28:18 +00:00
Korina Cordero
4782bd7fe8 Add API call to list other services. #228 2019-07-07 08:29:22 +00:00
Korina Cordero
79b0d3082d Fix typo when calling getBatterySize(). #227 2019-07-03 02:56:35 +00:00
Korina Cordero
13b955d0b6 Add route to activate warranty. Move the code to search for warranty to a separate function. Fix bug in Warranty entity when setting flag_activated. #227 2019-07-02 09:15:06 +00:00
Korina Cordero
48b509ad43 Return warranty information with customer vehicle information for job order history. #227 2019-07-02 07:42:22 +00:00
Korina Cordero
1573ec0aa4 Return warranty information with customer vehicle information. #227 2019-07-02 07:17:38 +00:00
e4062b94f3 Remove geofence functionality #226 2019-06-27 15:13:29 +08:00
Korina Cordero
e61d77ad8b Remove checking for rider validity. Add call to RiderTracker service from the APIController. #180 2019-04-29 02:16:03 +00:00
b988abd852 Change error message for geofence error in mobile app #199 2019-04-02 12:06:55 +08:00
27372264e9 Add geofence check for job order request api call #141 2019-03-11 01:32:52 +08:00
4c9dba09ba Fix resend confirmation code issue #169 2018-11-13 04:23:17 +08:00
b2d680ae64 Support test phone number for iphone / android testing #162 2018-09-28 09:46:52 +08:00
root
e7fd6cb9d1 Fix battery image issue for under warranty 2018-09-02 23:19:03 +08:00
dbe152598f Merge branch 'master' of gitlab.com:jankstudio/resq into 162-phase-2-changes 2018-08-14 23:58:41 +08:00
2aa765d186 Allow rating of -1 for cancel rating for rider rating user api call #162 2018-08-14 23:58:00 +08:00
root
0cc667dbec Merge branch 'master' of https://gitlab.com/jankstudio/resq
Conflicts:
	utils/mqtt_sender/mqtt_sender.py
2018-08-14 13:52:30 +08:00
b5c67f1c91 Revert typecasting for now #162 2018-08-13 14:50:44 +08:00
root
b3eb68346f Revert to regular json_encode because auto int conversion sucks 2018-08-13 14:34:47 +08:00
051521679e Disable sending of MQTT message to user app when user cancels via api #162 2018-08-13 05:08:09 +08:00
fa659226bc Mark JO as rider rated when post rider rating api call is used #162 2018-08-13 05:01:33 +08:00
f47e280b37 Display latest JO without rider rating in rider status api call #162 2018-08-13 04:49:21 +08:00
ff8e4090ae Merge branch 'master' of gitlab.com:jankstudio/resq into 162-phase-2-changes 2018-08-13 04:14:14 +08:00
1a44d28290 Create query for last fulfilled job order for rider status api call #162 2018-08-13 04:13:50 +08:00
fcaa8c3537 Merge branch '162-phase-2-changes' into 'master'
Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!169
2018-08-10 14:17:25 +00:00
7237441ec3 Add rider rating flag to JO and modify jo get invoice api call #162 2018-08-10 22:06:52 +08:00
root
e87ed1a72d Fix get rider status api call bug 2018-08-10 15:31:02 +08:00
93da2003f0 Add privacy flags in get user info api call #162 2018-08-10 10:21:02 +08:00
bbc6989a66 Add jo invoice user api call #162 2018-08-10 08:06:29 +08:00
5b323e155b Add event log entries for user api JO calls #162 2018-08-09 05:39:13 +08:00
57eef0a0a4 Replace filler confirmation code with randomly generated one in user api #162 2018-08-09 05:15:50 +08:00
df709aa353 Add delivery_address and delivery_instructions to rider status user api call #162 2018-08-09 03:36:27 +08:00
7faaf403bf Add delivery_address and delivery_instructions fields for request jo api call 2018-08-08 04:05:10 +08:00
cd73d7de9e Fix rider image URL 2018-08-05 00:28:28 +08:00
098df69949 Refactor cancel job order process #159 2018-07-25 23:03:32 +08:00
863bf56453 Add trade_in_type to job order so rider app can differentiate #159 2018-07-21 04:05:51 +08:00
322e26afd1 Add mqtt event sending in api controller jo cancel call #151 2018-07-02 01:45:08 +08:00
cbdc2fd24e Add sendRiderEvent call for MQTTClient service #151 2018-07-02 00:22:15 +08:00
2fa2ad964e Add phone_id and update device_push_id field for mobile session #148 2018-06-17 17:03:34 +08:00
7f4f1e440e Add mode of payment field for request jo api call #146 2018-06-17 14:01:45 +08:00
3f616a8283 Add dummy location support API #147 2018-06-17 11:23:06 +08:00
1101e61f5f Fix order of arguments in substr call to phone number #137 2018-06-12 02:30:18 +08:00
0d2e84da06 Fix date cancel null bug for service history api call #138 2018-06-11 15:45:39 +08:00
7789ec7ec6 Removed priv_promo being required in privacy settings api call #136 2018-06-07 03:10:25 +08:00
7aef4c72cf Merge branch '133-fix-alerts-for-ios-app-from-rider-app-initiated-events' into 'master'
Resolve "Fix alerts for ios app from rider app initiated events"

Closes #133

See merge request jankstudio/resq!131
2018-06-05 20:29:57 +00:00
43f618a838 Add in progress case #133 2018-06-06 04:29:15 +08:00
d521d5ff8e Merge branch '133-fix-alerts-for-ios-app-from-rider-app-initiated-events' into 'master'
Resolve "Fix alerts for ios app from rider app initiated events"

Closes #133

See merge request jankstudio/resq!127
2018-06-05 19:52:32 +00:00
8fb28c2710 Add case for in transit #133 2018-06-06 03:51:55 +08:00
fec66d3725 Merge branch '133-fix-alerts-for-ios-app-from-rider-app-initiated-events' into 'master'
Resolve "Fix alerts for ios app from rider app initiated events"

Closes #133

See merge request jankstudio/resq!126
2018-06-05 19:48:12 +00:00
bee2d83605 Add in transit to list of pending jos for ios app #133 2018-06-06 03:47:20 +08:00
61681e9344 Merge branch '135-fix-fuel-pricing' into 'master'
Resolve "Fix fuel pricing"

Closes #135

See merge request jankstudio/resq!124
2018-06-04 00:16:34 +00:00
54f04a9ae2 Add debug information #135 2018-06-04 08:15:53 +08:00
07dbaed89e Merge branch '135-fix-fuel-pricing' into 'master'
Resolve "Fix fuel pricing"

Closes #135

See merge request jankstudio/resq!121
2018-06-03 23:49:21 +00:00
8b5141385c Add customer vehicle to invoice criteria #135 2018-06-04 07:48:29 +08:00
6c77e77e2a Add filter for flag_mobile in app API #134 2018-06-04 05:49:26 +08:00
e93fec2811 Merge branch 'master' into 111-sms-feature-for-security-code
Conflicts:
	src/Controller/APIController.php
2018-05-25 10:42:13 +08:00
955f0e4d46 Add rising tide sms service #111 2018-05-25 01:36:34 +08:00
be5a66e68a Add mobile api privacy settings call #130 2018-05-23 22:40:44 +08:00
7d3873022e Add mobile api resend code #130 2018-05-23 22:04:53 +08:00
82fc9f3948 Make mobile api use vehicle model formatting method #128 2018-05-23 19:06:47 +08:00
7e53a4d6de Add rider rating comment feature #120 2018-05-21 01:23:59 +08:00
5498119ab3 Add setMaxResults(1) to assure single result in dupe customer query #116 2018-05-20 14:22:51 +08:00
8b8d819910 Check for existing customers for the same number and merge for mobile API #116 2018-05-20 13:48:06 +08:00
365de1c66d Set customer mobile phone on update info #118 2018-05-20 01:54:41 +08:00
05959d5734 Add service_type to rider status #110 2018-05-02 21:39:45 +08:00
4652a82fff Support new services #110 2018-05-02 21:12:49 +08:00
ae153c60b0 Add image_url to get estimate api call #107 2018-05-01 21:01:38 +08:00
2f68a184e7 Add setDateFulfill when jo is fulfilled #107 2018-04-29 14:25:34 +08:00
921aa9bb66 Fix date fulfilled typo / bug #107 2018-04-29 14:21:30 +08:00
1b3c0409df Add workaround for battery images in mobile app #107 2018-04-29 12:12:22 +08:00
14976361b9 Rename variable stype_id to service_type for more consistency #104 2018-04-24 20:08:12 +08:00
32d6c7238c Add update device id api call #104 2018-04-21 00:00:53 +08:00
bb3ac8ecd4 Add jo history api call and fix estimate and request jo to use new criteria system #104 2018-04-20 23:39:19 +08:00
8d1554a4b9 Add transaction origin / source to job order templates, controllers and entity #UAT 2018-03-10 01:44:43 +08:00
4120677cb0 Add service type to invoice criteria calls #43 2018-03-08 03:13:27 +08:00
7ef92bad99 Change getOutlet to getHub for get rider call #41 2018-03-07 22:11:55 +08:00
ad04131515 Add Tier 1 and Tier 2 notes #33 2018-03-01 04:15:44 +08:00
2039ec9b3a Add job order cancel API call #20 2018-02-22 00:43:45 +08:00
6ec9f76d4d Add post rider rating API #18 2018-02-21 21:53:06 +08:00
93b62a37a2 Add rider details in API rider status call 2018-02-07 21:47:29 +08:00