Commit graph

1600 commits

Author SHA1 Message Date
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
Korina Cordero
3eb7c2c426 Update RAPIController.php 2020-01-25 01:31:18 +00:00
Korina Cordero
5279e88618 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 312-cmb-highlight-selected-hub-and-rider-in-onestep-edit 2020-01-25 01:23:52 +00:00
9e00c3f115 Fix publishing and subscribing for new / updated JOs #299 2020-01-25 05:11:53 +08:00
c753be54cb Refactor dashboard map js to use classes #299 2020-01-25 01:57:15 +08:00
66be351bd3 Make MQTT key configurable #299 2020-01-24 20:46:25 +08:00
Korina Cordero
c9185e6139 Bug fixes for RAPIController. #309 2020-01-24 08:48:16 +00:00
Korina Cordero
8e613a43b1 Bug fixes from merge. Remove hardcoded country code prefixes from onestep form. #309 2020-01-24 06:22:12 +00:00
Korina Cordero
5a138ce09f Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 309-replace-63-in-templates-with-proper-country-code 2020-01-24 05:37:30 +00:00
a99f1223b0 Merge branch '309-replace-63-in-templates-with-proper-country-code' into 'master'
Resolve "Replace +63 in templates with proper country code"

Closes #309

See merge request jankstudio/resq!349
2020-01-24 04:07:50 +00:00
Korina Cordero
69f0612a2d Replace hardcoded country code prefixes with variables set in .env and messages files. #309 2020-01-24 04:05:48 +00:00
ce0d0fb29c Add initial job order active cache that listens to JobOrder entity events #299 2020-01-24 03:21:14 +08:00
fe7cfe6c86 Refactor RedisClientProvider #299 2020-01-24 03:19:51 +08:00
fb52b59ad9 Refactor mqtt sender script #299 2020-01-24 03:17:42 +08:00
0297d66dd5 Merge branch '299-cmb-realtime-map' into '270-final-cmb-fixes'
Resolve "CMB - realtime map"

See merge request jankstudio/resq!348
2020-01-23 10:18:24 +00:00
68a92b2daf Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 299-cmb-realtime-map 2020-01-23 18:17:10 +08:00
1545f62325 Merge branch '308-cmb-move-warranty-creation-to-the-warranty-handler-for-cmbjoborderhandler' into '270-final-cmb-fixes'
Move warranty creation when JO is fulfilled to the warranty handler for CMB. #308

See merge request jankstudio/resq!347
2020-01-23 10:16:21 +00:00
Korina Cordero
2c9f5180e3 Move warranty creation when JO is fulfilled to the warranty handler for CMB. #308 2020-01-23 07:47:32 +00:00