Commit graph

2179 commits

Author SHA1 Message Date
094ccbe163 Merge branch '498-cmb-rearrange-columns' into '488-cmb-live'
Rearranged the columns for the View pages. #498

See merge request jankstudio/resq!582
2020-09-17 07:38:51 +00:00
Korina Cordero
6dd3068e70 Rearranged the columns for the View pages. #498 2020-09-17 07:37:22 +00:00
8068a662f6 Check active jo before removing it for rider #488 2020-09-16 22:22:26 +08:00
331d483606 Send the mqtt event for cancel directly #488 2020-09-16 21:31:07 +08:00
7152b0f610 Add message to cancel mqtt event #488 2020-09-16 21:15:08 +08:00
1e23764452 Initialize jo_data as null in RAPI call #488 2020-09-16 20:23:36 +08:00
2c4167a093 Set job_order field to null if no ongoing in RAPI call #488 2020-09-16 20:18:07 +08:00
97d8b9e147 Merge branch '495-cmb-rider-cannot-start-second-jo-after-completion-of-first-jo' into '488-cmb-live'
Resolve "CMB - rider cannot start second JO after completion of first JO"

See merge request jankstudio/resq!580
2020-09-16 08:38:20 +00:00
928d5412e5 Merge branch '496-cmb-clear-rider-s-active-jo-when-jo-is-cancelled' into '488-cmb-live'
Clear rider's active job order when JO is cancelled via rider app and admin panel. #496

See merge request jankstudio/resq!579
2020-09-16 08:38:05 +00:00
Korina Cordero
8bcd9b9546 Merge branch '496-cmb-clear-rider-s-active-jo-when-jo-is-cancelled' of gitlab.com:jankstudio/resq into 495-cmb-rider-cannot-start-second-jo-after-completion-of-first-jo 2020-09-16 08:08:12 +00:00
Korina Cordero
2b07a89544 Make explicit setting of active JO to null. #496 2020-09-16 08:07:10 +00:00
Korina Cordero
9ad9de61c7 Set rider's active job order to null after JO completion. #495 2020-09-16 08:05:05 +00:00
Korina Cordero
dbb05b16d9 Clear rider's active job order when JO is cancelled via rider app and admin panel. #496 2020-09-16 07:50:45 +00:00
5661bb4daf Merge branch '490-cmb-add-labels-to-jo-pictures-and-should-be-able-to-click-on-pictures' into '488-cmb-live'
Fix labels for Odometer Reading and Proof of Payment. #490

See merge request jankstudio/resq!578
2020-09-16 06:15:06 +00:00
Korina Cordero
32f2b21dbf Fix labels for Odometer Reading and Proof of Payment. #490 2020-09-16 06:13:43 +00:00
59ecc19ef7 Merge branch '489-cmb-rider-realtime-not-displaying' into '488-cmb-live'
Use new mqtt library and enable reconnect #489

See merge request jankstudio/resq!577
2020-09-15 15:28:02 +00:00
0880a75fa7 Use new mqtt library and enable reconnect #489 2020-09-15 23:25:44 +08:00
40b28e6e4d Merge branch '492-cmb-sort-in-descending-order-view-all-and-view-open' into '488-cmb-live'
Change default sorting to descending order for View All, View Open and View Behind Schedule. #492

See merge request jankstudio/resq!575
2020-09-15 07:54:53 +00:00
Korina Cordero
9019c4b450 Change default sorting to descending order for View All, View Open and View Behind Schedule. #492 2020-09-15 07:36:00 +00:00
b822829b38 Merge branch '490-cmb-add-labels-to-jo-pictures-and-should-be-able-to-click-on-pictures' into '488-cmb-live'
Add labels to JO pictures. Make pictures clickable. #490

See merge request jankstudio/resq!574
2020-09-15 07:07:57 +00:00
Korina Cordero
d69330e744 Add labels to JO pictures. Make pictures clickable. #490 2020-09-15 06:48:30 +00:00
1c1096da17 Merge branch '487-cmb-update-vehicle-current-battery-for-migrated-data' into '472-cmb-release'
Resolve "CMB - update vehicle current battery for migrated data"

See merge request jankstudio/resq!573
2020-09-15 01:24:24 +00:00
Korina Cordero
77bc17d41e Set the last name for migrated customers to LEGACY. #487 2020-09-11 07:50:17 +00:00
Korina Cordero
51cdc6ff15 Add command to set current battery of customer vehicle from migrated data. #487 2020-09-11 06:32:57 +00:00
Korina Cordero
4de3277030 Merge branch '484-cmb-cmb-changes' into '472-cmb-release'
Resolve "CMB - CMB changes"

See merge request jankstudio/resq!569
2020-09-08 03:32:40 +00:00
Korina Cordero
c46fa82b68 Make responsible party field mandatory. Fix issues found for walkin JO. #484 2020-09-08 03:31:22 +00:00
Korina Cordero
dacd9efe01 Merge branch '472-cmb-release' of gitlab.com:jankstudio/resq into 484-cmb-cmb-changes 2020-09-08 02:24:38 +00:00
Korina Cordero
818277159c Remove test hubs and riders. #472 2020-09-07 04:51:35 +00:00
Korina Cordero
5b70085162 Set rider limit to 50. #472 2020-09-07 04:10:02 +00:00
Korina Cordero
92a7380b4f Fix display issue of cancel reason. #472 2020-09-07 03:27:38 +00:00
Korina Cordero
9052f8102c Get name for cancel reason. #472 2020-09-07 03:00:22 +00:00
Korina Cordero
0fb08002e8 Merge branch '484-cmb-cmb-changes' into '472-cmb-release'
Resolve "CMB - CMB changes"

See merge request jankstudio/resq!568
2020-09-07 02:44:09 +00:00
Korina Cordero
399cf23f29 Merge branch '460-cmb-data-migration-for-carfix-data' into '472-cmb-release'
Resolve "CMB - Data migration for Carfix data"

See merge request jankstudio/resq!565
2020-09-07 02:42:34 +00:00
Korina Cordero
ad77e20bd3 Merge branch '460-cmb-data-migration-for-carfix-data' of gitlab.com:jankstudio/resq into 484-cmb-cmb-changes 2020-09-07 02:13:06 +00:00
Korina Cordero
4703cd5080 Remove rider plate number from form. Get plate number from rider. #484 2020-09-07 02:06:20 +00:00
Korina Cordero
ce8e8974bd Add rider plate number to JO. #484 2020-09-04 09:48:50 +00:00
Korina Cordero
171fa14e40 Add job order number to notifications. Add cancel reason to notifications if JO is cancelled. #484 2020-09-04 08:41:20 +00:00
Korina Cordero
5185043934 Merge branch '483-cmb-agent-s-name-in-open-and-view-all' into '472-cmb-release'
Add agent name to the view all and view open JO pages. #483

See merge request jankstudio/resq!567
2020-09-04 08:07:48 +00:00
Korina Cordero
8eebf6ee1c Add invalid mobile numbers to invalid file. #460 2020-09-04 08:07:31 +00:00
Korina Cordero
089bced14c Add agent name to the view all and view open JO pages. #483 2020-09-04 03:14:37 +00:00
Korina Cordero
8c32792c38 Create command to add vehicle manufacturers, vehicles and their compatible batteries. #460 2020-09-02 11:34:50 +00:00
Korina Cordero
49ee85898e Create command to add vehicle manufacturers, vehicles and their compatible batteries. #460 2020-09-02 11:33:17 +00:00
Korina Cordero
b8885edaaa Modify commands for importing battery information. #460 2020-09-02 09:55:45 +00:00
Korina Cordero
9b7fa2048a Add command to create battery manufacturers and models and import battery sizes. #460 2020-09-02 08:36:39 +00:00
Korina Cordero
d0fcbe8cf3 Removed old import carfix data command. #460 2020-09-02 02:46:58 +00:00
Korina Cordero
885d1911a2 Merge branch '472-cmb-release' of gitlab.com:jankstudio/resq into 460-cmb-data-migration-for-carfix-data 2020-09-01 10:01:36 +00:00
Korina Cordero
4e9c503eb2 Add command to migrate the imported CarFix data into CMBLegacyJobOrder. #460 2020-09-01 09:59:49 +00:00
Korina Cordero
ecbd83e3a3 Merge branch '478-cmb-move-adding-removing-rider-to-and-from-cache' into '472-cmb-release'
Set display marker to false when rider is unavailable. #478

See merge request jankstudio/resq!560
2020-08-26 08:56:52 +00:00
Korina Cordero
b31f254c82 Set display marker to false when rider is unavailable. #478 2020-08-26 08:55:53 +00:00
Korina Cordero
f5fa74f945 Merge branch '478-cmb-move-adding-removing-rider-to-and-from-cache' into '472-cmb-release'
Add checking if rider is available. #478

See merge request jankstudio/resq!559
2020-08-26 07:52:30 +00:00