Commit graph

787 commits

Author SHA1 Message Date
3be0882594 Update static content #162 2018-09-03 15:09:05 +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
cc6c00ab02 Merge branch '162-phase-2-changes' into 'master'
Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!180
2018-08-19 20:59:59 +00: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
21ea4156d5 Merge branch '162-phase-2-changes' into 'master'
Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!179
2018-08-15 07:09:44 +00:00
30e08259db Add apple push notification service #162 2018-08-15 15:09:04 +08:00
c66f78b32f Merge branch '162-phase-2-changes' into 'master'
Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!178
2018-08-15 06:15:13 +00:00
198eab156c Fix apns sender logging #162 2018-08-15 14:14:23 +08:00
ca1781b6c0 Merge branch '162-phase-2-changes' into 'master'
Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!177
2018-08-15 05:04:17 +00: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
d23010399d Merge branch '162-phase-2-changes' into 'master'
Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!176
2018-08-15 02:44:50 +00:00
f720ccd940 Add mqtt send for outlet_assign event #162 2018-08-15 10:43:54 +08:00
a8f72e8ee4 Merge branch '162-phase-2-changes' into 'master'
Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!175
2018-08-15 01:15:17 +00:00
4bb2374d66 Make sure we only send to unique channels when sending user app events #162 2018-08-15 09:14:18 +08:00
e0b98d00fe Merge branch '162-phase-2-changes' into 'master'
Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!174
2018-08-14 15:59:48 +00: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
ea94c08939 Fix logging for mqtt_sender script 2018-08-14 21:55:02 +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
root
1584673e26 Fix mqtt_sender script 2018-08-14 06:42:12 +08:00
4152f00e92 Merge branch '162-phase-2-changes' into 'master'
Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!173
2018-08-13 22:40:46 +00:00
f8f9bb9b7b Add logging capability to mqtt_sender script #162 2018-08-14 06:39:47 +08:00
0bc1100240 Merge branch '162-phase-2-changes' into 'master'
Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!172
2018-08-13 06:53:03 +00: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
e638e63e81 Merge branch '162-phase-2-changes' into 'master'
Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!171
2018-08-13 05:22:27 +00: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
c9980896ec Merge branch '162-phase-2-changes' into 'master'
Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!168
2018-08-10 03:09:25 +00:00
6c63036eea Add dummy has_warranty_doc to rider api jo data #162 2018-08-10 11:08:26 +08:00
e5a6fa17f8 Merge branch '162-phase-2-changes' into 'master'
Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!167
2018-08-10 02:21:48 +00: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