Commit graph

1782 commits

Author SHA1 Message Date
Korina Cordero
ae17b23b2c Adjust the timecheck #392 2020-04-30 07:32:37 +00:00
Korina Cordero
6effa53997 Improve the time checking. #392 2020-04-30 07:26:12 +00:00
Korina Cordero
da16bf54a3 Add scheduleOptionStatus API call. #392 2020-04-30 07:17:34 +00:00
Korina Cordero
b66ebf7eeb Fix when no hubs are found. #392 2020-04-30 07:00:25 +00:00
Korina Cordero
b3b46bca7b Add versionCheck API call. #392 2020-04-30 05:38:41 +00:00
4d7455a058 Merge branch '391-resq-app-changes' into 'master'
Resolve "Resq - App Changes"

Closes #391

See merge request jankstudio/resq!435
2020-04-30 03:19:07 +00:00
Korina Cordero
9921f9d69f Modify rider slots to be normal array. Fix label for the lunch break slot. Rename label. #391 2020-04-30 03:09:21 +00:00
3716a9a881 Merge branch '389-resq-new-api-calls-for-advance-order-slots' into 'master'
Resolve "Resq - new API calls for advance order slots"

Closes #389

See merge request jankstudio/resq!433
2020-04-29 10:52:32 +00:00
f180214876 Merge branch '390-resq-modifications-to-importsapbatterycommand' into 'master'
Resolve "Resq - modifications to ImportSAPBatteryCommand"

Closes #390

See merge request jankstudio/resq!434
2020-04-29 08:43:22 +00:00
Korina Cordero
2a2cde8a2d Modify the message for clarity. #390 2020-04-29 08:24:07 +00:00
Korina Cordero
f030eeef2a Add newRequestJobOrder API call. #389 2020-04-28 09:08:48 +00:00
Korina Cordero
383fc1ee0a Modify input parameter for getNearestHubAndSlots. Add 4-5 PM shift. Add slot id to response. Remove unused code. #389 2020-04-27 09:19:21 +00:00
Korina Cordero
9e9c5759bb Fix issues found during testing for getNearestHubsAndSlots 2020-04-27 07:49:52 +00:00
Korina Cordero
ede1d04123 Add API call to get nearest hubs and slots. #389 2020-04-24 09:32:46 +00:00
53fc34739d Merge branch '384-make-map-tile-server-configurable' into 'master'
Resolve "Make map tile server configurable"

Closes #384

See merge request jankstudio/resq!432
2020-04-23 10:17:53 +00:00
1287fff597 Merge branch '388-resq-jo-details-report-fixes' into 'master'
Resolve "Resq - JO details report fixes"

Closes #388

See merge request jankstudio/resq!431
2020-04-23 09:50:09 +00:00
Korina Cordero
7c4f452a40 Fix serial number in JO details report. #388 2020-04-23 08:16:09 +00:00
70de3bcbae Merge branch '386-resq-comment-out-auto-assign-with-advance-order' into 'master'
Resolve "Resq - comment out auto assign with advance order"

Closes #386

See merge request jankstudio/resq!429
2020-04-23 03:17:23 +00:00
Korina Cordero
61278c81a4 Commented out auto assign advance order JO. #386 2020-04-23 03:15:12 +00:00
38e0b8a204 Merge branch '385-resq-jo-report-changes' into 'master'
Resolve "Resq - JO report changes"

Closes #385

See merge request jankstudio/resq!428
2020-04-22 11:41:34 +00:00
Korina Cordero
47a8f2dec1 Added the requested columns for the JO Details Report. #385 2020-04-22 10:37:16 +00:00
f13fab2344 Add map tiler api key in .env #384 2020-04-22 16:11:31 +08:00
f073baf518 Shift to maptiler and have the api key in the .env #384 2020-04-22 16:10:35 +08:00
Korina Cordero
920400076d Modify the JO Details Report. #385 2020-04-22 07:52:08 +00:00
031e2aa380 Merge branch '383-resq-bug-fixes-for-advance-order' into 'master'
Resolve "Resq - bug fixes for advance order"

Closes #383

See merge request jankstudio/resq!427
2020-04-21 08:38:13 +00:00
Korina Cordero
175b5855d3 Fix typo in JO status. #383 2020-04-21 08:33:15 +00:00
Korina Cordero
da151245c9 Fix typo in JO status. #383 2020-04-21 08:29:05 +00:00
Korina Cordero
a0c4c2f136 Set start time of advance order to 5 PM. #383 2020-04-21 08:23:55 +00:00
Korina Cordero
b4c234e5dd Fix issue of wrong JO status set. Add descriptive notes for JOStatus. #382 2020-04-21 08:12:46 +00:00
Korina Cordero
daa25091db Merge branch 'master' of gitlab.com:jankstudio/resq into 382-resq-earlier-start-time-for-advance-order-for-testing-purposes 2020-04-21 06:45:20 +00:00
Korina Cordero
a55fe79fd6 Set start time of advance job order to 2 PM. #382 2020-04-21 06:44:27 +00:00
5741d891df Merge branch '381-resq-auto-assign-with-advance-order' into 'master'
Resolve "Resq - auto-assign with advance order"

Closes #381

See merge request jankstudio/resq!426
2020-04-21 04:40:48 +00:00
Korina Cordero
b8dbe5eb07 Fix error when saving hub in HubController. #382 2020-04-21 04:13:02 +00:00
Korina Cordero
0f5a6a1863 Fix error when saving hub in HubController. #382 2020-04-21 04:12:04 +00:00
359cd52db9 Merge branch '380-resq-mobile-customer-icon-wrong-color-in-realtime-update' into 'master'
Resolve "Resq - mobile customer icon wrong color in realtime update"

Closes #380

See merge request jankstudio/resq!425
2020-04-21 03:59:08 +00:00
Korina Cordero
21700e7922 Modify auto-assign with advance order, based on code review. #381 2020-04-21 03:23:23 +00:00
Korina Cordero
a7b5bf18ff Add hub assignment for advance order job orders. #381 2020-04-20 13:08:24 +00:00
Korina Cordero
c7af1c1592 Add rider_slots to hub. #381 2020-04-20 03:37:40 +00:00
Korina Cordero
cc055f34f9 Merge branch '380-resq-mobile-customer-icon-wrong-color-in-realtime-update' of gitlab.com:jankstudio/resq into 381-resq-auto-assign-with-advance-order 2020-04-20 01:56:34 +00:00
7dee59782a Merge branch '379-resq-jo-and-jo-event-report' into 'master'
Resolve "Resq - JO and JO Event Report"

Closes #379

See merge request jankstudio/resq!424
2020-04-17 10:32:26 +00:00
Korina Cordero
f33a253cea Add transaction origin to mqtt message. #380 2020-04-17 06:07:32 +00:00
Korina Cordero
a30f9b2ce8 Modify how mobile customer markers are loaded when dashboard map is loaded. #380 2020-04-17 05:17:00 +00:00
Korina Cordero
88a45034f9 Add jo events report. #379 2020-04-16 09:08:35 +00:00
Korina Cordero
3caf23b57d Add job order details report. #379 2020-04-16 07:17:18 +00:00
Korina Cordero
e96fd6d7fb Merge branch '377-resq-bug-fixes' of gitlab.com:jankstudio/resq into 379-resq-jo-and-jo-event-report 2020-04-16 07:16:08 +00:00
Korina Cordero
932bd7c770 Add mobile customer layer to the dashboard map. 2020-04-15 07:32:05 +00:00
0cb3a137fa Merge branch '378-advance-order-auto-assign-algorithm' into 'master'
Resolve "Advance order auto assign algorithm"

Closes #378

See merge request jankstudio/resq!423
2020-04-15 07:18:01 +00:00
b7b38d138b Fix comment for checking advance order #378 2020-04-15 15:17:12 +08:00
7aebe13d1f Have battery services use the findNearestHub method without inventory check #378 2020-04-15 13:12:23 +08:00
5eef2df4e0 Check advance orders within 2 hours of order coming in before auto assigning #378 2020-04-15 13:11:04 +08:00