Commit graph

1262 commits

Author SHA1 Message Date
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
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
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
Korina Cordero
fd101c391d Bug fix for when customer has customer promo tag but no hub. #614 2021-08-13 05:19:45 +00:00
Korina Cordero
13e28d8c47 Add checking for promo tag for locationSupport. #613 2021-08-12 09:39:56 +00:00
Korina Cordero
13ee4c8e51 Add checking for promo tag before geofence check. #613 2021-08-12 09:20:16 +00:00
Korina Cordero
072a2df5d1 Fixes found during testing. #612 2021-08-12 09:05:21 +00:00
Korina Cordero
18852941a7 Comment out log messages . #611 2021-08-10 05:59:00 +00:00
Korina Cordero
5d98df83ed Remove unnecessary code. #611 2021-08-10 05:31:49 +00:00
Korina Cordero
d645040f10 Add logging for hub. #611 2021-08-10 04:20:56 +00:00
Korina Cordero
0738149a5b Set date_schedule for HubCriteria when creating a JO from mobile app. #611 2021-08-09 08:21:25 +00:00
Korina Cordero
72a4ef6f72 Fix bugs found during testing. #609 2021-08-02 09:13:58 +00:00
Korina Cordero
b56754363e Add checking for customer pre-registered hub. #609 2021-08-02 09:03:46 +00:00
Korina Cordero
f54476a173 Add checking of flags for JO auto assignment. #607 2021-07-30 10:46:20 +00:00
49fdfa9ea6 Update hub form and controller to support the new auto assign flags #607 2021-07-30 17:17:22 +08:00
Korina Cordero
c261d43a6e Add TODO to refactor setting of HubCriteria fields. #605 2021-07-29 07:41:13 +00:00
Korina Cordero
0de8f71d0e Add hub filter option in .env. #605 2021-07-29 06:40:07 +00:00
Korina Cordero
2650ac01c5 Bug fixes. #601 2021-07-26 07:27:36 +00:00
Korina Cordero
b9a6109c78 Add branch code to capi and mobile requests. Add branch code to Warranty Details Report. #597 2021-07-22 07:52:18 +00:00
Korina Cordero
2ce291a7fd Move JO id and customer id to HubCriteria. #594 2021-07-01 07:11:49 +00:00
Korina Cordero
b39872e4e0 Add customer name, customer mobile number. #594 2021-07-01 04:33:04 +00:00
Korina Cordero
0a706f453b Add customer id to hub filter logging in APIController. #594 2021-07-01 03:25:59 +00:00
Korina Cordero
8a1ead57e0 Add report for hub filter. #594 2021-06-30 09:11:00 +00:00
5181ad3e62 Add rider API status to get jo info api call #593 2021-06-30 14:53:05 +08:00
97e66fa1fc Fix req bug #592 2021-06-30 14:15:27 +08:00
83d99953aa Add fields to get jo info call in mobile api #593 2021-06-30 13:21:21 +08:00
adadadb6ee Add get jo info call for mobile API #592 2021-06-28 23:47:46 +08:00
Korina Cordero
f40f6974e2 Add geofence hub filtering to mobile API and to dispatch form. #575 2021-06-24 06:09:48 +00:00
Korina Cordero
e61c3f1762 Add round robin flag to HubCriteria. #575 2021-06-23 10:39:49 +00:00
Korina Cordero
b4c8da134c Merge branch 'master-fix' of gitlab.com:jankstudio/resq into 575-adopt-hub-filtering-branch 2021-06-23 09:42:12 +00:00
a944f059fb Merge branch '548-customer-source-changes-2' into 'master-fix'
Resolve "Customer source changes"

See merge request jankstudio/resq!703
2021-06-23 09:35:34 +00:00
1631cacf98 Optimize query for related tickets - split into 3 separate queries #590 2021-06-20 01:33:02 +08:00
9a7622ed5c Index ticket entity to speed up related ticket fetching #590 2021-06-20 01:06:28 +08:00
46cc089f48 Fix rider optimization issue when jo count for hub is 0 #589 2021-06-18 21:20:33 +08:00
Korina Cordero
391237f08f Remove customer checking. #588 2021-06-18 08:27:47 +00:00
Korina Cordero
ceb54afa10 Fixed search for customer vehicle. #588 2021-06-18 08:15:33 +00:00
Korina Cordero
4a0adef749 Fixed search for customer vehicle. #588 2021-06-18 07:44:38 +00:00
Korina Cordero
406df3d083 Add setting of customer and vehicle when warranty is created via mobile API, rider API, and admin panel. #588 2021-06-18 07:00:56 +00:00
Korina Cordero
2b356194bb Fix typo. Remove not needed packages. #548 2021-06-17 09:04:57 +00:00
Korina Cordero
532df141ed Add customer source when creating a new customer. #548 2021-06-17 09:01:44 +00:00
Korina Cordero
614183fa2d Add CRUD UI for dealers. #586 2021-06-17 07:27:22 +00:00
Korina Cordero
4c3b895702 Add date range for warranty details report. Fix query to include all warranties. #587 2021-06-17 04:03:23 +00:00
9c370802c7 Merge branch '584-modify-warranty-details-report' into 'master-fix'
Resolve "Modify Warranty Details Report"

See merge request jankstudio/resq!699
2021-06-15 03:06:00 +00:00
7a377d2ede Add id to dealer capi call #585 2021-06-14 18:03:18 +08:00
Korina Cordero
a35101001b Add more data to warranty details report. #584 2021-06-14 09:26:35 +00:00
Korina Cordero
e3e949d42a Add CAPI call to get dealers. #581 2021-06-11 05:54:33 +00:00
0fb09f2e6d Add recommended extra battery inventory feature #582 2021-06-11 00:53:02 +08:00
Korina Cordero
009d3d3267 Change retrieval of API username. #579 2021-06-10 08:07:27 +00:00
Korina Cordero
3937b73454 Add api user name to create source for warranty and warranty_api_log. #579 2021-06-10 07:20:02 +00:00
Korina Cordero
31f43aea39 Add warranty source to Warranty and when creating warranty. #579 2021-06-10 04:11:27 +00:00
Korina Cordero
c3ffbb20ff Add hub filtering code. #575 2021-06-02 10:00:35 +00:00
Korina Cordero
ed25fad0b0 Fix api bug. #573 2021-05-31 05:45:00 +00:00
Korina Cordero
dda39a9e7b Fix issues found. #570 2021-05-27 10:16:38 +00:00
Korina Cordero
5b5e3f1e4f Merge branch 'master-fix' of gitlab.com:jankstudio/resq into 570-adopt-branch-558 2021-05-27 05:30:04 +00:00
f5d1cf65a1 Fix serial variable error #571 2021-05-27 13:14:16 +08:00
Korina Cordero
5b42cf5ce9 Add one time promo. #570 2021-05-27 04:39:29 +00:00
Korina Cordero
10a9b3227f Fix typo in error message. #567 2021-05-20 03:51:17 +00:00
Korina Cordero
571a7e3200 Add trim for serial. #567 2021-05-20 02:55:56 +00:00
Korina Cordero
ada87604fa Fix warranty update issue when serial changes from text to empty. #567 2021-05-20 02:51:58 +00:00
Korina Cordero
97eccf8ab8 Fix for issues found during testing. #567 2021-05-19 09:11:56 +00:00
Korina Cordero
66e1a71890 Apply branch 551 changes. #567 2021-05-19 08:10:18 +00:00
Korina Cordero
7ecfad828c Add the modified files from 556. #566 2021-05-19 06:09:09 +00:00
3f2467f8f7 Merge branch '540-paperless-warranty' into 'master'
Resolve "Paperless Warranty"

Closes #540

See merge request jankstudio/resq!649
2021-03-31 09:16:00 +00:00
fd6860442f Add province id and municipality id #540 2021-03-31 17:15:27 +08:00
69fbfe196f Add municipality (province / municipality / city) data and CAPI call #540 2021-03-31 02:20:37 +08:00
5d98216d21 Make customer info update on a warranty update #540 2021-03-31 00:57:31 +08:00
Korina Cordero
7a6ccfb8eb Add Customer Source Report to admin panel. #547 2021-03-29 05:48:26 +00:00
fff5b46eda Send SMS on customer warranty register / update #540 2021-03-26 21:26:46 +08:00
Korina Cordero
4d5bbed39e Fix typo. #546 2021-03-24 15:20:44 +08:00
Korina Cordero
4d8a1166b6 Add the inventory flag in the response to get batteries call. #546 2021-03-24 15:20:44 +08:00
ea06d922bb Have warranty create customer and add customer create source field #540 2021-03-24 01:44:41 +08:00
3e9ae5df35 Remove odometer and email from required fields #540 2021-03-23 20:11:19 +08:00
675877f8fd Add new fields to register api call #540 2021-03-23 19:57:04 +08:00
fd7ab1f858 Force odometer to be int #540 2021-03-23 19:47:33 +08:00
8310e162dc Add new fields for warranty in resq API #540 2021-03-23 17:03:19 +08:00
f56d08b9cc Add new fields for warranty - customer contact number and address #540 2021-03-23 15:47:13 +08:00
095159c3fe Add vehicle fields in warranty #540 2021-03-22 23:31:18 +08:00
3bc4bb8db7 Allow for same plate number update on register api call #540 2021-03-19 02:23:22 +08:00
Korina Cordero
5b5d12cf42 Add inventory flag to SAP battery. #546 2021-03-18 23:13:42 +08:00
Korina Cordero
d4541a5fce Add Trade-in Lazada field for battery size. #546 2021-03-18 23:13:42 +08:00
ae9d32d434 Add register functionality #540 2021-03-18 23:11:56 +08:00
f08d7e03aa Add support for warranty registration via capi #540 2021-03-17 02:19:10 +08:00
9f00d8ded7 Add controller and routes for capi customer warranty #540 2021-03-17 00:09:51 +08:00
7e7c93ce55 Add email, invoice and warranty card to warranty check api call #540 2021-03-14 23:45:51 +08:00
59f06d7a5a Add odometer and date purchase (customer) to entity and api calls #540 2021-03-14 20:06:07 +08:00
6a6b93e087 Handle file uploads properly #540 2021-03-14 01:34:06 +08:00
25dfdf1bbc Handle file uploads for invoice and warranty card pics #540 2021-03-14 00:20:05 +08:00
a70240efdc Add blank default email #542 2021-03-07 16:15:33 +08:00
60c387378a Add battery image_url to warranty check and other improvements #540 2021-03-05 23:06:23 +08:00
d8ad659aa6 Add register error message in warranty check json return #540 2021-03-05 20:04:51 +08:00
f08c3d845b Add API calls for warranty check and register #540 2021-03-05 15:02:14 +08:00
Korina Cordero
4556c391e3 Add container size id and name to battery information. #537 2021-02-12 04:01:27 +00:00
c69e212e26 Merge branch '535-display-open-jos-in-the-last-24-hours' into 'master'
Resolve "Display open JOs in the last 24 hours"

Closes #535

See merge request jankstudio/resq!625
2021-02-10 09:26:13 +00:00
eb675dd4b9 Add support for geofencing in location_support api call #536 2021-02-10 17:06:59 +08:00
Korina Cordero
032489d736 Fix dashboard issues. #535 2021-02-10 07:05:00 +00:00
Korina Cordero
bd75e159bd Add rider availability channel. #535 2021-02-10 03:35:32 +00:00
Korina Cordero
4231c144d0 Add redis cache to have the JOs from the last 24 hours. #535 2021-02-08 08:38:50 +00:00
Korina Cordero
9473609459 Add checking if JO is from the last 24 hours. #535 2021-02-08 03:56:31 +00:00
Korina Cordero
208eb3ffc3 Add 7 AM-10 PM option. #533 2021-01-25 08:47:43 +00:00
Korina Cordero
7ce0d1e930 Add flag_new to /capi/batteries response. #532 2021-01-25 06:50:46 +00:00
Korina Cordero
44afc498c1 Add population of hours based on shift selected. #531 2021-01-22 10:35:38 +00:00
Korina Cordero
f5759c8cea Add population of hour shift, depending on selected shift schedule. #531 2021-01-21 09:55:16 +00:00
Korina Cordero
f31891393d Add shift schedule dropdown. #531 2021-01-21 08:44:56 +00:00
Korina Cordero
408a2bf42c Change output->writeln to error_log. 2020-12-14 03:28:09 +00:00
Korina Cordero
b17a95e35a Add container size to SAP battery form. #527 2020-12-07 09:05:00 +00:00
Korina Cordero
a9d631cbc2 Add list, create, update, and delete for container size. #527 2020-12-07 06:46:43 +00:00
Korina Cordero
debc3bc8cb Add new flag for SAP battery. #526 2020-12-01 09:12:21 +00:00
Korina Cordero
ac2138c1b1 Fix error validation for SAP battery. #524 2020-11-27 10:27:01 +00:00
Korina Cordero
0752fe3726 Add create, list, update, and delete for SAP Battery. #524 2020-11-27 09:52:24 +00:00
Korina Cordero
bd80c6295a Add create, delete, update, and list for SAP battery size. #524 2020-11-27 08:43:47 +00:00
Korina Cordero
041cb7bafa CRUD for SAP battery brand. #524 2020-11-27 08:25:01 +00:00
668f49f335 Add warranty serial edit modal and ajax call for jo forms #525 2020-10-26 01:46:35 +08:00
7ca467ce4c Add date_update to battery list CAPI #522 2020-10-20 07:52:07 +08:00
f684fb532c Merge branch 'master' into '519-motiv-connectivity'
# Conflicts:
#   src/Controller/JobOrderController.php
2020-10-12 14:48:56 +00:00
1227e03e1a Add inventory count to hub table in job order processing form #519 2020-10-10 00:52:45 +08:00
c44fa66195 Create MotivConnector service #519 2020-10-09 22:57:44 +08:00
Korina Cordero
479ff96fdc Modified contents of the csv file when no invalid warranties are found. #476 2020-08-28 09:36:11 +00:00
Korina Cordero
1b88baa3de Add all batteries to Battery dropdown in JO form. #465 2020-08-18 02:25:31 +00:00
Korina Cordero
71b70d0c5a Merge branch '463-resq-message-prompt-for-non-serviceable-area' into '465-resq-august-13-release'
Resolve "Resq - message prompt for non-serviceable area"

See merge request jankstudio/resq!542
2020-08-12 05:41:56 +00:00
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
60fb331b47 Fix role controller issue on saving #270 2020-03-05 23:52:40 +08:00
Korina Cordero
6a7cb9788e Fix access to customer vehicle search for walkin and one step. #366 2020-03-05 08:36:24 +00:00
Korina Cordero
dafe7e6b1c Modify access to getCustomerVehicles. #366 2020-03-05 06:53:26 +00:00
977559b88d Set priority properly for job order and handle priority down button #360 2020-03-02 08:33:50 +08:00
07753274c3 Add initial job order prioritization features #360 2020-03-01 22:14:13 +08:00
Korina Cordero
3d40bc6238 Remove links to onestep edit from templates for resq. Fix for getEditRoute issues found during testing. #357 2020-02-25 07:18:55 +00:00
Korina Cordero
6d14677bd7 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 357-transition-fix-resq-s-geteditroute 2020-02-25 03:38:18 +00:00
Korina Cordero
d534ce3241 Add getEditRoute for resq. #357 2020-02-25 03:37:58 +00:00
5b19302752 Merge branch '354-cmb-and-resq-move-invoice-related-code-out-of-jocontroller' into '270-final-cmb-fixes'
Resolve "CMB and Resq - move invoice-related code out of JOController"

See merge request jankstudio/resq!395
2020-02-25 03:35:53 +00:00
Korina Cordero
22be1eaf5a Fix edit for walkin JOs. #270 2020-02-24 10:33:13 +00:00
214e44405c Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 270-final-cmb-fixes
Conflicts:
	src/Controller/JobOrderController.php
2020-02-24 16:45:43 +08:00
1a0fb13268 Fix view all edit button to use one step edit for CMB #270 2020-02-24 16:43:27 +08:00
Korina Cordero
9125a0d2fa Moved invoice code out of JO controller. #354 2020-02-21 03:22:17 +00:00
Korina Cordero
4a12fb6eb2 Change edit to edit onestep edit and walkin. #353 2020-02-20 04:12:12 +00:00
Korina Cordero
a62476a833 Add create, update, list, and delete for service charges. #348 2020-02-19 03:16:27 +00:00
1c9ce12595 Merge branch '341-cmb-add-service-charge-dropdown' into '270-final-cmb-fixes'
Resolve "CMB - add service charge dropdown"

See merge request jankstudio/resq!387
2020-02-18 01:43:00 +00:00
d2afb99f4f Merge branch '344-cmb-rider-queue-management' into '270-final-cmb-fixes'
Add active job order feature for rider #344

See merge request jankstudio/resq!388
2020-02-17 17:01:50 +00:00
def4ed0357 Add active job order feature for rider #344 2020-02-18 01:00:19 +08:00
Korina Cordero
f3f941e0a0 Add service charges to invoice generation. #341 2020-02-17 13:24:32 +00:00
Korina Cordero
984b0428d0 Fix for cmb to retain battery in invoice when editing JO. #343 2020-02-17 06:19:09 +00:00
Korina Cordero
d439a411a8 Change computation of discount for CMB. #343 2020-02-14 09:40:08 +00:00
Korina Cordero
bea5d72d13 Modify the function names for walkin. #340 2020-02-14 03:07:42 +00:00
Korina Cordero
d07adc606b Add saving of walkin form. #340 2020-02-13 08:53:57 +00:00
Korina Cordero
7e116d8d3e Add function to load walk-in form. #340 2020-02-13 07:32:18 +00:00
Korina Cordero
9cd5915e88 Add saving of serial when adding/editing/fulfilling a JO. #335 2020-02-11 08:09:55 +00:00
Korina Cordero
8bbc39ec9e Merge branch '311-cmb-refactor-rapicontroller-into-a-service' of gitlab.com:jankstudio/resq into 329-transition-branch-for-cmb-and-resq-merging 2020-02-07 02:24:17 +00:00
Korina Cordero
49d0e6b97e Resolve missed merge conflict. #329 2020-02-06 05:43:15 +00:00
Korina Cordero
60e3d3673f Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 329-transition-branch-for-cmb-and-resq-merging 2020-02-06 05:38:57 +00:00
Korina Cordero
0af69bd963 Fix for payment bug. #327 2020-02-06 03:08:51 +00:00
Korina Cordero
36657cbdf0 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 311-cmb-refactor-rapicontroller-into-a-service 2020-02-05 08:25:18 +00:00
Korina Cordero
3300400456 Move the rest of the functions to the service. #311 2020-02-05 08:19:10 +00:00
Korina Cordero
a3e40de170 Add adding of customer and customer vehicle from one step form. #319 2020-02-05 03:15:30 +00:00
6cdb5d0312 Fix battery fetching for new customer in one step jo form #319 2020-02-05 05:14:42 +08:00
cb5fa96307 Fix bug with missing entity manager for one step edit #319 2020-02-05 04:45:27 +08:00
d943015f4a Merge branch '319-cmb-one-step-form-display-rider-distance' of gitlab.com:jankstudio/resq into 319-cmb-one-step-form-display-rider-distance 2020-02-05 04:37:33 +08:00
746b25ad74 Fix one step form for CMB to allow for new customer and vehicle #319 2020-02-05 04:36:33 +08:00
Korina Cordero
3789871f9a Add rider and date filter to search. #319 2020-02-04 08:43:39 +00:00
Korina Cordero
56a797533d Add processing of deleting and adding a battery in one request. #323 2020-02-04 01:54:43 +00:00
Korina Cordero
96efa32a12 Fixes for battery_ajax_get. #323 2020-02-04 01:39:14 +00:00
Korina Cordero
ac908e9bcd Add saving of battery to vehicle. #323 2020-02-03 11:23:57 +00:00
Korina Cordero
6bcdf70902 Display the battery to be added to the form. #323 2020-02-03 11:03:52 +00:00
Korina Cordero
fd2fe4fb6f Add routes and UI elements to add compatible battery to vehicle. #323 2020-02-03 08:59:22 +00:00
Korina Cordero
05af87ed9c Move payment to the service. Move updateVehicleBattery to the JO handler for RAPIController. #311 2020-01-31 10:05:08 +00:00
Korina Cordero
aa1a2b3bcb Move the hubArrive function to the service. #311 2020-01-31 09:04:04 +00:00
Korina Cordero
bf3136da62 Move the arrive function to the service. #311 2020-01-31 08:53:35 +00:00
Korina Cordero
b651d06ec8 Move cancelJobOrder to the service. #311 2020-01-31 08:16:11 +00:00
Korina Cordero
becd8d0c17 Move acceptJobOrder to the service. #311 2020-01-31 06:21:35 +00:00
Korina Cordero
3e5ea688bc Move logout and getJobOrder to the service. #311 2020-01-31 04:22:27 +00:00
Korina Cordero
cbc99778cd Move login to the service. #311 2020-01-30 08:52:41 +00:00
Korina Cordero
4d104d38e1 Move the register function from controller to service. #311 2020-01-30 07:47:34 +00:00
Korina Cordero
10ecd6298a Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 318-error_log-cleanup 2020-01-30 04:03:44 +00:00
Korina Cordero
dab8986ad1 Remove or comment out error_logs meant for debugging purposes. #318 2020-01-30 00:31:01 +00:00
84293cb45a Merge branch '317-delete-icon-for-battery-in-vehicle-screen' into '270-final-cmb-fixes'
Resolve "Delete icon for battery in vehicle screen"

See merge request jankstudio/resq!362
2020-01-29 11:18:50 +00:00
Korina Cordero
33fdc857f2 Add deletion of battery from vehicle when vehicle has more than one compatible battery. #317 2020-01-29 11:16:07 +00:00
Korina Cordero
234d993d8f Add deletion of compatible battery from vehicle. #317 2020-01-29 09:03:56 +00:00
c8157b9509 Add functionality to job order tracking page #270 2020-01-29 01:13:47 +08:00
Ramon Gutierrez
e914c6d2e1 Add customer jo tracking view #315 2020-01-28 21:51:32 +08:00
Korina Cordero
bc8ce40b13 Add distance from customer to hub to hub table. #314 2020-01-28 07:24:14 +00:00
Korina Cordero
0daf2a2813 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 312-cmb-highlight-selected-hub-and-rider-in-onestep-edit 2020-01-28 03:00:42 +00:00
6dd3f3377e Merge branch '309-replace-63-in-templates-with-proper-country-code' into '270-final-cmb-fixes'
Resolve "Replace +63 in templates with proper country code"

See merge request jankstudio/resq!350
2020-01-28 02:54:08 +00:00
a82cfb2691 Fix bug for dashboard rider #270 2020-01-28 05:55:22 +08:00
9563bd8cb2 Fix dashboard bug for active riders not in the database #270 2020-01-28 05:53:52 +08:00