Commit graph

104 commits

Author SHA1 Message Date
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