|
|
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 |
|
|
|
43f618a838
|
Add in progress case #133
|
2018-06-06 04:29:15 +08:00 |
|
|
|
3c552b6c82
|
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!130
|
2018-06-05 20:25:09 +00:00 |
|
|
|
352ca77130
|
Add debug info for mqtt client #133
|
2018-06-06 04:24:30 +08:00 |
|
|
|
007d64c08a
|
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!129
|
2018-06-05 20:05:56 +00:00 |
|
|
|
6b40b456fb
|
Fix payment bug for rider api #133
|
2018-06-06 04:05:24 +08:00 |
|
|
|
32722fa479
|
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!128
|
2018-06-05 19:58:58 +00:00 |
|
|
|
8760963570
|
Fix rider image bug #133
|
2018-06-06 03:58:26 +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 |
|
|
|
9dccf7005e
|
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!125
|
2018-06-05 19:28:52 +00:00 |
|
|
|
fbe6c42e50
|
Add mqtt send event to fulfilled, cancelled and driver arrived #133
|
2018-06-06 03:26:24 +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 |
|
|
|
1b648607a8
|
Merge branch '135-fix-fuel-pricing' into 'master'
Resolve "Fix fuel pricing"
Closes #135
See merge request jankstudio/resq!123
|
2018-06-04 00:12:47 +00:00 |
|
|
|
499bc1cd3c
|
Add more debug information for fuel service #135
|
2018-06-04 08:11:52 +08:00 |
|
|
|
e70bd8c39f
|
Merge branch '135-fix-fuel-pricing' into 'master'
Resolve "Fix fuel pricing"
Closes #135
See merge request jankstudio/resq!122
|
2018-06-04 00:00:41 +00:00 |
|
|
|
3bfc8c5c5b
|
Add debug info for refuel #135
|
2018-06-04 07:59:35 +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 |
|
