Commit graph

1517 commits

Author SHA1 Message Date
Korina Cordero
bf3136da62 Move the arrive function to the service. #311 2020-01-31 08:53:35 +00:00
Korina Cordero
b651d06ec8 Move cancelJobOrder to the service. #311 2020-01-31 08:16:11 +00:00
Korina Cordero
de4bf9f271 Bug fixes for acceptJobOrder. #311 2020-01-31 07:55:26 +00:00
Korina Cordero
becd8d0c17 Move acceptJobOrder to the service. #311 2020-01-31 06:21:35 +00:00
Korina Cordero
35ccaa73c3 Add country code to constructor of RiderAPIHandler service. #311 2020-01-31 06:04:18 +00:00
Korina Cordero
3e5ea688bc Move logout and getJobOrder to the service. #311 2020-01-31 04:22:27 +00:00
Korina Cordero
c3662cd185 Add login to interface. #311 2020-01-30 08:53:56 +00:00
Korina Cordero
cbc99778cd Move login to the service. #311 2020-01-30 08:52:41 +00:00
Korina Cordero
4d104d38e1 Move the register function from controller to service. #311 2020-01-30 07:47:34 +00:00
Korina Cordero
74c239cfd6 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 311-cmb-refactor-rapicontroller-into-a-service 2020-01-30 06:16:02 +00:00
ed606a87af Merge branch '318-error_log-cleanup' into '270-final-cmb-fixes'
Resolve "error_log cleanup"

See merge request jankstudio/resq!364
2020-01-30 04:16:03 +00:00
Korina Cordero
10ecd6298a Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 318-error_log-cleanup 2020-01-30 04:03:44 +00:00
Korina Cordero
dab8986ad1 Remove or comment out error_logs meant for debugging purposes. #318 2020-01-30 00:31:01 +00:00
84293cb45a Merge branch '317-delete-icon-for-battery-in-vehicle-screen' into '270-final-cmb-fixes'
Resolve "Delete icon for battery in vehicle screen"

See merge request jankstudio/resq!362
2020-01-29 11:18:50 +00:00
15ec71d3d0 Merge branch '317-delete-icon-for-battery-in-vehicle-screen' into 'master'
Resolve "Delete icon for battery in vehicle screen"

Closes #317

See merge request jankstudio/resq!361
2020-01-29 11:17:24 +00:00
Korina Cordero
33fdc857f2 Add deletion of battery from vehicle when vehicle has more than one compatible battery. #317 2020-01-29 11:16:07 +00:00
e8e97bcd6b Fix jo link in rider and customer popup in dashboard #270 2020-01-29 19:13:49 +08:00
Korina Cordero
234d993d8f Add deletion of compatible battery from vehicle. #317 2020-01-29 09:03:56 +00:00
41a6801c19 Fix string concat bug in jo tracking page #270 2020-01-29 01:20:40 +08:00
c8157b9509 Add functionality to job order tracking page #270 2020-01-29 01:13:47 +08:00
Ramon Gutierrez
4f1a5f2e5e Merge branch '315-cmb-add-customer-view-of-job-order' into '270-final-cmb-fixes'
Add customer jo tracking view #315

See merge request jankstudio/resq!359
2020-01-28 13:53:00 +00:00
Ramon Gutierrez
e914c6d2e1 Add customer jo tracking view #315 2020-01-28 21:51:32 +08:00
8d45b8e698 Merge branch '314-cmb-add-hub-distance-to-customer-on-one-step-hub-table' into '270-final-cmb-fixes'
Resolve "CMB - add hub distance to customer on one step hub table"

See merge request jankstudio/resq!358
2020-01-28 07:39:51 +00:00
Korina Cordero
bc8ce40b13 Add distance from customer to hub to hub table. #314 2020-01-28 07:24:14 +00:00
Korina Cordero
555bd5ae9a Add Cancel Job Order button to onestep form. #313 2020-01-28 05:20:11 +00:00
Korina Cordero
44276670e1 Merge branch '312-cmb-highlight-selected-hub-and-rider-in-onestep-edit' of gitlab.com:jankstudio/resq into 313-cmb-add-cancel-button-to-onestep-form 2020-01-28 05:04:09 +00:00
Korina Cordero
ffb4551fb1 Update composer lock after running composer require. #312 2020-01-28 05:03:20 +00:00
Korina Cordero
0daf2a2813 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 312-cmb-highlight-selected-hub-and-rider-in-onestep-edit 2020-01-28 03:00:42 +00:00
6dd3f3377e Merge branch '309-replace-63-in-templates-with-proper-country-code' into '270-final-cmb-fixes'
Resolve "Replace +63 in templates with proper country code"

See merge request jankstudio/resq!350
2020-01-28 02:54:08 +00:00
a82cfb2691 Fix bug for dashboard rider #270 2020-01-28 05:55:22 +08:00
9563bd8cb2 Fix dashboard bug for active riders not in the database #270 2020-01-28 05:53:52 +08:00
86b4601bb8 Fix bug in rider cache #270 2020-01-28 05:37:41 +08:00
676bf40004 Merge branch '299-cmb-realtime-map' into '270-final-cmb-fixes'
Resolve "CMB - realtime map"

See merge request jankstudio/resq!354
2020-01-27 20:36:26 +00:00
4719d89368 Add rider cache service #299 2020-01-28 04:32:05 +08:00
bdb306e5e1 Fix bug in mqtt_rider script #299 2020-01-28 04:31:41 +08:00
cc2dd8c7ff Update README.md 2020-01-27 17:41:07 +00:00
95964bf329 Add README.md 2020-01-27 17:40:39 +00:00
Korina Cordero
79b758f547 Fix for rider icons not displaying in map. #312 2020-01-27 06:33:03 +00:00
Korina Cordero
655ead7739 Change color of hubs and riders. #312 2020-01-27 04:30:31 +00:00
Korina Cordero
ce9a1abd6e Merge branch '312-cmb-highlight-selected-hub-and-rider-in-onestep-edit' of gitlab.com:jankstudio/resq into 311-cmb-refactor-rapicontroller-into-a-service 2020-01-27 03:32:16 +00:00
Korina Cordero
879e1129ee Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 311-cmb-refactor-rapicontroller-into-a-service 2020-01-27 03:30:50 +00:00
Korina Cordero
eb9b8bfdd2 Fix bug for onestep edit when user selects another hub but does not select a new rider. #312 2020-01-27 02:24:52 +00:00
2d6193318a Add ability to remove customer markers via status publish #299 2020-01-27 04:04:30 +08:00
a5a95a45d0 Create new mqtt_rider utility script for rider location caching #299 2020-01-27 04:03:53 +08:00
f350b3ebb8 Make command to load active job order cache #299 2020-01-26 02:06:30 +08:00
cba80ddd90 Have active job orders loaded from cache in dashboard map #299 2020-01-26 00:58:00 +08:00
Korina Cordero
adc6cc8c80 Add highlight to selected hub and rider when loading onestepedit form for resq. #312 2020-01-25 10:47:41 +00:00
Korina Cordero
96bed8a49e Add highlight to selected hub and rider when loading onestepedit form. #312 2020-01-25 10:42:26 +00:00
Korina Cordero
6468954316 Display hubs and riders in non-dynamic table for onestep edit. #312 2020-01-25 06:08:14 +00:00
Korina Cordero
fd0738ad57 Merge branch '309-replace-63-in-templates-with-proper-country-code' of gitlab.com:jankstudio/resq into 312-cmb-highlight-selected-hub-and-rider-in-onestep-edit 2020-01-25 01:50:06 +00:00