Commit graph

830 commits

Author SHA1 Message Date
Korina Cordero
931a212005 Add assign advance order screens. #509 2020-09-30 08:13:23 +00:00
Korina Cordero
c4bf772f70 Add assign advance order to acl, menu, and route. #509 2020-09-29 10:57:07 +00:00
Korina Cordero
55ac665938 Add edit advance JO. #509 2020-09-29 07:55:35 +00:00
Korina Cordero
a030ec6679 Add routes and templates for advance order. #509 2020-09-29 04:27:11 +00:00
Korina Cordero
5b70085162 Set rider limit to 50. #472 2020-09-07 04:10:02 +00:00
Korina Cordero
08b4b25f4e Return count of unread notifications. #474 2020-08-25 07:21:24 +00:00
Korina Cordero
0aa3780c77 Set unread and fresh flags for notifications. #474 2020-08-24 11:26:05 +00:00
885665f9d3 Add notification entity and service #472 2020-08-23 00:09:19 +08:00
Korina Cordero
526296c8a3 Revert "Merge branch '467-cmb-release-2' into '457-cmb-add-telephone-number-to-search'"
This reverts commit 4874791fed
2020-08-14 11:21:53 +00:00
Korina Cordero
4874791fed Merge branch '467-cmb-release-2' into '457-cmb-add-telephone-number-to-search'
# Conflicts:
#   config/routes/rider.yaml
#   public/assets/js/dashboard_map.js
#   public/assets/js/map_mqtt.js
#   src/Controller/RiderController.php
2020-08-14 10:10:45 +00:00
Korina Cordero
166c4942f1 Add rider name to rider labels. #457 2020-08-14 09:35:57 +00:00
Korina Cordero
b20c61a830 Remove rider name from labels in Dashboard. #457 2020-08-06 08:38:02 +00:00
Korina Cordero
df950006c1 Revert "Merge branch '457-cmb-add-telephone-number-to-search' into 'master'"
This reverts merge request !536
2020-08-05 10:17:40 +00:00
Korina Cordero
46bcf7f209 Fix zoom issue in dashboard map. #424 2020-08-04 08:08:56 +00:00
Korina Cordero
8f6aa72cc0 Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 424-cmb-release 2020-08-04 07:57:15 +00:00
Korina Cordero
8a026ef44a Add fix to dashboard map zoom error. #424 2020-08-04 07:52:27 +00:00
55a4455586 Revert "Add name to rider label. #424"
This reverts commit fdce6c02a4
2020-08-04 05:39:07 +00:00
Korina Cordero
fdce6c02a4 Add name to rider label. #424 2020-07-27 09:49:53 +00:00
655b632849 Fix availability if active jo is closed #424 2020-07-16 15:12:44 +08:00
e79ae22f32 Fix rider available ajax call to rely on active job order #424 2020-07-16 14:40:30 +08:00
2745e0dac0 Fix hardcoded availability of rider in ajax call #424 2020-07-16 14:31:51 +08:00
b24bae3788 Add rider availability ajax call #424 2020-07-16 14:19:16 +08:00
Korina Cordero
4c8ea2f69b Add list of job orders behind schedule. #436 2020-07-15 08:40:30 +00:00
Korina Cordero
6bf4b76486 Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 436-cmb-uat-requests 2020-07-13 02:39:52 +00:00
Korina Cordero
9c2c1e5895 Remove before pictures from job order. Also remove uploadArrive endpoint. #434 2020-07-06 09:10:33 +00:00
Korina Cordero
27f37de489 Fix discount issues. #434 2020-07-03 08:14:12 +00:00
32d3012802 Limit rider schedule to 7 - 4 and 8 - 5 #409 2020-07-01 23:43:24 +08:00
Korina Cordero
e9981b24fa Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 432-cmb-display-details-in-jo 2020-06-29 02:56:08 +00:00
94116a2958 Add time restriction in analytics #409 2020-06-27 07:42:04 +08:00
2803c264ac Allow analytics to be filtered by date range #409 2020-06-25 23:39:46 +08:00
Korina Cordero
42d086ff5d Add sending of mqtt event when JO is assigned to rider. #424 2020-06-22 10:05:01 +00:00
Korina Cordero
a3cf1572f1 Refactor the controller for the API response. #424 2020-06-22 06:41:24 +00:00
Korina Cordero
3abb6f0efb Add verifyJobOrder API call. #424 2020-06-22 03:13:41 +00:00
0d89cab165 Add date_status_change for job order entity and refactor rider api job order data generation #424 2020-06-20 21:19:56 +08:00
b618605849 Fix syntax error #424 2020-06-20 16:43:14 +08:00
943c01e5d9 Add jo perform rider api call for CMB #424 2020-06-20 16:38:08 +08:00
Korina Cordero
6473c2e344 Add getPaymentMethods and getCancelReason API calls to rider API. Add phone_landline to the JO responses. #428 2020-06-19 07:14:12 +00:00
Korina Cordero
332f9687a2 Add getOngoingJobOrder to rider API. #428 2020-06-19 06:19:11 +00:00
Korina Cordero
7a2996d4e5 Add getStatus to rider API. #428 2020-06-19 04:16:45 +00:00
618ccd8d06 Merge branch '421-cmb-new-rider-api' into '424-cmb-release'
Resolve "CMB - new Rider API"

See merge request jankstudio/resq!487
2020-06-16 02:25:17 +00:00
b65893e821 Add aggregate data table for analytics output #409 2020-06-15 13:38:13 +08:00
e13e3c0dd5 Fix bug when no JO comes up for hub in 2018 #409 2020-06-14 18:54:52 +08:00
a2fdb346b3 Refactor schedule solver to solver per weekday and add charts and tables to template #409 2020-06-14 14:12:32 +08:00
Korina Cordero
18081d0903 Add title field to error object. #421 2020-06-12 10:35:20 +00:00
d94e2353b0 Add schedule solver script and run it inside analytics controller #409 2020-06-11 01:15:58 +08:00
Korina Cordero
ce64a1b64d Add uploadArrivePhotos API call. #421 2020-06-08 10:39:57 +00:00
Korina Cordero
b41b5ea29b Modify getJobOrderHistory. #421 2020-06-04 06:02:53 +00:00
Korina Cordero
a0ee7b32bc Add setOdometer API call. Modify url routes for some calls for easier reading. #421 2020-06-04 03:32:05 +00:00
Korina Cordero
b6c54615ad Add api calls: payment, complete, cancel, reject for job orders. #421 2020-06-03 10:34:56 +00:00
0911a1787e Create graph for overlaps #409 2020-06-03 01:18:12 +08:00