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 |
|
|
|
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 |
|
|
|
56e336e829
|
Add redis to APNs sender python script
|
2018-08-05 13:34:06 +08:00 |
|
|
|
503b6334b6
|
Merge branch 'master' of gitlab.com:jankstudio/resq
|
2018-08-05 00:28:47 +08:00 |
|
|
|
cd73d7de9e
|
Fix rider image URL
|
2018-08-05 00:28:28 +08:00 |
|
root
|
f1cfe8f1c1
|
Fix bug in mqtt sender python script
|
2018-08-04 23:41:38 +08:00 |
|
|
|
f0fc433954
|
Daemonize mqtt sender python script
|
2018-08-04 22:59:52 +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 |
|
|
|
73275f99c9
|
Merge branch '161-fix-pricing-for-services' into 'master'
Resolve "Fix pricing for services"
Closes #161
See merge request jankstudio/resq!166
|
2018-07-26 16:43:56 +00: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 |
|
|
|
8e5a7ebc49
|
Merge branch '160-fulfillment-script' into 'master'
Resolve "Fulfillment script"
Closes #160
See merge request jankstudio/resq!165
|
2018-07-26 13:27:28 +00:00 |
|
|
|
dc0f63fb64
|
Create new command for fulfilling pending job orders #160
|
2018-07-26 21:25:56 +08:00 |
|
|
|
aa59a0b89a
|
Merge branch '160-fulfillment-script' into 'master'
Resolve "Fulfillment script"
Closes #160
See merge request jankstudio/resq!164
|
2018-07-26 11:12:02 +00:00 |
|
|
|
c3d2ed3496
|
Add new command for fulfilling old job orders #160
|
2018-07-26 19:10:09 +08:00 |
|
|
|
826f23ed85
|
Merge branch '159-general-fixes-and-tweaking' into 'master'
Resolve "General fixes and tweaking"
Closes #159
See merge request jankstudio/resq!163
|
2018-07-25 19:01:27 +00: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 |
|
|
|
8d08dc9551
|
Add python utilities for redis / mqtt functionality #159
|
2018-07-24 01:31:29 +08:00 |
|
|
|
1f806fb401
|
Merge branch '159-general-fixes-and-tweaking' into 'master'
Resolve "General fixes and tweaking"
Closes #159
See merge request jankstudio/resq!162
|
2018-07-22 18:09:15 +00:00 |
|
