Commit graph

1334 commits

Author SHA1 Message Date
16b136b0d3 Make sure blank job_order is in data for get ongoing job order rider api call #424 2020-06-23 00:10:08 +08:00
Korina Cordero
9d41ecb228 Add fix for security checking for verifyJobOrder. #424 2020-06-22 11:39:58 +00:00
Korina Cordero
47eaa6488f Add display name for payment method in rider API JO data. #424 2020-06-22 10:56:41 +00: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
0f0169cff4 Fix return value for verifyJobOrder. #424 2020-06-22 04:32:58 +00:00
Korina Cordero
db4ab726ab Fix bug in completeJobOrder. #424 2020-06-22 04:00:08 +00:00
Korina Cordero
2f8dca3dbc Fix responses for verifyJobOrder. #424 2020-06-22 03:45:50 +00:00
Korina Cordero
3abb6f0efb Add verifyJobOrder API call. #424 2020-06-22 03:13:41 +00:00
cbaf1ed6a6 Fix customer signature issue #424 2020-06-21 20:08:27 +08:00
eb2d173ea7 Add email and customer signature to complete call in rider api #424 2020-06-21 19:14:30 +08:00
2b13adffa0 Add customer email to jo details in rider api #424 2020-06-21 17:04:41 +08:00
f519ec01dc Set paid status in payment call in rider api #424 2020-06-21 16:46:11 +08:00
1e3b621a91 Send null for extra images if blank for rider api #424 2020-06-21 16:27:43 +08:00
d59174d721 Replace speedomtr with speedometer #424 2020-06-21 16:26:10 +08:00
4ec5ddd993 Add mode of payment to payment in rider api #424 2020-06-21 15:52:34 +08:00
fe363e1df6 Add request object to format job order data method #424 2020-06-21 14:49:31 +08:00
60323acce3 Add request to URL extra image generation #424 2020-06-21 14:48:27 +08:00
ce9a2f42b9 Add images and odometer to JO info #424 2020-06-21 14:44:10 +08:00
391909c493 Fix typo in job order status constant #424 2020-06-21 10:27:24 +08:00
59e6e9eb5c Support null date_status_change for rider api #424 2020-06-20 21:49:35 +08:00
5e75608402 Add date_status_change to job order data in rider api #424 2020-06-20 21:41:21 +08: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
ef7e362c7d Fix syntax bugs #424 2020-06-20 16:46:00 +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
5b96e03557 Add other_images parameter to upload photos API calls. #428 2020-06-19 11:33:49 +00: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
Korina Cordero
0f06ca7339 Add saving of JOs. #427 2020-06-18 04:38:08 +00:00
Korina Cordero
9833a2709a Add command to add test JO data 2020-06-18 03:47:46 +00:00
Korina Cordero
0a06a7ad31 Add command to copy the config and messages files. #426 2020-06-17 08:49:52 +00:00
Korina Cordero
90697af64b Merge branch '422-cmb-no-riders-in-list-when-rider-is-unavailable' of gitlab.com:jankstudio/resq into 426-command-to-copy-configuration-files 2020-06-17 08:20:12 +00:00
Korina Cordero
bd0cf0ad1d Merge branch '424-cmb-release' into '425-cmb-use-cmb-service-type'
# Conflicts:
#   src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
2020-06-17 02:05:06 +00:00
Korina Cordero
753c77773d Use CMBServiceType to check service type. #425 2020-06-17 02:03:50 +00:00
Korina Cordero
661e048206 Add checking for rider availability when saving JO. #422 2020-06-16 03:58:39 +00:00
Korina Cordero
86a5c117e3 Merge branch '421-cmb-new-rider-api' of gitlab.com:jankstudio/resq into 422-cmb-no-riders-in-list-when-rider-is-unavailable 2020-06-16 03:52:44 +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
334b0f1c99 Add uploadFinishPhotos API call. #421 2020-06-09 02:57:48 +00:00
Korina Cordero
ce64a1b64d Add uploadArrivePhotos API call. #421 2020-06-08 10:39:57 +00:00
Korina Cordero
8f108c18cb Modify name of stype_id parameter to service_type for clarity. #421 2020-06-05 09:52:23 +00:00
Korina Cordero
760fa7acf3 Add get job order history for this month and last month. #421 2020-06-04 09:47:58 +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
22c1fab15c Add generateInvoice API call. #421 2020-06-02 07:41:47 +00:00
Korina Cordero
ce0240d001 Add event types for CMB. Add JO in transit API call. #421 2020-06-02 06:35:31 +00:00
Korina Cordero
e74d4061ba Add checking for assigned rider for JO for getJobOrder. #421 2020-06-02 04:27:10 +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
2ea5bfe193 Add changes to CMB's rider API handler. #420 2020-06-01 02:26:04 +00:00
Korina Cordero
ce2b838ff7 Add RAPIController for CMB. #420 2020-05-29 07:20:00 +00:00
Korina Cordero
7b60ec7c5f Move the setting of JO search fields to the entity. Move the sql script to the migration folder. #419 2020-05-27 08:13:51 +00:00
Korina Cordero
2a0bee8d8d Create sql command to update the job orders for the search fields. Modify search to use the JO search fields. Add saving of search fields when adding a JO. #419 2020-05-27 07:05:44 +00:00
Korina Cordero
8b2a1cd09c Merge branch 'master' of gitlab.com:jankstudio/resq into 419-resq-search-optimization 2020-05-27 04:56:17 +00:00
Korina Cordero
c8c03b756d Add fields and indexes used for search to JO entity. #419 2020-05-27 03:44:52 +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
Korina Cordero
f21753bd07 Comment out checking of dpa consent. Comment out access to dpa consent. #418 2020-05-25 03:33:44 +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
Korina Cordero
7bd2a6fb31 Add index for customer first name, customer last name, and date_schedule. #415 2020-05-22 05:51:52 +00:00
2aa6d417b7 Merge branch '408-resq-additional-dpa-behavior' into 'master'
Resolve "Resq - additional dpa behavior"

Closes #408

See merge request jankstudio/resq!471
2020-05-21 01:50:57 +00: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
bbebdb04c8 Add checking for email address if email checkbox is checked. #408 2020-05-15 09:24:31 +00:00
Korina Cordero
af85a632e5 Add acl entry for display of DPA Consent. Add checking when adding/updating customer for DPA consent. #408 2020-05-15 08:48:58 +00: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
19527e38da Merge branch '401-resq-modify-warrantyhandler-to-use-date_schedule-for-expiry-date-computation' into 'master'
Resolve "Resq - modify WarrantyHandler to use date_schedule for expiry date computation"

Closes #401

See merge request jankstudio/resq!465
2020-05-12 01:29:36 +00:00
2f80a510b0 Merge branch '400-resq-check-jos-with-no-warranty-entries' into 'master'
Resolve "Resq - check JOs with no warranty entries"

Closes #400

See merge request jankstudio/resq!450
2020-05-12 01:29:18 +00:00
Korina Cordero
e67c011831 Change the start date for warranty expiration computation to date_schedule, instead of date_create or date_fulfilled. #401 2020-05-11 06:50:15 +00: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
9550e1e46c Fix getClosestOpenHubs bug #403 2020-05-09 21:39:53 +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
Korina Cordero
78136cc281 Add output file for existing warranties and invalid plate numbers. #400 2020-05-08 05:30:27 +00:00
Korina Cordero
24d297b48f Add error log if JO fulfillment cannot created the warranty. Fix for warranty creation issues when creating warranty from existing JO. #400 2020-05-07 11:13:43 +00:00
6476a96c06 Fix advance order setting #399 2020-05-06 18:24:29 +08:00
Korina Cordero
258a379b68 Add filter for 9900000000 number. #398 2020-05-05 03:07:08 +00:00
e123008061 Activate actual sending of warranty SMS and change configuration to point to live DR URL #394 2020-05-04 18:34:42 +08:00
f384c5d940 Merge branch 'master' of gitlab.com:jankstudio/resq into 394-warranty-expiration-sms-reminder 2020-05-04 18:05:15 +08:00
46da9b6bfd Add details to message #394 2020-05-04 18:04:56 +08:00
Korina Cordero
8d7e0664ee Add index for date_create. #397 2020-05-04 08:46:38 +00:00
Korina Cordero
143c471a48 Add report for SMS messages. #397 2020-05-04 08:05:50 +00:00
1a78320ca9 Fix when date is not speicifed in warranty:sms command #394 2020-05-04 11:34:34 +08:00
e8446cd181 Merge branch '394-warranty-expiration-sms-reminder' of gitlab.com:jankstudio/resq into 394-warranty-expiration-sms-reminder 2020-05-04 11:31:00 +08:00
82baef50ee Make checks for mobile number format #394 2020-05-04 11:30:43 +08:00
Korina Cordero
81f8bf84d3 Made date an optional argument to command. #394 2020-05-04 03:23:04 +00:00
Korina Cordero
416441c572 Merge branch '394-warranty-expiration-sms-reminder' of gitlab.com:jankstudio/resq into 394-warranty-expiration-sms-reminder 2020-05-04 03:07:48 +00:00
cb95705848 Add command for sending warranty SMS #394 2020-05-04 11:05:28 +08: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
54c0882b01 Merge branch '394-warranty-expiration-sms-reminder' into 'master'
Fix bug in dr_url passing #394

Closes #394

See merge request jankstudio/resq!443
2020-05-03 14:58:28 +00:00
106a38499d Fix bug in dr_url passing #394 2020-05-03 22:57: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
434cedf206 Merge branch '384-make-map-tile-server-configurable' of gitlab.com:jankstudio/resq into 394-warranty-expiration-sms-reminder 2020-05-01 14:05:57 +08:00
ff6b4da4df Save records of sms messages when sending #384 2020-05-01 14:03:27 +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
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
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
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