Commit graph

925 commits

Author SHA1 Message Date
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
9ae9a550d0 Add mode_of_payment field to change service call in rider API #159 2018-07-23 02:07:56 +08:00
2ca212e1b7 Merge branch '159-general-fixes-and-tweaking' into 'master'
Resolve "General fixes and tweaking"

Closes #159

See merge request jankstudio/resq!161
2018-07-20 20:35:21 +00: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
ffafa47a95 Merge branch '159-general-fixes-and-tweaking' into 'master'
Resolve "General fixes and tweaking"

Closes #159

See merge request jankstudio/resq!160
2018-07-19 02:04:24 +00:00
2a1f0977c7 Add debug data for mqtt sending to user app #159 2018-07-19 10:03:37 +08:00
292bd8dd80 Merge branch '159-general-fixes-and-tweaking' into 'master'
Resolve "General fixes and tweaking"

Closes #159

See merge request jankstudio/resq!159
2018-07-19 01:48:45 +00:00
b586f6486d Fix cancel bug #159 2018-07-19 09:48:02 +08:00
d05a2d817e Merge branch '157-static-content-for-app' into 'master'
Resolve "Static content for app"

Closes #157

See merge request jankstudio/resq!158
2018-07-09 15:19:30 +00:00
4f106506ba Revise FAQ with proper content #157 2018-07-09 23:18:33 +08:00
cf202605d2 Merge branch '157-static-content-for-app' into 'master'
Resolve "Static content for app"

Closes #157

See merge request jankstudio/resq!157
2018-07-09 13:56:14 +00:00
59ff668ad6 Add static content for user app #157 2018-07-09 21:55:27 +08:00
93c4e82697 Merge branch '155-rider-api-cancel-bug' into 'master'
Resolve "Rider API Cancel Bug"

Closes #155

See merge request jankstudio/resq!156
2018-07-09 08:27:53 +00:00
af45301e98 Inject MQTTClient in cancel jo api call #155 2018-07-09 16:26:52 +08:00
a87bd31c03 Merge branch '154-make-mqtt-client-use-cert' into 'master'
Resolve "Make MQTT client use cert"

Closes #154

See merge request jankstudio/resq!155
2018-07-06 15:47:03 +00:00
550d1e1e02 Modify MQTTClient service to support tls certs #154 2018-07-06 23:46:02 +08:00
6df440f887 Merge branch '153-rider-app-changes' into 'master'
Resolve "Rider app changes"

Closes #153

See merge request jankstudio/resq!154
2018-07-05 07:51:58 +00: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
efee1f98ae Merge branch '152-dispatch-jo-500-error-bug' into 'master'
Resolve "Dispatch JO 500 error bug"

Closes #152

See merge request jankstudio/resq!153
2018-07-05 06:27:21 +00:00
2a814a1976 Remove debug for sql statement #152 2018-07-02 17:17:10 +08:00
959b2c9513 Merge branch '151-rider-api-changes' into 'master'
Resolve "Rider API changes"

Closes #151

See merge request jankstudio/resq!152
2018-07-01 19:31:57 +00:00
53b34a874c Add time to date_schedule field of get job order rider api call #151 2018-07-02 02:32:54 +08:00
add09d6b3d Fix typo excess > #151 2018-07-02 01:55:47 +08:00
322e26afd1 Add mqtt event sending in api controller jo cancel call #151 2018-07-02 01:45:08 +08:00
47f3137ef1 Add pem folder to .gitignore #151 2018-07-02 00:22:56 +08:00
cbdc2fd24e Add sendRiderEvent call for MQTTClient service #151 2018-07-02 00:22:15 +08:00
128dd352d9 Merge branch '150-jo-bug-fixing' into 'master'
Resolve "JO bug fixing"

Closes #150

See merge request jankstudio/resq!151
2018-06-21 18:34:32 +00: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
7a9bfcfa8b Merge branch '148-push-id-api' into 'master'
Resolve "Push id API"

Closes #148

See merge request jankstudio/resq!145
2018-06-17 15:29:26 +00:00