rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions
2193 commits 749 branches 8 tags 145 MiB
Commit graph

2193 commits

This branch
This branch
All branches
Author SHA1 Message Date
Korina Cordero
b7291e94b1 Change labels for landline ad CarFix Details. #505 2020-09-25 03:16:33 +00:00
Kendrick Chan
1986423230 Merge branch '501-cmb-jo-in-view-open-should-disappear-only-when-completed' into '488-cmb-live' 
JO stays in View Open list until JO has status of completed. #501

See merge request jankstudio/resq!587
 2020-09-18 07:41:10 +00:00
Korina Cordero
7e637bdfc0 JO stays in View Open list until JO has status of completed. #501 2020-09-18 07:16:15 +00:00
Kendrick Chan
e0f41c57c1 Merge branch '498-cmb-rearrange-columns' into '488-cmb-live' 
Add JO ID and status to header to JO form. #498

See merge request jankstudio/resq!586
 2020-09-18 06:41:59 +00:00
Kendrick Chan
9606e9aa1c Merge branch '500-cmb-add-debit-card-to-mode-of-payment' into '488-cmb-live' 
Add debit card to the mode of payment. #500

See merge request jankstudio/resq!585
 2020-09-18 06:41:52 +00:00
Kendrick Chan
075db2312d Merge branch '499-cmb-customer-info-disappears-if-jo-is-advance-order' into '488-cmb-live' 
Remove obj.isAdvanceOrder from the New Customer toggle. #499

See merge request jankstudio/resq!584
 2020-09-18 06:41:39 +00:00
Korina Cordero
a863a5e34b Add JO ID and status to header to JO form. #498 2020-09-18 06:40:15 +00:00
Korina Cordero
86519d79c5 Add debit card to the mode of payment. #500 2020-09-18 06:29:37 +00:00
Korina Cordero
566c5added Remove obj.isAdvanceOrder from the New Customer toggle. #499 2020-09-18 06:24:18 +00:00
Kendrick Chan
012c486602 Merge branch '497-cmb-display-cancellation-reason-in-jo' into '488-cmb-live' 
Add cancellation reason to JO form. #497

See merge request jankstudio/resq!581
 2020-09-17 09:25:22 +00:00
Kendrick Chan
5ef05b3770 Merge branch '498-cmb-rearrange-columns' into '488-cmb-live' 
Fix edit icon for open and behind schedule. #498

See merge request jankstudio/resq!583
 2020-09-17 08:19:06 +00:00
Korina Cordero
25c399eeb2 Revert back to btn-reassign-hub. #498 2020-09-17 08:14:53 +00:00
Korina Cordero
d286ace684 Fix edit icon for open and behind schedule. #498 2020-09-17 08:02:27 +00:00
Kendrick Chan
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
Korina Cordero
6f5246d3e0 Add cancellation reason to JO form. #497 2020-09-17 07:04:03 +00:00
Kendrick Chan
8068a662f6 Check active jo before removing it for rider #488 2020-09-16 22:22:26 +08:00
Kendrick Chan
331d483606 Send the mqtt event for cancel directly #488 2020-09-16 21:31:07 +08:00
Kendrick Chan
7152b0f610 Add message to cancel mqtt event #488 2020-09-16 21:15:08 +08:00
Kendrick Chan
1e23764452 Initialize jo_data as null in RAPI call #488 2020-09-16 20:23:36 +08:00
Kendrick Chan
2c4167a093 Set job_order field to null if no ongoing in RAPI call #488 2020-09-16 20:18:07 +08:00
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
0880a75fa7 Use new mqtt library and enable reconnect #489 2020-09-15 23:25:44 +08:00
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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