Commit graph

2704 commits

Author SHA1 Message Date
0ababa77c2 Merge branch '621-check-for-null-current-job-order-when-re-assigning-rider-to-jo' into 'master-fix'
Resolve "Check for null current job order when re-assigning rider to JO"

See merge request jankstudio/resq!735
2021-09-09 03:52:47 +00:00
Korina Cordero
8dd06b2d5e Add null check for previous rider when re-assigning rider. #621 2021-09-09 03:40:53 +00:00
8ef2617f87 Merge branch '620-add-new-shift-to-rider-optimization' into 'master-fix'
Add new hour shifts to script. #620

See merge request jankstudio/resq!734
2021-09-08 03:06:40 +00:00
Korina Cordero
89370b4bd0 Add new hour shifts to script. #620 2021-09-08 03:04:31 +00:00
4ea21f7004 Merge branch '620-add-new-shift-to-rider-optimization' into 'master-fix'
Resolve "Add new shift to rider optimization"

See merge request jankstudio/resq!733
2021-09-08 02:23:13 +00:00
Korina Cordero
e820051d0e Add 6 AM-10 PM and 6AM - 12 AM shifts. #620 2021-09-02 09:19:10 +00:00
Korina Cordero
93d4282257 Add 6 AM-7 PM shift schedule. #620 2021-09-01 09:04:31 +00:00
82a49aa7ca Merge branch '618-add-new-events-to-jo-details-and-jo-events-reports' into 'master-fix'
Resolve "Add new events to JO Details and JO Events Reports"

See merge request jankstudio/resq!731
2021-08-24 09:56:34 +00:00
Korina Cordero
55172332ed Merge branch 'master-fix' of gitlab.com:jankstudio/resq into 618-add-new-events-to-jo-details-and-jo-events-reports 2021-08-24 09:17:56 +00:00
e271034331 Merge branch '617-migrate-rider-api' into 'master-fix'
Resolve "Migrate Rider API"

See merge request jankstudio/resq!730
2021-08-24 08:59:04 +00:00
Korina Cordero
6937ffdd6a Add new events to JO details report. #618 2021-08-24 08:58:54 +00:00
Korina Cordero
db4345aa71 Add new events to JO events report. #618 2021-08-24 07:38:18 +00:00
Korina Cordero
940329de28 Set rider's current job order and availability status when reassigning job order. #617 2021-08-23 08:51:12 +00:00
Korina Cordero
7a57ce0fac Fix not sending of rider event. #617 2021-08-23 07:53:47 +00:00
Korina Cordero
473ace4f23 Separate setting of delivery status from calling cancel on JO when cancelling a JO. #617 2021-08-23 06:42:52 +00:00
b433722764 Change mqtt channel for rider app #617 2021-08-22 00:32:09 +08:00
cf12d09ee5 Shift from using active jo to current jo for rider related stuff #617 2021-08-21 21:36:40 +08:00
Korina Cordero
7cd8f2f027 Renamed delivery status for consistency. #617 2021-08-21 09:41:45 +00:00
Korina Cordero
d863158dd6 Add validation to login. #617 2021-08-21 09:17:14 +00:00
fc513a973b Fix rider api user command to only create an api user for riders without it #617 2021-08-21 15:23:46 +08:00
Korina Cordero
25954afe63 Set api role for rider api user. #617 2021-08-21 06:39:12 +00:00
Korina Cordero
ff5e747d7a Set rider's api user. #617 2021-08-21 06:11:23 +00:00
Korina Cordero
ea2f0e639d Add command to create api users from existing riders. #617 2021-08-21 05:55:10 +00:00
c85ad3ab4f Change rider api getRiderFromCAPI to get from direct association instead of metadata #617 2021-08-21 13:13:35 +08:00
7483c35306 Link api user to rider entity directly without need for metadata #617 2021-08-21 13:11:40 +08:00
4a9de8e465 Fix api role edit #617 2021-08-21 00:50:26 +08:00
5dee6d0418 Fix new rider api login data return #617 2021-08-21 00:41:36 +08:00
e7fb5014ff Fix new rider api login #617 2021-08-21 00:05:46 +08:00
973ba8ff00 Add api user link in Rider entity and metadata field for API User #617 2021-08-20 22:45:50 +08:00
Korina Cordero
b5218a3499 Modify capi user checking. #617 2021-08-20 09:56:04 +00:00
Korina Cordero
62c78939a8 Modify rider api routes. #617 2021-08-20 09:11:17 +00:00
Korina Cordero
4f58f38f67 Rename rider controller. #617 2021-08-20 08:54:35 +00:00
Korina Cordero
84ced62f0f Modify login. #617 2021-08-20 08:04:51 +00:00
Korina Cordero
dd34466593 Fixes found during testing. #617 2021-08-19 05:26:16 +00:00
Korina Cordero
27c8cd1f2d Add changeService, getPromos, getBatteries. #617 2021-08-19 03:12:43 +00:00
Korina Cordero
bbee3c4b96 Add available, postHubArrive, postHubDepart. #617 2021-08-19 02:40:31 +00:00
Korina Cordero
bbe0a804ad Add startJobOrder and payment. #617 2021-08-18 10:30:55 +00:00
Korina Cordero
7671b79d2e Add preHubArrive and preHubDepart. #617 2021-08-18 10:10:52 +00:00
Korina Cordero
bcd55901d3 Add arrive and hubDepart. #617 2021-08-18 09:03:39 +00:00
Korina Cordero
5ea4ac013b Add cancelJobOrder. #617 2021-08-18 08:38:08 +00:00
Korina Cordero
1554f173a8 Add delivery status to job order. #617 2021-08-18 08:26:25 +00:00
Korina Cordero
b6f840f5d7 Add acceptJobOrder. #617 2021-08-18 07:54:24 +00:00
Korina Cordero
fc7151be88 Add getJobOrder. #617 2021-08-18 07:28:58 +00:00
Korina Cordero
604f3aa200 Merge branch '612-rider-revamp' of gitlab.com:jankstudio/resq into 617-migrate-rider-api 2021-08-18 07:06:52 +00:00
Korina Cordero
722ec653c5 Add login and logout. #617 2021-08-18 06:57:32 +00:00
Korina Cordero
446065880c Create rider api session entity. Add register for new rider controller. #617 2021-08-18 06:28:19 +00:00
Korina Cordero
55c8c393b2 Add routes for capi rider. #617 2021-08-18 03:35:10 +00:00
Korina Cordero
d78a5ebf80 Add rider current job order field. #612 2021-08-13 08:08:59 +00:00
Korina Cordero
0a6985f6b0 Merge branch 'master-fix' of gitlab.com:jankstudio/resq into 612-rider-revamp 2021-08-13 05:26:17 +00:00
fafb5206bd Merge branch '614-app-crashes-when-getting-hub-timeslots' into 'master-fix'
Resolve "App crashes when getting hub timeslots"

See merge request jankstudio/resq!727
2021-08-13 05:24:05 +00:00