Commit graph

924 commits

Author SHA1 Message Date
Korina Cordero
ce70966117 Add geofence checking to JO form. #463 2020-08-10 09:03:21 +00:00
Korina Cordero
fb8dabc269 Return only compatible batteries for customer vehicle. #461 2020-08-07 07:05:42 +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
a526b7bee5 Fix issue when user cancels the cancellation. #449 2020-08-04 02:27:44 +00:00
Korina Cordero
2e9a5585d4 Add dropdown for cancellation reasons. #449 2020-08-03 10:58:36 +00:00
Korina Cordero
c3e36ad055 Add fulfill for cancelled job orders. #442 2020-07-28 05:58:21 +00:00
Korina Cordero
fdce6c02a4 Add name to rider label. #424 2020-07-27 09:49:53 +00:00
Korina Cordero
afbe3aa00b Add route to fulfill a cancelled job order. #442 2020-07-23 10:34:01 +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
Korina Cordero
0e69eb4943 Add completeJobOrder and setActiveJobOrder API calls. #421 2020-06-02 09:25:43 +00:00
Korina Cordero
79b19a61f6 Add startJobOrder API call. Add RIDER_START event type. #421 2020-06-02 08:03:31 +00:00
Korina Cordero
dbdde5cdde Change which flag is set when rider logs in and logs out. Add goOnline and goOffline API calls. #421 2020-06-02 03:40:55 +00:00
Korina Cordero
af9be59d8d Change getActiveJobOrders to getAssignedJobOrders. #421 2020-06-01 09:30:28 +00:00
Korina Cordero
2ea0111b1e Add generate invoice API call. #420 2020-06-01 09:15:05 +00:00
Korina Cordero
1842898c11 Add viewActiveJobOrders API call. #420 2020-06-01 06:29:11 +00:00
Korina Cordero
8730ab4ea3 Add viewJobOrderHistory API call to rider api. #420 2020-06-01 04:37:12 +00:00
Korina Cordero
ce2b838ff7 Add RAPIController for CMB. #420 2020-05-29 07:20:00 +00:00
e150bf6181 Merge branch '409-add-analytics-for-forecasting' into 'master'
Resolve "Add analytics for forecasting"

Closes #409

See merge request jankstudio/resq!480
2020-05-26 10:00:27 +00:00
8be67413d4 Add map display to show overlaps #409 2020-05-24 16:09:17 +08:00
06d3aa3b27 Add form for analytics forecasting #409 2020-05-23 23:07:00 +08:00
760f823794 Have graphs for all hubs in list #409 2020-05-22 23:56:51 +08:00
d63dfcabbd Create graphs for hours during the weekday and dates for the year #409 2020-05-21 00:33:32 +08:00
Korina Cordero
adcd9f8c4c Add advance order job orders report. #413 2020-05-20 08:13:42 +00:00
Korina Cordero
c2ca48c402 Add auto assigned job orders report. #412 2020-05-20 07:40:18 +00:00
Korina Cordero
c5eaf348a8 Filter hubs in hubs dropdown to those with flag_hub_view set to true. Add flag_hub_view to Hub entity. Filter JOs whose status are not cancelled or fulfilled. #411 2020-05-20 05:22:08 +00:00
Korina Cordero
ef3f5d5cec Add route to edit hub view form. Remove pdf link from hub view. Filter JOs based on selected hub. #410 2020-05-19 06:55:55 +00:00
Korina Cordero
25997ae11e Add acl, menu item, template, and route for Hub View. #410 2020-05-19 03:30:50 +00:00
616537d055 Add searching for job orders within 5 km of the hub #409 2020-05-18 23:33:16 +08:00
c1a8a5199b Add analytics menu, acl, controller, route, and template #409 2020-05-18 14:31:01 +08:00
Korina Cordero
eebdd40d0a Put advance order fix in APIController. #406 2020-05-13 09:00:46 +00:00
Korina Cordero
092df7dc7e Add status_autoassign to JobOrder entity. Add setting of auto assign status when a JO is requested via API. #406 2020-05-13 08:42:39 +00:00
0871ca1c1e Fix bug with advance order setting wrong variable #405 2020-05-13 10:49:27 +08:00
75b1d157b6 Make sure advance order flag sticks #405 2020-05-13 10:28:52 +08:00
dc744e7117 Fix typo in sprintf #403 2020-05-09 22:32:01 +08:00
1269774c39 Fix typo #403 2020-05-09 22:30:47 +08:00
f059e2b981 Add debug information on next slot #403 2020-05-09 22:29:30 +08:00
7abe34ee8b Deplete next rider slot for scheduled order if it overlaps #403 2020-05-09 22:26:50 +08:00
824f5c3423 Add debug data for existing advance order slots #403 2020-05-09 21:52:17 +08:00
c64a78c4b5 Fix bug in hub rider slots initialization #403 2020-05-09 21:10:44 +08:00
921a7180c8 Fix typo for advance order #403 2020-05-09 21:08:10 +08:00
47333acaef Add debug info for hub rider slots data #403 2020-05-09 20:53:20 +08:00
60846e17d6 Refactor scheduling for advance order #403 2020-05-09 20:47:26 +08:00
2df5bdc080 Fix bug in hub_slots API #399 2020-05-08 17:17:27 +08:00
475d91bc9e Make hub slot computation easier #399 2020-05-08 16:58:36 +08:00
39dc9eff80 Change no hub message for API #399 2020-05-08 14:29:00 +08:00
6476a96c06 Fix advance order setting #399 2020-05-06 18:24:29 +08:00
Korina Cordero
143c471a48 Add report for SMS messages. #397 2020-05-04 08:05:50 +00:00
6abd8cacae Merge branch '394-warranty-expiration-sms-reminder' into 'master'
Have sms search for message_id instead of id #394

Closes #394

See merge request jankstudio/resq!444
2020-05-03 15:03:25 +00:00
0d50c864d6 Have sms search for message_id instead of id #394 2020-05-03 23:02:47 +08:00
89c18eda1c Merge branch '394-warranty-expiration-sms-reminder' into 'master'
Resolve "Warranty expiration sms reminder"

Closes #394

See merge request jankstudio/resq!442
2020-05-03 14:51:59 +00:00
d189b8eb18 Fix SMS delivery receipt functionality #394 2020-05-03 22:50:56 +08:00
7043f0c483 Add message field for version check #395 2020-05-01 15:29:24 +08:00
50e38e1e4b Replace flag_advance_order check with 1 instead of 'true' #395 2020-05-01 14:58:59 +08:00
381323a07e Set some defaults to null in get vehicles #395 2020-05-01 14:29:40 +08:00
Korina Cordero
ce5a9cb79d Fix when name is null when returning customer vehicle info. #393 2020-04-30 08:08:33 +00:00
Korina Cordero
7d4212195d Remove error_log. #392 2020-04-30 07:34:20 +00:00
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
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
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
Korina Cordero
7c4f452a40 Fix serial number in JO details report. #388 2020-04-23 08:16:09 +00:00
Korina Cordero
61278c81a4 Commented out auto assign advance order JO. #386 2020-04-23 03:15:12 +00:00
Korina Cordero
47a8f2dec1 Added the requested columns for the JO Details Report. #385 2020-04-22 10:37:16 +00:00
Korina Cordero
920400076d Modify the JO Details Report. #385 2020-04-22 07:52:08 +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
a55fe79fd6 Set start time of advance job order to 2 PM. #382 2020-04-21 06:44:27 +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
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
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
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
Korina Cordero
5460b216aa Change function name from updateJobOrder to openEditJobOrder. #377 2020-04-15 03:49:31 +00:00
Korina Cordero
4fd8292d2e Fix JO link in dashboard for resq. #377 2020-04-15 03:21:47 +00:00
Korina Cordero
db46e5134f Fix for the JO event logs and status issues when editing a JO. #377 2020-04-14 09:18:13 +00:00
Korina Cordero
ea7908a18e Fix for access. #377 2020-04-14 08:06:17 +00:00
Korina Cordero
7bf9a7435c Bug fix for access. Add API logging to CMB services to avoid breakage. #377 2020-04-14 05:23:21 +00:00
cdbf817db8 Remove permission check for incoming customer vehicle search #374 2020-04-14 12:10:50 +08:00
Korina Cordero
a738aac7e7 Add fix for bug. #374 2020-04-14 02:57:41 +00:00
Korina Cordero
06d0e21b1d Add access to tier 1 to customer vehicle search. #374 2020-04-14 02:48:55 +00:00
Korina Cordero
64b533b2df Add JO event creation and notifications when JO is auto assigned a hub and rider. #374 2020-04-13 02:50:20 +00:00
51ad36b272 Fix bug in api request jo #374 2020-04-11 19:01:04 +08:00
1ee744eba0 Add all other services to auto assign hub / rider #374 2020-04-11 18:37:35 +08:00
9c0f86e588 Filter only open hubs for API autoassign #374 2020-04-11 11:44:45 +08:00
1e23f0cd55 Log API controller responses to enable us to debug #374 2020-04-10 20:18:36 +08:00
Korina Cordero
e1b27dea9a Add branch_code and status_open to hub form. #374 2020-04-08 10:11:43 +00:00
Korina Cordero
917459f228 Comment out call to inventory manager. #374 2020-04-08 09:31:28 +00:00
Korina Cordero
ab6ed4a185 Add auto assignment of hub and rider to APIController. #374 2020-04-08 07:34:28 +00:00
Korina Cordero
6c02c30370 Update function name. Add checking for empty response in getBranchesInventory. #374 2020-04-08 02:32:16 +00:00
Korina Cordero
eb5710b846 Create InventoryManager service to connect to API. #374 2020-04-07 10:10:44 +00:00
Korina Cordero
c62775c990 Moved the autoAssign code into a service. #374 2020-04-07 03:27:39 +00:00
Korina Cordero
9a661763a0 Add auto assign to controller. #374 2020-04-06 09:46:54 +00:00
e3cb53cb78 Merge branch '270-final-cmb-fixes' into 'master'
Resolve "Final CMB Fixes"

Closes #270

See merge request jankstudio/resq!418
2020-04-03 02:54:28 +00:00
Korina Cordero
615b5a3390 Merge branch 'master' of gitlab.com:jankstudio/resq into 329-transition-branch-for-cmb-and-resq-merging 2020-04-03 02:32:07 +00:00
440cf35cf2 Merge branch '366-cmb-access-for-getcustomervehicles-2' into '270-final-cmb-fixes'
Resolve "CMB - access for getCustomerVehicles"

See merge request jankstudio/resq!411
2020-04-03 02:01:49 +00:00
Korina Cordero
1dac0c506e Remove message. #372 2020-04-02 04:01:08 +00:00
Korina Cordero
135ab10cd3 Add to response the list of serials with no warranties. #372 2020-04-02 03:58:21 +00:00
Korina Cordero
719cccf778 Add API call to get warranties when given a list of serial numbers. #372 2020-04-02 03:33:02 +00:00
e4b8e44b06 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 270-final-cmb-fixes 2020-03-05 23:53:24 +08:00