Commit graph

637 commits

Author SHA1 Message Date
71ed134e78 Output csv for rejection report #184 2019-02-26 03:07:56 +08:00
fb15b3e3bc Add new rejection reasons #184 2019-02-26 01:45:26 +08:00
924c00c41f Fix date start and end filtering for rejection report #184 2019-02-24 02:29:50 +08:00
2c8f626aa6 Load data for rejection report in json format #184 2019-02-24 02:09:38 +08:00
Ramon Gutierrez
8b6066bb38 Update template path for rejection report form #184 2019-02-24 00:49:48 +08:00
f59476c2d3 Add routes, acl and template changes for rejection report #184 2019-02-23 23:31:46 +08:00
Korina Cordero
7e7d99d9c9 Add initial changes to script that generates warranties for existing job orders 2019-02-22 05:29:10 -05:00
3d3f386fa3 Add command for populating long / lat fields in job order #186 2019-02-21 15:39:24 +08:00
bc8d01dc6a Add coord_long and coord_lat fields to JobOrder entity #186 2019-02-21 14:40:17 +08:00
Ramon Gutierrez
623c80421a Add route and processing for hub rejections #183 2019-02-12 00:14:15 +08:00
Ramon Gutierrez
345ca27a31 Fix associations for JORejection to JobOrder #183 2019-02-12 00:12:58 +08:00
Ramon Gutierrez
b63695e846 Fix typos on JORejection entity #183 2019-02-11 21:01:57 +08:00
Ramon Gutierrez
9f1c5b9cc9 Add JORejection entity #183 2019-02-11 18:41:05 +08:00
e2ccf1bbc1 Add functionality to save facilitated by fields #181 2019-02-10 20:48:46 +08:00
7ae9fe4e2d Add facilitated by dropdowns for job order form #181 2019-02-09 21:44:35 +08:00
f38b9944c2 Make command sap_battery:import repeatable #178 2019-02-01 18:41:22 +08:00
407f7ad54a Fix check on rider assign to check for RIDER_ASSIGN status instead of ASSIGNED #178 2019-01-31 00:32:09 +08:00
f0d94e034f Add first_name, last_name, and mobile_number fields to warranty #177 2019-01-30 22:12:36 +08:00
1bd5c30875 Fix assign rider so cancelled job orders cannot be assigned #175 2019-01-28 03:16:50 +08:00
4b24454549 Fix dispatch, so cancelled job orders cannot be assigned to a hub #175 2019-01-28 02:44:05 +08:00
a0d611264d Add queue ticket types #175 2019-01-28 01:07:45 +08:00
dbc161d9c9 Fix warranty claim api bug #173 2019-01-22 22:54:04 +08:00
2f30d0c7c3 Update warranty api controller to handle sku instead of model / size for batteries #172 2019-01-21 02:09:16 +08:00
15b7473af7 Add sap battery field to warranty entity #172 2019-01-21 02:08:49 +08:00
85121a973d Update battery api controller, routes and test scripts #172 2019-01-20 17:51:34 +08:00
081d9cb93c Add command to import SAP battery csv #172 2019-01-20 15:38:38 +08:00
86c20036c0 Add SAP battery entities #172 2019-01-20 15:35:30 +08:00
296dedd732 Remove debug error logs #171 2019-01-19 23:45:34 +08:00
bc9cf2a74f Modify claim warranty api call #171 2019-01-10 02:26:42 +08:00
e4cedd9e4d Add get all warranties api call #171 2019-01-10 00:02:24 +08:00
28fdba3872 Merge branch '168-legacy-jo-migration' into 'master'
Resolve "Legacy JO Migration"

Closes #168

See merge request jankstudio/resq!203
2019-01-09 09:05:04 +00:00
bfa39f4640 Add legacy job order and details migration commands #168 2019-01-09 17:01:08 +08:00
d39d554ba1 Add warranty migration for legacy data #168 2019-01-03 05:51:33 +08:00
1f0060d6c5 Fix legacy import command to populate plate_number table via load data infile #168 2018-12-30 00:27:52 +08:00
cdbc7897ca Add legacy battery to current battery translation #168 2018-11-13 17:42:05 +08:00
4c9dba09ba Fix resend confirmation code issue #169 2018-11-13 04:23:17 +08:00
030668e43b Fix plate number cleaning #168 2018-11-07 22:29:08 +08:00
2f32f9666d Adjust computation for services #167 2018-11-06 15:14:22 +08:00
fac78e558d Add plate number warranty API call #166 2018-11-06 01:55:51 +08:00
6771b86d6c Change APIController to abstract class from interface #166 2018-11-06 01:30:52 +08:00
d78e30c9c2 Add battery model and size to warranty and change warranty routes #166 2018-11-06 01:14:19 +08:00
2a24567c4c Merge branch '164-add-api-bundle' into 'master'
Resolve "Add API bundle"

Closes #164

See merge request jankstudio/resq!198
2018-10-25 17:00:23 +00:00
4867f1b6bb Finish warranty api calls #164 2018-10-26 00:58:32 +08:00
9fcae0f05b Add vehicle and battery apis #164 2018-10-25 13:35:27 +08:00
959d2c6efc Add warranty entity, refactor controller, and fix bugs #164 2018-10-24 22:20:45 +08:00
0d41b46ee9 Refactor api bundle to use security to handle authentication #164 2018-10-23 02:11:21 +08:00
28db60e92d Remove google maps distance and eta calculations #165 2018-10-18 21:39:39 +08:00
2b9499861b Add catalyst api bundle and test controller #164 2018-10-15 01:19:29 +08:00
77d6d146c0 Add CSAT field to form and entity #163 2018-10-03 01:08:08 +08:00
4df0e0e5ec Fix bug in rider report command #162 2018-09-28 10:31:07 +08:00
b2d680ae64 Support test phone number for iphone / android testing #162 2018-09-28 09:46:52 +08:00
89d6949015 Add resq inquiry ticket type #162 2018-09-23 15:53:38 +08:00
bad555fbd1 Change closest hub display limit to 50 #162 2018-09-23 15:08:59 +08:00
3a29f2250d Merge branch '162-phase-2-changes' into 'master'
Modify rider report to accept date range #162

Closes #162

See merge request jankstudio/resq!192
2018-09-17 15:25:39 +00:00
7e38f7a719 Modify rider report to accept date range #162 2018-09-17 12:34:37 +08:00
542a1de9c1 Merge branch '162-phase-2-changes' into 'master'
Add dispatch time to rider time report #162

Closes #162

See merge request jankstudio/resq!191
2018-09-14 08:00:34 +00:00
a0a1c664c2 Add dispatch time to rider time report #162 2018-09-14 15:59:51 +08:00
a7fa81e902 Merge branch '162-phase-2-changes' into 'master'
Limit rider time report to anything above september 5 #162

Closes #162

See merge request jankstudio/resq!190
2018-09-14 06:59:50 +00:00
7382b4333c Limit rider time report to anything above september 5 #162 2018-09-14 14:59:06 +08:00
fa55f0c1ed Merge branch '162-phase-2-changes' into 'master'
Add report:rider-time command #162

Closes #162

See merge request jankstudio/resq!189
2018-09-14 06:50:21 +00:00
9efb6ae20f Add report:rider-time command #162 2018-09-14 14:49:17 +08:00
49977c1501 Merge branch '162-phase-2-changes' into 'master'
Set closest hubs limit to 30 #162

Closes #162

See merge request jankstudio/resq!188
2018-09-12 23:32:32 +00:00
9d5f880a14 Set closest hubs limit to 30 #162 2018-09-13 07:29:39 +08:00
root
4464edc803 Support new rider app has_motolite and flag_coolant format 2018-09-10 00:08:38 +08:00
root
d84a156a02 Add support for has_motolite and flag_coolant in change service rider api call 2018-09-08 19:28:15 +08:00
9ca197f33f Fix assitance spelling #162 2018-09-07 21:29:09 +08:00
3ad32605fe Add support for coolant and non-coolant overheat service #162 2018-09-07 03:27:56 +08:00
1c53556713 Highlight mobile app sourced job orders in dispatch table #162 2018-09-03 15:57:03 +08:00
root
e7fd6cb9d1 Fix battery image issue for under warranty 2018-09-02 23:19:03 +08:00
root
45a84d1cc8 Fix edit invoice bug for rider api 2018-08-27 03:57:44 +08:00
63a3136d77 Have invoice creator recognize motolite batteries in vehicles and give free services for them 2018-08-20 04:01:38 +08:00
317ac19c52 Only allow ios push messages to go through APNS client service #162 2018-08-17 03:34:46 +08:00
30e08259db Add apple push notification service #162 2018-08-15 15:09:04 +08:00
e3a0e8e23c Have hub reassign and rider reassign send mqtt events to rider and user app #162 2018-08-15 12:59:57 +08:00
4b635631ba Change mqtt event when rider cancels to outlet_assign #162 2018-08-15 11:24:26 +08:00
f720ccd940 Add mqtt send for outlet_assign event #162 2018-08-15 10:43:54 +08:00
4bb2374d66 Make sure we only send to unique channels when sending user app events #162 2018-08-15 09:14:18 +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
bbeb3be10d Make sure batt_id is null in change service rider api call 2018-08-14 23:45:27 +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
5a37941ed5 Merge branch '162-phase-2-changes' into 'master'
Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!170
2018-08-10 15:01:33 +00:00
0a476f245a Fix json_encode issue with decimal / integer encoding #162 2018-08-10 23:00:47 +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
6c63036eea Add dummy has_warranty_doc to rider api jo data #162 2018-08-10 11:08:26 +08:00
93da2003f0 Add privacy flags in get user info api call #162 2018-08-10 10:21:02 +08:00
a74e73f99c Add skeleton method for hub arrive rider api call #162 2018-08-10 08:54:23 +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
28b298dbb4 Add event log entries for rider api events #162 2018-08-09 04:53:09 +08:00
df709aa353 Add delivery_address and delivery_instructions to rider status user api call #162 2018-08-09 03:36:27 +08:00
f2d83dca43 Add in transit status job orders to open list #162 2018-08-09 02:46:58 +08:00
b4b18e5d3d Have rider api cancel job order requeue the job order for reassignment instead #162 2018-08-09 02:06:33 +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
165e59e1a1 Fix job order switch service bug 2018-08-03 14:29:26 +08:00
root
021a6df352 Fix job order cancel bug 2018-07-30 17:13:12 +08:00
2fe3448e8f Change pricing for tire repair service #161 2018-07-27 00:43:02 +08:00
397f3d144a Update prices for refuel and overheat services #161 2018-07-27 00:24:10 +08:00
dc0f63fb64 Create new command for fulfilling pending job orders #160 2018-07-26 21:25:56 +08:00
c3d2ed3496 Add new command for fulfilling old job orders #160 2018-07-26 19:10:09 +08:00
5ed3a2e447 Refactor fulfill jo to belong in entity #159 2018-07-26 02:58:19 +08:00
098df69949 Refactor cancel job order process #159 2018-07-25 23:03:32 +08:00
9ae9a550d0 Add mode_of_payment field to change service call in rider API #159 2018-07-23 02:07:56 +08:00
2925ec3df3 Add trade_in_type output to get job order call in rider api #159 2018-07-21 04:34:23 +08:00
863bf56453 Add trade_in_type to job order so rider app can differentiate #159 2018-07-21 04:05:51 +08:00
root
d455a20e70 Pad mobile number with '63' before sending to rider API 2018-07-20 17:24:02 +08:00
root
b7bb0cdaf9 Fix MQTT to Redis to python backend 2018-07-19 11:54:05 +08:00
2a1f0977c7 Add debug data for mqtt sending to user app #159 2018-07-19 10:03:37 +08:00
b586f6486d Fix cancel bug #159 2018-07-19 09:48:02 +08:00
af45301e98 Inject MQTTClient in cancel jo api call #155 2018-07-09 16:26:52 +08:00
550d1e1e02 Modify MQTTClient service to support tls certs #154 2018-07-06 23:46:02 +08:00
584652d31d Unrequire batt_id and trade_in for change service rider api call and add or_num #153 2018-07-05 15:49:22 +08:00
052f3dfe62 Add or number to JobOrder entity #153 2018-07-05 15:19:44 +08:00
2a814a1976 Remove debug for sql statement #152 2018-07-02 17:17:10 +08:00
53b34a874c Add time to date_schedule field of get job order rider api call #151 2018-07-02 02:32:54 +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
efb7d75913 Fix and refactor how invoice is updated for job order open edit #150 2018-06-22 02:30:22 +08:00
2e91da2bb9 Merge branch '143-add-missing-fields-in-jo-pdf' into 'master'
Resolve "Add missing fields in JO PDF"

Closes #143

See merge request jankstudio/resq!150
2018-06-18 10:18:02 +00:00
Ramon Gutierrez
c6cb9b4d98 Change assignedby to processedby for dispatcher name field #143 2018-06-18 18:13:25 +08:00
7b994ab2c3 Merge branch '143-add-missing-fields-in-jo-pdf' into 'master'
Resolve "Add missing fields in JO PDF"

Closes #143

See merge request jankstudio/resq!149
2018-06-18 09:25:04 +00:00
Ramon Gutierrez
65f147886e Add null checks for remaining pdf fields #143 2018-06-18 17:23:35 +08:00
104d60082e Merge branch '143-add-missing-fields-in-jo-pdf' into 'master'
Resolve "Add missing fields in JO PDF"

Closes #143

See merge request jankstudio/resq!147
2018-06-18 07:30:54 +00:00
Ramon Gutierrez
f41dafd293 Change null check format for getPromo #143 2018-06-18 15:21:09 +08:00
Ramon Gutierrez
c9d6b232ee Add null check for promo type #143 2018-06-18 15:20:23 +08:00
7a7aee4dd6 Merge branch '143-add-missing-fields-in-jo-pdf' into 'master'
Resolve "Add missing fields in JO PDF"

Closes #143

See merge request jankstudio/resq!146
2018-06-18 06:55:00 +00:00
899f963773 Corrected nullable device_push_id #148 2018-06-17 17:59:04 +08:00
59f41e5f55 Allow null values in device_push_id #148 2018-06-17 17:57:48 +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
Ramon Gutierrez
352dcf2809 Add missing fields to jo pdf #143 2018-06-17 00:34:25 +08:00
af407ff4bc Add vehicle:merge command to clear duplicate vehicles #144 2018-06-16 11:51:28 +08:00
778436844c Set date cancel for all jo cancel operations #137 2018-06-12 06:01:11 +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
0fdb942134 Merge branch '95-jo-print' into 'master'
Resolve "JO print"

Closes #95

See merge request jankstudio/resq!135
2018-06-10 08:13:52 +00: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