|
|
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 |
|
|
|
000e530d33
|
Merge branch '148-push-id-api' into 'master'
Resolve "Push id API"
Closes #148
See merge request jankstudio/resq!144
|
2018-06-17 14:35:45 +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 |
|
|
|
997dd91e68
|
Merge branch '146-support-mode-of-payment-in-invoice-generation' into 'master'
Resolve "Support mode of payment in job order api calls"
Closes #146
See merge request jankstudio/resq!143
|
2018-06-17 06:03:06 +00:00 |
|
|
|
7f4f1e440e
|
Add mode of payment field for request jo api call #146
|
2018-06-17 14:01:45 +08:00 |
|
|
|
68c3b8d4cc
|
Merge branch '147-location-support-dummy-api' into 'master'
Resolve "Location support dummy API"
Closes #147
See merge request jankstudio/resq!142
|
2018-06-17 03:24:49 +00: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 |
|
|
|
a9efe274e3
|
Merge branch 'master' of gitlab.com:jankstudio/resq
|
2018-06-16 11:53:15 +08:00 |
|
|
|
79729acf89
|
Add sql folder to gitignore
|
2018-06-16 11:52:38 +08:00 |
|
|
|
c7ebd61305
|
Merge branch '144-command-to-merge-duplicate-vehicles' into 'master'
Resolve "Command to merge duplicate vehicles"
Closes #144
See merge request jankstudio/resq!141
|
2018-06-16 03:52:22 +00:00 |
|
|
|
af407ff4bc
|
Add vehicle:merge command to clear duplicate vehicles #144
|
2018-06-16 11:51:28 +08:00 |
|
|
|
afd7f61da3
|
Merge branch '137-make-sure-number-is-reflected-in-control-center-for-mobile-app-users' into 'master'
Resolve "Make sure number is reflected in control center for mobile app users"
Closes #137
See merge request jankstudio/resq!140
|
2018-06-11 22:02:01 +00:00 |
|
|
|
778436844c
|
Set date cancel for all jo cancel operations #137
|
2018-06-12 06:01:11 +08:00 |
|
|
|
f5b220f55b
|
Merge branch '137-make-sure-number-is-reflected-in-control-center-for-mobile-app-users' into 'master'
Resolve "Make sure number is reflected in control center for mobile app users"
Closes #137
See merge request jankstudio/resq!139
|
2018-06-11 18:30:59 +00:00 |
|
|
|
1101e61f5f
|
Fix order of arguments in substr call to phone number #137
|
2018-06-12 02:30:18 +08:00 |
|
|
|
24687364f2
|
Merge branch '140-display-compatible-batteries-in-edit-vehicle' into 'master'
Resolve "Display compatible batteries in edit vehicle"
Closes #140
See merge request jankstudio/resq!138
|
2018-06-11 15:25:35 +00:00 |
|
|
|
2d29ced74c
|
Add compatible battery list for vehicle edit screen #140
|
2018-06-11 23:24:55 +08:00 |
|
|
|
8a67d23490
|
Merge branch '109-fix-error-message-when-logging-in' into 'master'
Resolve "Fix error message when logging in"
Closes #109
See merge request jankstudio/resq!137
|
2018-06-11 14:30:40 +00:00 |
|
|
|
f78d6da6b3
|
Fix error message appearing for login #109
|
2018-06-11 22:25:39 +08:00 |
|
|
|
c46d43b001
|
Merge branch '138-fix-api-service-history-bug' into 'master'
Resolve "Fix api service history bug"
Closes #138
See merge request jankstudio/resq!136
|
2018-06-11 07:47:20 +00:00 |
|
|
|
0d2e84da06
|
Fix date cancel null bug for service history api call #138
|
2018-06-11 15:45:39 +08:00 |
|
