Commit graph

2087 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
3f7075f26d Merge branch 'master-fix' of gitlab.com:jankstudio/resq into 632-resq-1-5-changes 2021-10-27 07:15:13 +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
44611915e5 Fix VAT computation when trade ins and discounts are present. #636 2021-10-25 08:37:19 +00:00
Korina Cordero
50c67d7088 Modify the fuel charges for gas and diesel. #633 2021-10-22 10:19:37 +00:00
Korina Cordero
9f5493c125 Remove debug logs. Update rider's current job order when JO is requeued. #630 2021-10-22 06:59:55 +00:00
Korina Cordero
6fe63050c6 Merge branch 'master-fix' of gitlab.com:jankstudio/resq into 630-rider-app-timeout 2021-10-22 06:29:12 +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
46ea41f034 Add command to update dealer information for warranties. #631 2021-10-21 03:21:09 +00:00
Korina Cordero
e9fa25dada Fix sending of rider event when JO is requeued. #630 2021-10-20 06:45:12 +00:00
Korina Cordero
c955516acf Fix testing issues found. #630 2021-10-20 06:28:31 +00:00
Korina Cordero
f8ebe0d97a Set rider's availability after JOs are requeued. #630 2021-10-20 06:19:59 +00:00
Korina Cordero
9b7852d248 Remove rider id from command. #630 2021-10-20 05:42:05 +00:00
Korina Cordero
d366106381 Add sending of mqtt events. #630 2021-10-20 05:34:43 +00:00
Korina Cordero
c2066b86c9 Add retrieval of job orders to be updated. #630 2021-10-19 09:19:27 +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
d750c6b8ba Add sorting to Vehicle's getBatteries. #628 2021-10-12 07:53:17 +00:00
Korina Cordero
840cbe2463 Fix setting of hub jo count. #626 2021-10-08 12:34:55 +00:00
Korina Cordero
e6d3043556 Set hub jo count to redis jo count. #626 2021-10-08 12:21:57 +00:00
Korina Cordero
fe15385613 Use the redis job order count to display number of assigned job orders to hub. #626 2021-10-08 12:09:46 +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
8dd06b2d5e Add null check for previous rider when re-assigning rider. #621 2021-09-09 03:40:53 +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
Korina Cordero
7a57ce0fac Fix not sending of rider event. #617 2021-08-23 07:53:47 +00:00
Korina Cordero
473ace4f23 Separate setting of delivery status from calling cancel on JO when cancelling a JO. #617 2021-08-23 06:42:52 +00:00
b433722764 Change mqtt channel for rider app #617 2021-08-22 00:32:09 +08: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
7cd8f2f027 Renamed delivery status for consistency. #617 2021-08-21 09:41:45 +00:00
Korina Cordero
d863158dd6 Add validation to login. #617 2021-08-21 09:17:14 +00:00
fc513a973b Fix rider api user command to only create an api user for riders without it #617 2021-08-21 15:23:46 +08:00
Korina Cordero
25954afe63 Set api role for rider api user. #617 2021-08-21 06:39:12 +00:00
Korina Cordero
ff5e747d7a Set rider's api user. #617 2021-08-21 06:11:23 +00:00
Korina Cordero
ea2f0e639d Add command to create api users from existing riders. #617 2021-08-21 05:55:10 +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
973c56ae85 Add new API calls. #612 2021-08-11 10:20:53 +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
ac7e26498b Set default value for HubCriteria's date_time field. Set date_time to JO's date schedule when loading dispatch form. Include checking of hub's opening and closing hours when emergency. #611 2021-08-09 07:29:39 +00:00
Korina Cordero
dd983f11ef Fix import command for the file. Fix association between carclubcustomerhub and hub. #609 2021-08-04 09:00:58 +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
6f5c88dbdb Add hub assignment for first time JO availing of car club promo. #609 2021-08-02 08:05:00 +00:00
Korina Cordero
6df384027e Add CarClubCustomerHub entity. Add command to import customer and hub information for car club. #609 2021-08-02 06:22:48 +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
04e803510c Set default value for flags. #607 2021-07-30 08:34:12 +00:00
Korina Cordero
406568ab3d Add the two flags to Hub. #607 2021-07-30 08:03:40 +00: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
8577e57686 Disable hub filtering #604 2021-07-28 20:55:10 +08:00
Korina Cordero
d0db056eed Add setting of distance limit for emergencies. #601 2021-07-26 07:49:12 +00:00
Korina Cordero
2650ac01c5 Bug fixes. #601 2021-07-26 07:27:36 +00:00
Korina Cordero
3a43cc14fb Add customer distance limit to hub filtering in admin panel. #601 2021-07-26 04:11:54 +00:00
Korina Cordero
52419dea6f Remove optimizations and fix dealer query. #597 2021-07-23 04:06:48 +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
bc80cc91ea Create command to set branch code for existing warranties. #597 2021-07-22 06:39:03 +00:00
Korina Cordero
f2046625d8 Add branch_code to Warranty. #597 2021-07-22 05:49:08 +00:00
Korina Cordero
aa466c2cc5 Fix for the jo count for both filtered and non-filtered area. #599 2021-07-22 03:01:15 +00:00
cc4b68bd71 Zero out redis_jo_count #599 2021-07-22 08:30:31 +08:00
Korina Cordero
b761e2bfb5 Add job order count for hubs in jo form. #596 2021-07-16 09:29:22 +00:00
Korina Cordero
625236667b Add sorting by distance to round robin. #596 2021-07-15 11:07:58 +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
dc68f899e7 Add jo id and customer id to hub filter logging. #594 2021-07-01 02:54:22 +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
12fd768849 Add service to check if customer is within area for hub filtering. Add command to import KML files for hub filtering area. #575 2021-06-24 03:01:47 +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
45c7ccbac1 Merge branch '581-create-capi-api-call-to-get-dealers' into 'master-fix'
Resolve "Create CAPI API call to get dealers"

See merge request jankstudio/resq!697
2021-06-14 02:36:00 +00:00
Korina Cordero
70fdfb1272 Update command with new template. #583 2021-06-11 06:45:09 +00:00
Korina Cordero
e3e949d42a Add CAPI call to get dealers. #581 2021-06-11 05:54:33 +00:00
04bad588fb Merge branch '580-create-dealer-entity' into 'master-fix'
Resolve "Create Dealer entity"

See merge request jankstudio/resq!694
2021-06-11 04:10:46 +00:00
0fb09f2e6d Add recommended extra battery inventory feature #582 2021-06-11 00:53:02 +08:00
Korina Cordero
8648f6f3f1 Add dealer entity and PHP script to add dealers. #580 2021-06-10 10:21:20 +00: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
2ebfe4cccb Fix issues found during testing. #575 2021-06-03 09:22:58 +00:00
Korina Cordero
c3ffbb20ff Add hub filtering code. #575 2021-06-02 10:00:35 +00:00
68b9f99bdc Merge branch '572-make-command-to-import-car-club-customer-info' into 'master-fix'
Resolve "Make Command to import car club customer info"

See merge request jankstudio/resq!686
2021-06-01 11:34:27 +00:00
Korina Cordero
3eaa307ac0 Add GCash to payment methods. #574 2021-06-01 09:02:01 +00:00
Korina Cordero
3d89199fd8 Improve flow for cleaning contact numbers. #572 2021-06-01 03:06:30 +00:00
bfc86abd6a Refactor entire car club import command #572 2021-06-01 01:10:38 +08:00
5830ad0c09 Fix issue by removing entity manager clear #572 2021-05-31 20:43:21 +08:00
Korina Cordero
6a075bd46b Fix issues found. #572 2021-05-31 10:36:45 +00:00
Korina Cordero
7d99eab2cc Add writing to file actions done. #572 2021-05-31 09:44:42 +00:00
Korina Cordero
ed25fad0b0 Fix api bug. #573 2021-05-31 05:45:00 +00:00
Korina Cordero
be48ecdb82 Added cleaning of contact numbers. #572 2021-05-31 05:39:20 +00:00
Korina Cordero
079c8a033a Add command to create customer from car club file. #572 2021-05-28 10:06:18 +00:00
Korina Cordero
dda39a9e7b Fix issues found. #570 2021-05-27 10:16:38 +00:00
Korina Cordero
64f3248b59 Fix issues found during merging and testing. #570 2021-05-27 07:14:18 +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
c9e16b4774 Fix error. #567 2021-05-19 08:26:36 +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
Korina Cordero
1ab103e3e4 Add changes to additional fields in JO incoming form. #546 2021-03-24 15:20:44 +08:00
Korina Cordero
c1533c24c4 Create marketing research sms and email flags for customer. #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
0103aadcc3 Add Marketing Research checkbox under Marketing Promo for Customer. #546 2021-03-18 23:13:42 +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
b7c722d8e9 Remove the unused date code. #539 2021-03-02 02:37:17 +00:00
Korina Cordero
643bc61bf9 Remove commented out code. #539 2021-03-02 02:31:11 +00:00
Korina Cordero
8f839674b5 Add headers to csv file. #539 2021-03-02 01:49:03 +00:00
fd8845118e Change customer source report generation to use raw sql #539 2021-03-01 23:16:29 +08:00
Korina Cordero
59a77c945c Add command to get all customers for report. #539 2021-03-01 11:09:43 +00: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
f5f321b506 Add checking if date schedule is more than 24 hours before adding to cache. Add advance orders to cache when refreshing. #535 2021-02-10 07:59:32 +00: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
eaac08e84a Change time period to refresh cache to 5 hours. #535 2021-02-09 05:26:33 +00:00
Korina Cordero
b730e9b43a Added logs for cache refresh. #535 2021-02-09 02:58:22 +00:00
Korina Cordero
1101e025a5 Add command to clear and repopulate the latest job order cache. #535 2021-02-08 09:12:39 +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
314c0704f8 Add TEST ONLY as a cancel reason. #530 2021-01-04 07:20:39 +00:00
7d612df076 Merge branch '528-app-cannot-add-customer-vehicle' into 'master'
Add checking if token is null. #528

Closes #528

See merge request jankstudio/resq!614
2020-12-14 06:23:02 +00:00
Korina Cordero
f97153832c Add checking if token is null. #528 2020-12-14 06:21:27 +00:00
Korina Cordero
408a2bf42c Change output->writeln to error_log. 2020-12-14 03:28:09 +00:00
0ff930438b Add check for user class type for cv history #528 2020-12-14 10:56:04 +08: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
807749c8f5 Add SAPBatteryContainerSize entity. #527 2020-12-07 05:48:48 +00:00
Korina Cordero
0d7ff77a07 Rename flag_latest to flag_new in constructor. #526 2020-12-07 05:00:46 +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
070937cd37 Enable logging of changes to customer vehicle warranty code #525 2020-10-26 17:27:06 +08:00
7898595bff Add new entity for customer vehicle warranty code history #525 2020-10-26 16:30:14 +08:00
668f49f335 Add warranty serial edit modal and ajax call for jo forms #525 2020-10-26 01:46:35 +08:00
Korina Cordero
28025a5735 Add checking for empty row and empty columns. #523 2020-10-20 03:55:40 +00:00
7ca467ce4c Add date_update to battery list CAPI #522 2020-10-20 07:52:07 +08:00
74928f196b Add date_create and date_update to SAPBattery entity #522 2020-10-20 07:38:47 +08:00
6898b9989e Add date_create and date_update fields in Battery entity #522 2020-10-20 07:01:01 +08:00
Korina Cordero
121f3623bb Add missing reasons. #520 2020-10-13 02:30:32 +00: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
7bc0dfe54a Merge branch '504-resq-new-import-commands-for-sap-battery' into '485-resq-september-10-release'
Resolve "Resq - new import commands for SAP Battery"

See merge request jankstudio/resq!592
2020-09-29 01:30:07 +00:00
Korina Cordero
ae5ccb40f2 Add date_create to Customer. #513 2020-09-28 07:52:00 +00:00
Korina Cordero
7107c57eb6 Create command to import SAP information. #504 2020-09-25 09:58:07 +00:00
Korina Cordero
beee87c3b4 Modify the ImportSAPDeltaCommand to make import checking easier. #504 2020-09-23 04:47:15 +00:00
Korina Cordero
7c49bd9f0a Add ImportSAPDeltaCommand. #504 2020-09-22 11:17:25 +00:00
Korina Cordero
aa89e74e94 Add DPA access when creating customer and job order. Add checking for email when email promo is checked. #486 2020-09-10 06:05:41 +00:00
Korina Cordero
82671a80a3 Add checking for service type for no trade in reason. #471 2020-09-09 08:07:38 +00: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
dba2eb693a Added cancellation reasons. #481 2020-08-28 05:26:10 +00:00
Korina Cordero
73dcdb0b99 Add content. #479 2020-08-28 04:12:42 +00:00
Korina Cordero
c30874e1c0 Change the wiling to wait checkbox into a dropdown. Add text field for not willing to wait. #479 2020-08-27 08:28:39 +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
75ff5bcdbb Add country code to mobile number. #465 2020-08-17 11:09:35 +00:00
Korina Cordero
61098b551f Merge branch '464-resq-sms-message-to-customer-upon-jo-completion' into '465-resq-august-13-release'
Resolve "Resq - sms message to customer upon JO completion"

See merge request jankstudio/resq!543
2020-08-12 05:46:07 +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
938ef24078 Add SMS message sending to customer when JO is fulfilled via rider app. #464 2020-08-12 05:35:36 +00:00
Korina Cordero
28b939a969 Add SMS messaging to customer when rider fulfills a JO from rider app. #464 2020-08-11 11:10:24 +00:00
Korina Cordero
2c48c619b8 Send SMS message to customer when JO is fulfilled from admin panel. #464 2020-08-11 07:24:20 +00:00
Korina Cordero
ce70966117 Add geofence checking to JO form. #463 2020-08-10 09:03:21 +00:00
Korina Cordero
8d33e21647 Merge branch '462-resq-dropdown-for-trade-in-reason' into '465-resq-august-13-release'
Resolve "Resq - dropdown for trade-in reason"

See merge request jankstudio/resq!541
2020-08-10 07:53:01 +00:00
Korina Cordero
e8220f4282 Add no trade in reason to form and JO entity. #462 2020-08-10 07:51:37 +00:00
Korina Cordero
4454f10d45 Merge branch '453-resq-july-30-release' of gitlab.com:jankstudio/resq into 462-resq-dropdown-for-trade-in-reason 2020-08-10 04:01:46 +00:00
Korina Cordero
25b96e8a14 Fix error when user reassigns hub. #453 2020-08-10 03:28:40 +00:00
Korina Cordero
1f39ab3ccf Add list of no trade in reasons. #462 2020-08-07 08:54:16 +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
1a82676c25 Remove log messages. #457 2020-08-05 10:13:53 +00:00
Korina Cordero
62a4ffcdfd Add mobile number to customer vehicle search in JO forms. #457 2020-08-05 09:40:18 +00:00
Korina Cordero
5942575fde Add responsible_party field to job order entity and JO forms. #459 2020-08-05 08:03:46 +00:00
Korina Cordero
407c860582 Add finish date column to list of all job orders. #456 2020-08-05 03:51:40 +00:00
Korina Cordero
46bcf7f209 Fix zoom issue in dashboard map. #424 2020-08-04 08:08:56 +00:00
Korina Cordero
117974d2cb Add CustomerNotWaitReason. #453 2020-08-04 08:00:21 +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
21c1535e89 Add Lazada to Transaction Origin. #455 2020-08-04 03:45:23 +00:00
Korina Cordero
78d0f4b150 Change text field to dropdown for reasons why customer will not wait. #454 2020-08-04 03:32:51 +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
4cd75acb46 Add updating of landmark, willing to wait, and reason when updating JO form. #453 2020-07-31 01:42:50 +00:00
Korina Cordero
964dce9842 Add Willing to Wait tickbox and Reason for not waiting text field. #445 2020-07-28 10:10:59 +00:00
Korina Cordero
18dd63ac16 Make Landmark field in JO required. #447 2020-07-28 08:07:56 +00:00
Korina Cordero
ed0eefc1d8 Add Battery Facilitated By column in View All. #443 2020-07-28 06:48:40 +00:00
Korina Cordero
886ed94d88 Merge branch '444-resq-include-date-filter-in-hub-view' of gitlab.com:jankstudio/resq into 443-resq-add-battery-facilitated-by-in-view-all-page 2020-07-28 06:15:39 +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
e85139b864 Add date start to the list of JOs in View All and Open. #424 2020-07-27 07:38:13 +00:00
Korina Cordero
ed53e494b4 Fix bug where JO goes back to assigned when updated. #424 2020-07-24 08:57:33 +00:00
Korina Cordero
d61d71804d Return empty array for job order when no ongoing job order. #424 2020-07-24 06:42:38 +00:00
Korina Cordero
afbe3aa00b Add route to fulfill a cancelled job order. #442 2020-07-23 10:34:01 +00:00
Korina Cordero
505177360e Add date filter for hub view. #444 2020-07-23 08:58:41 +00:00
Korina Cordero
febd4d6e09 Comment out the error_log for header longitude and latitude. #424 2020-07-23 06:53:01 +00:00
Korina Cordero
ff83dec5ce Add upload photo event type. #424 2020-07-23 04:40:48 +00:00
Korina Cordero
eadcd4604a Add getHeaderCoordinates to rider api. #424 2020-07-23 03:55:33 +00:00
Korina Cordero
232ebfe3fc Add RIDER_FINISH event. Add date_complete to API response. #424 2020-07-23 02:50:13 +00:00
Korina Cordero
37fef914d9 Add checking for null for other images. #424 2020-07-22 06:35:12 +00:00
Korina Cordero
b680349e56 Limit uploaded photos to four. Rename images to generic names. #441 2020-07-21 09:58:06 +00:00
Korina Cordero
127b4a6f7b Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 438-cmb-rider-icon-should-be-green-when-rider-rejects-jo 2020-07-21 07:17:56 +00:00
Korina Cordero
d7a5bd7dda Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 437-cmb-rider-cannot-go-offline-if-rider-has-assigned-jos 2020-07-21 07:12:46 +00:00
Korina Cordero
6b65e92711 Add date_start to the job order data response. #440 2020-07-21 07:10:45 +00:00
Korina Cordero
d01aa82e31 Clear rider when JO has been rejected. Send event for rider availability when rider rejects JO. #437 2020-07-21 04:58:14 +00:00
Korina Cordero
109911bbb0 Clear rider when JO has been rejected. Send event for rider availability when rider rejects JO. #437 2020-07-21 04:51:50 +00:00
Korina Cordero
95a070051e Add checking for assigned job orders when rider is logging out or going offline. #437 2020-07-20 08:21:34 +00:00
Korina Cordero
20f5e46726 Add date_accept to the responses when getting a job order. #440 2020-07-17 06:17:55 +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
0c845b456e Fix issue of icon not displaying when rider goes online. #436 2020-07-16 05:09:53 +00:00
Korina Cordero
326bbeaed2 Add channel for rider availability to add/remove rider when rider goes online/offline. #436 2020-07-16 03:31:04 +00:00
Korina Cordero
4c8ea2f69b Add list of job orders behind schedule. #436 2020-07-15 08:40:30 +00:00
Korina Cordero
1a6ed417bf Split invoice items with quantity more than 1. #436 2020-07-14 03:15:51 +00:00
Korina Cordero
6cb3f1be66 Fix the quantity in invoice when user orders more than one battery of the same type. #436 2020-07-13 09:38:47 +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
7d19cfa1eb Fix bug when assigning rider to JO. #434 2020-07-08 10:41:28 +00:00
Korina Cordero
c82a7a388d Modify checking for JO reassignment. #434 2020-07-08 09:12:35 +00:00
Korina Cordero
a448177a1c Made the model year field a dropdown. #434 2020-07-08 04:21:17 +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
3de8b8762f Add checking if scheduled date and time are before the current date and time. #434 2020-07-06 07:51:26 +00:00
Korina Cordero
27f37de489 Fix discount issues. #434 2020-07-03 08:14:12 +00:00
Korina Cordero
c3487358f1 Autopopulate the OR Name field with the customer name. #434 2020-07-03 07:29:47 +00:00
Korina Cordero
6e07e24e93 Made discount a dropdown. #434 2020-07-02 11:53:14 +00:00
Korina Cordero
9bb8380ca4 Add 45 minutes to date_schedule. #434 2020-07-02 02:59:23 +00:00
32d3012802 Limit rider schedule to 7 - 4 and 8 - 5 #409 2020-07-01 23:43:24 +08:00
Korina Cordero
473e7a8e51 Return list of years for model year until current year. #434 2020-07-01 09:40:01 +00:00
Korina Cordero
ada02f46a7 Comment saving of promo information. #434 2020-07-01 09:17:34 +00:00
Korina Cordero
e8923c8faf Add checking for odometer maximum value. #434 2020-07-01 02:55:48 +00:00
Korina Cordero
1c076228c6 Add Whatsapp to the list for transaction origin. #434 2020-07-01 02:35:12 +00:00
Korina Cordero
b4d1cd344d Add E-Wallet as mode of payment. #434 2020-07-01 02:20:57 +00:00
Korina Cordero
858849a764 Made customer notes non-mandatory. #434 2020-07-01 02:12:08 +00:00
Korina Cordero
9717effb0a Add signature and email address to display. Separate the before and after images. #432 2020-06-29 09:00:42 +00:00
Korina Cordero
7aed20019c Fix displaying of images. #432 2020-06-29 08:18:39 +00:00
Korina Cordero
32c83aa40c Add odometer and pictures when viewing JO. #432 2020-06-29 07:00:17 +00: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
Korina Cordero
818a8fff30 Add cash to mode of payments. #424 2020-06-26 05:22:46 +00:00
Korina Cordero
481420294e Fix for JO not displaying errors when required fields are blank. #424 2020-06-26 03:26:54 +00:00
2803c264ac Allow analytics to be filtered by date range #409 2020-06-25 23:39:46 +08:00
Korina Cordero
bf572fa93c Remove error_log commands. #424 2020-06-25 10:57:14 +00:00
Korina Cordero
be52d089d2 Fix JO saving when plate number is blank. #424 2020-06-25 08:50:08 +00:00
Korina Cordero
a65211a709 Remove the Action and Distance in KM from walkin form. Remove the Action columns in one step form. #424 2020-06-25 08:24:09 +00:00
Korina Cordero
c3b4e1219b Add trim when getting plate number when adding a customer vehicle. #424 2020-06-25 04:43:00 +00:00
Korina Cordero
a1a60100f5 Add new event type for perform. Add event creation when JO is performed. #424 2020-06-25 03:11:08 +00:00
Korina Cordero
47a52782f7 Remove prefix from channel. #424 2020-06-24 07:55:50 +00:00
Korina Cordero
5822ea84a6 Add fix for rider being unavailable after completing a JO. #424 2020-06-23 09:54:50 +00:00
Korina Cordero
0f5bf2e8d6 Fix error when rider is not selected. #424 2020-06-23 09:40:39 +00:00
Korina Cordero
21ae94c5b6 Change default mode of payment to credit card. #424 2020-06-23 06:06:15 +00:00
Korina Cordero
093a249689 Add JO status checking for getOngoingJobOrder. #424 2020-06-23 02:33:24 +00:00
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
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
f33a253cea Add transaction origin to mqtt message. #380 2020-04-17 06:07:32 +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
b545750910 Add customer distance limit to .env and checking if hub within the limit. #377 2020-04-14 07:21:10 +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
48e95ee581 Add .env variable and checking of variable when logging API events. #374 2020-04-14 02:24:52 +00:00
32b4c8546d Make rider available when they arrive at hub #374 2020-04-13 21:10:29 +08:00
46f46436fe Tag rider as unavailable on rapi payment call #374 2020-04-13 20:56:46 +08: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
3cc20c7410 Fix typo in api logger #374 2020-04-10 21:17:31 +08:00
63bb887370 Add request information in API logging #374 2020-04-10 21:14: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
8619c49397 Add the status_open field in Hub. #374 2020-04-08 09:39:42 +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