Commit graph

1088 commits

Author SHA1 Message Date
Korina Cordero
158d05d822 Add rating and rider rating to JO history response. Fix associations between rider rating and customer, job order, and rider. #632 2021-10-28 06:31:27 +00:00
Korina Cordero
16c944899f Add rider rating for jo in job order history. #632 2021-10-28 03:05:05 +00:00
Korina Cordero
f7def95cdd Merge branch 'master-fix' of gitlab.com:jankstudio/resq into 632-resq-1-5-changes 2021-10-28 02:23:00 +00:00
Korina Cordero
b14007e276 Fix response for vat ex price . #636 2021-10-28 02:10:59 +00:00
Korina Cordero
7001d6a0ed Fix get locations response. #632 2021-10-27 09:39:28 +00:00
Korina Cordero
84844046f1 Add limit to number of locations to be stored. #632 2021-10-27 08:26:19 +00:00
Korina Cordero
c54ee5d7d8 Add landmark to location details. #632 2021-10-27 07:50:02 +00:00
Korina Cordero
e4e412fd14 Fix response to get locations. #632 2021-10-27 07:27:15 +00:00
Korina Cordero
48aaeddadd Add call to remove a vehicle from customer's list of vehicles. #632 2021-10-27 06:35:40 +00:00
Korina Cordero
ca3fbc21c8 Add route for customer vehicle removal. Add call to get locations. #632 2021-10-27 02:54:34 +00:00
Korina Cordero
61b897d883 Add call to add location for customer. #632 2021-10-26 09:18:13 +00:00
Korina Cordero
a8eaad2a82 Add call to get ongoing job order count. #632 2021-10-26 07:49:45 +00:00
Korina Cordero
9c31a573c6 Add checking if hub_id is -1. Add call to get all ongoing job orders. #632 2021-10-26 07:26:11 +00:00
Korina Cordero
b9fdcbbbbb Sort the job orders for job order history from latest to oldest. #632 2021-10-22 05:49:05 +00:00
Korina Cordero
0065bc94ef Add index for status for job order. Add command to update the status and rider for unaccepted job orders. #630 2021-10-19 06:41:53 +00:00
Korina Cordero
c6654bd3c6 Add creation of rider api user when rider is created. #625 2021-10-06 03:52:37 +00:00
Korina Cordero
21cf667b47 Add check for battery. #624 2021-09-29 06:44:04 +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
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
cf12d09ee5 Shift from using active jo to current jo for rider related stuff #617 2021-08-21 21:36:40 +08:00
Korina Cordero
d863158dd6 Add validation to login. #617 2021-08-21 09:17:14 +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
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