Commit graph

1968 commits

Author SHA1 Message Date
Korina Cordero
0ffbf10879 Fix conflict. #704 2022-09-19 07:15:55 +00:00
Korina Cordero
c42d2973f4 Merge branch 'master' of gitlab.com:jankstudio/resq into 704-capi-call-for-warranty-serial
Conflicts:
	config/api_acl.yaml
	src/Controller/APIUserController.php
2022-09-19 07:14:04 +00:00
Korina Cordero
35d6e34128 Merge branch 'master' of gitlab.com:jankstudio/resq into 686-move-apicontroller-methods-into-capi
Conflicts:
	src/Ramcar/TransactionOrigin.php
2022-09-19 06:35:16 +00:00
Korina Cordero
d9aaea928c Add call to curl to command. #704 2022-09-19 06:27:03 +00:00
Korina Cordero
70e9b933d9 Add output to command. #704 2022-09-16 05:22:14 +00:00
Korina Cordero
cbc0b290ad Add processing for output. #704 2022-09-15 09:51:07 +00:00
Korina Cordero
32720ba9e7 Fix issues for the load command. #704 2022-09-15 07:38:33 +00:00
Korina Cordero
5b848a7f10 Fix issue when creating API user that's not a rider. Fix issues when uploading a file. #704 2022-09-15 05:56:43 +00:00
Korina Cordero
a3e9c45ec3 Separate the uploading of files and the processing of files. #704 2022-09-14 09:33:05 +00:00
Korina Cordero
3c9bdc8152 Add WarrantySerialQueue entity. #704 2022-09-14 08:02:51 +00:00
Korina Cordero
7d65b1eb77 Add CAPI call to upload warranty serial CSV file. #704 2022-09-14 07:33:51 +00:00
Korina Cordero
dae8fe7051 Add credit card amex to mode of payment. #703 2022-08-31 04:57:27 +00:00
Korina Cordero
f51ec9112d Modify fuel prices. #702 2022-08-30 04:38:22 +00:00
4b887adcd2 Merge branch '695-yokohama-add-new-ticket-types-and-subticket-types' into 'master'
Resolve "YOKOHAMA Add new ticket types and subticket types"

Closes #695

See merge request jankstudio/resq!811
2022-08-23 09:34:56 +00:00
5d6eb443a7 Merge branch '694-yokohama-add-new-transactionorigin-types' into 'master'
Resolve "YOKOHAMA Add new TransactionOrigin types"

Closes #694

See merge request jankstudio/resq!810
2022-08-23 09:34:25 +00:00
Korina Cordero
1feef7484e Adjust fuel charges. #700 2022-08-16 07:44:36 +00:00
Korina Cordero
a4338c8f61 Add ownership type dropdown to JO form. #696 2022-08-15 08:28:23 +00:00
Korina Cordero
837a3a2ec5 Add ownership type CRUD. #696 2022-08-15 07:10:15 +00:00
Korina Cordero
c1e33fb5dd Add new ticket and new subticket types. #695 2022-08-12 10:39:08 +00:00
Korina Cordero
5f94f252bc Add new transaction origin types for Yokohama. #694 2022-08-12 08:36:21 +00:00
80d4063238 Change error message for geofence #693 2022-08-05 22:21:49 +08:00
774599a01b Change prices for refuel #693 2022-08-05 22:10:12 +08:00
d27d54f7da Fix motiv being down for getInventory 2022-07-16 19:22:59 +08:00
559d4bbc01 Clean plate number before warranty registering for mobile API 2022-07-13 00:45:58 +08:00
Korina Cordero
270867f86f Redo the warranty creation. #690 2022-06-28 13:21:47 +00:00
Korina Cordero
48aa0b024f Fix warranty creation issue. #690 2022-06-28 12:47:42 +00:00
Korina Cordero
3910db88f0 Fix parameter issue for getJobOrderInfo. #686 2022-06-23 09:39:25 +00:00
Korina Cordero
ee44dfb44e Fix cleaning of mobile number. #686 2022-06-23 09:02:56 +00:00
Korina Cordero
06a2a887ef Fix cleaning of mobile number. #686 2022-06-23 08:46:50 +00:00
Korina Cordero
470dd47195 Add DeliveryStatus to JobOrderController. #686 2022-06-23 08:23:34 +00:00
Korina Cordero
accd6fd0f6 Add validation for model year. #686 2022-06-23 07:57:24 +00:00
b4def3c1a7 Add check to see if motiv reply is valid #688 2022-06-21 21:51:31 +08:00
Korina Cordero
bbb562d366 Comment out scheduleOptionStatus. #686 2022-06-21 10:16:48 +00:00
Korina Cordero
fd77f1ef62 Add route for getNearestHubAndSlots. Modify getNearestHubAndSlots. #686 2022-06-21 10:08:58 +00:00
Korina Cordero
2112edd4f0 Remove getJOHistory. Add route for locationSupport. Modify responses of locationSupport. #686 2022-06-21 09:43:19 +00:00
Korina Cordero
144afae551 Add route for getJobOrderInfo. Modify the responses for getJobOrderInfo. #686 2022-06-21 09:10:23 +00:00
Korina Cordero
4e613e3c01 Add route for cancelJobOrder. Modify cancelJobOrder responses. #686 2022-06-21 08:54:09 +00:00
Korina Cordero
3e73bc0513 Add route for getJOInvoice. Modify getJOInvoice responses. #686 2022-06-21 08:32:19 +00:00
Korina Cordero
f486a1b5a0 Add route for getEstimate. Modify getEstimate for third party api. #686 2022-06-21 07:55:25 +00:00
Korina Cordero
7985ec8f34 Rename validateRequest to validateJORequest. Modify required parameters for getEstimate. #686 2022-06-21 03:57:16 +00:00
Korina Cordero
ce6b1f8049 Fix responses. Add routes for promo. #686 2022-06-21 03:20:30 +00:00
Korina Cordero
5b32349437 Fix the responses for the api calls for vehicle and battery. #686 2022-06-20 10:20:42 +00:00
Korina Cordero
fb91d462ff Add path to tapi calls. Add more required parameters for new job order. #686 2022-06-20 09:00:56 +00:00
Korina Cordero
fb766eb99f Change diesel fuel fee. #687 2022-06-20 06:56:48 +00:00
Korina Cordero
08050416bb Add route for job order creation using third party API. #686 2022-06-20 06:50:06 +00:00
Korina Cordero
c8a8bc53af Start processing of request data. #686 2022-06-17 08:47:55 +00:00
Korina Cordero
44b9679a2e Move third party api controllers to a more descriptive directory. #686 2022-06-16 04:26:27 +00:00
Korina Cordero
60f401e26e Add permissions for another third party api. Copied the methods from APIController into CAPI third party conrtrollers. #686 2022-06-15 08:22:36 +00:00
54f065d30f Merge branch '668-remove-error_logs' into 'master'
Resolve "Remove error_logs"

Closes #668

See merge request jankstudio/resq!783
2022-06-13 02:09:24 +00:00
0734f315ac Merge branch '682-add-code-to-emergency-types' into 'master'
Resolve "Add code to emergency types"

Closes #682

See merge request jankstudio/resq!796
2022-06-12 05:40:06 +00:00
b68d722013 Merge branch '683-use-gettickettypetext-when-returning-ticket-type-for-ticket-list' into 'master'
Resolve "Use getTicketTypeText when returning ticket type for ticket list"

Closes #683

See merge request jankstudio/resq!797
2022-06-12 05:40:00 +00:00
Korina Cordero
a9a5760444 Use getTicketTypeText to display ticket type. #683 2022-06-10 08:39:41 +00:00
Korina Cordero
200f4bca22 Add code to emergency type. #682 2022-06-10 08:32:46 +00:00
Korina Cordero
f8e3e7df2d Add rush request JOs to be marked the same color as emergency. #681 2022-06-10 08:00:18 +00:00
4eb35364ca Merge branch '680-add-code-to-ticket-and-subticket-types' into 'master'
Resolve "Add code to ticket and subticket types"

Closes #680

See merge request jankstudio/resq!794
2022-06-10 07:38:32 +00:00
f90badd331 Merge branch '679-separate-screen-for-resq-transations' into 'master'
Resolve "Separate screen for RESQ transations"

Closes #679

See merge request jankstudio/resq!793
2022-06-10 07:25:49 +00:00
9150db3c20 Merge branch '677-dropdown-menu-for-specific-emergency-scenarios' into 'master'
Resolve "Dropdown Menu for specific Emergency Scenarios"

Closes #677

See merge request jankstudio/resq!791
2022-06-10 07:23:40 +00:00
Korina Cordero
cf97c74ea6 Fix display of ticket types when listing tickets in ticket list, ticket list in job order and ticket list in customer. #680 2022-06-10 07:20:24 +00:00
Korina Cordero
c63b9ffe43 Add code to ticket and subticket types. #680 2022-06-10 06:46:14 +00:00
Korina Cordero
3af014c7cf Remove JOs from mobile app in the Dispatch page. #679 2022-06-08 03:43:44 +00:00
Korina Cordero
d2591a3ffb Fix the routes for JOs coming from the Resq Dispatch page. #679 2022-06-08 03:07:12 +00:00
Korina Cordero
feade62c18 Add query parameter for the return urls when unlocking and editing/dispatching a JO. #679 2022-06-07 10:07:20 +00:00
Korina Cordero
86ab8edb74 Add a separate menu item for dispatch for JOs from mobile app. #679 2022-06-07 07:28:27 +00:00
Korina Cordero
61c7774da0 Fix color coding issue. #678 2022-06-07 03:08:02 +00:00
Korina Cordero
1a290436cb Modify length limit for name. Add table dump for emergency type. #677 2022-06-06 08:55:58 +00:00
Korina Cordero
70d917a585 Add emergency type to job order. #677 2022-06-06 08:40:26 +00:00
Korina Cordero
a847cba9b9 Add create, list, update, and delete for emergency type. #677 2022-06-06 06:44:55 +00:00
Korina Cordero
d89f67bc76 Add the new ticket fields into the ticket form. #676 2022-06-03 08:34:16 +00:00
Korina Cordero
96ce1f81fa Add saving of ticket type for subticket type. #676 2022-06-02 13:12:23 +00:00
Korina Cordero
efd402acb1 Add list, create, update, delete for subticket type. #676 2022-06-02 07:18:37 +00:00
Korina Cordero
5840aba2a9 Add list, create, update, delete for ticket types. #676 2022-06-02 06:44:51 +00:00
Korina Cordero
a7f52fc139 Merge branch 'master' of gitlab.com:jankstudio/resq into 674-color-code-jos-in-dispatch-page
Conflicts:
	src/Service/JobOrderHandler/ResqJobOrderHandler.php
2022-06-01 08:06:06 +00:00
Korina Cordero
e2bdf91f1c Add checking for current job order that current jo is the selected jo. #675 2022-06-01 08:01:39 +00:00
Korina Cordero
c3ecf51468 Add checking for current job order. #675 2022-06-01 07:44:02 +00:00
Korina Cordero
e36523528d Merge branch 'master' of gitlab.com:jankstudio/resq into 675-set-rider-s-current-jo-id-to-null-if-jo-s-hub-is-reassigned-and-jo-has-been-rider-assigned 2022-06-01 07:32:04 +00:00
Korina Cordero
6098858332 Fix issue of rider assignment not working after hub reassignment. #675 2022-06-01 06:04:04 +00:00
Korina Cordero
174acddc91 Add default values. #673 2022-06-01 04:08:08 +00:00
Korina Cordero
fe0243a4cc Add color coding for JOs that are for VIP customers or emergencies. #673 2022-05-31 09:37:29 +00:00
Korina Cordero
4580228628 Add caller classification to job order. #673 2022-05-31 07:25:49 +00:00
Korina Cordero
da20713f0f Add gender to job order. #672 2022-05-31 06:33:19 +00:00
Korina Cordero
70cbecb481 Add initial concern of customer and text area to job order. #671 2022-05-26 03:47:51 +00:00
Korina Cordero
b56787e637 Adjust fuel prices. #670 2022-05-25 06:52:18 +00:00
Korina Cordero
ff1f5bc7c6 Commented out the debug logs. #668 2022-05-20 06:59:51 +00:00
Korina Cordero
ba87fe61c5 Set flag_activated to false. #654 2022-05-19 05:44:23 +00:00
Korina Cordero
941f59ab6e Change jo event creation. #654 2022-05-18 09:34:15 +00:00
Korina Cordero
c8208df0f3 Modify warranty creation to be done by load data infile. #654 2022-05-18 08:46:13 +00:00
Korina Cordero
31e2088b6a Add log for processing. #654 2022-05-18 05:55:46 +00:00
Korina Cordero
1778af3f9f Fix issue on batch updates and inserts. #654 2022-05-18 05:53:38 +00:00
Korina Cordero
a7d1bb6a90 Add batch insert for JO event. #654 2022-05-17 12:01:15 +00:00
Korina Cordero
fa02cd1a67 Merge branch 'master' of gitlab.com:jankstudio/resq into 654-script-to-fulflll-job-orders 2022-05-17 01:58:16 +00:00
Korina Cordero
232b962c2e Add sap code to warranty creation when battery exists. #660 2022-05-16 08:38:41 +00:00
Korina Cordero
4803152fb1 Add checking for sap battery in hash. #660 2022-05-16 06:16:23 +00:00
Korina Cordero
3f9fd88729 Add sap battery hash. #660 2022-05-13 10:44:34 +00:00
Korina Cordero
c099ffd5fd Optimize sql selects. #654 2022-05-13 09:24:20 +00:00
Korina Cordero
f89e8548a9 Add checking for sap code for warranty creation. #654 2022-05-13 07:22:10 +00:00
Korina Cordero
b0e743b6e7 Merge branch 'master' of gitlab.com:jankstudio/resq into 654-script-to-fulflll-job-orders 2022-05-13 05:32:57 +00:00
Korina Cordero
938d6ff848 Rename field total. #660 2022-05-12 08:10:44 +00:00
Korina Cordero
4afa21f51e Add row number to output. Add checking for correct number of fields. #660 2022-05-12 08:06:36 +00:00
Korina Cordero
559a61bb13 Add checking for null rider ids. #654 2022-05-12 07:04:52 +00:00
Korina Cordero
9318b37077 Remove checking of entries. #660 2022-05-12 06:08:50 +00:00
Korina Cordero
0dda309a76 Add insert command for warranty creation. #654 2022-05-12 04:08:28 +00:00
Korina Cordero
d9de5cd519 Redo the command to fulfill all open job orders. #654 2022-05-11 10:08:41 +00:00
Korina Cordero
1a7d53ca01 Merge branch 'master' of gitlab.com:jankstudio/resq into 654-script-to-fulflll-job-orders 2022-05-11 03:04:42 +00:00
Korina Cordero
8401eeb0da Move the bulk warranty upload to its own service. #660 2022-05-10 06:28:28 +00:00
Korina Cordero
e8670e4b60 Add index for serial. Add additional checks for serial in warranty. #660 2022-05-06 10:17:27 +00:00
Korina Cordero
86ef1ec646 Fix issues found during testing of bulk upload. #660 2022-05-06 09:03:22 +00:00
Korina Cordero
ecff27524a Create test command for bulk warranty upload optimization. #660 2022-05-05 11:27:35 +00:00
Korina Cordero
39be9e94ed Merge branch 'master' of gitlab.com:jankstudio/resq into 660-add-customer-and-customer-vehicle-in-warranty-upload 2022-05-04 09:26:50 +00:00
Korina Cordero
a9cb98912c Merge branch 'master' of gitlab.com:jankstudio/resq into 654-script-to-fulflll-job-orders 2022-05-04 09:02:18 +00:00
Korina Cordero
5adbc79363 Merge branch 'master' of gitlab.com:jankstudio/resq into 663-update-refuel-charges 2022-05-02 06:40:09 +00:00
Korina Cordero
0ea329655f Rename function to normalizeString. #662 2022-05-02 06:22:17 +00:00
Korina Cordero
19d12d9264 Modify hardcoded refuel charges. #663 2022-05-02 06:20:30 +00:00
Korina Cordero
3e61bdb89c Fix typo for call to normalize text. #662 2022-05-02 06:14:53 +00:00
Korina Cordero
4fb28174c5 Normalize fuel type and status condition of vehicle when adding customer vehicle via app. #662 2022-05-02 02:45:38 +00:00
Korina Cordero
e44d8d3b06 Add Referral to source of awareness dropdown. #661 2022-04-29 05:03:17 +00:00
Korina Cordero
ebaef97333 Add Source of Awareness and Remarks to job order form. #661 2022-04-27 06:45:54 +00:00
Korina Cordero
bbea317cf1 Add Source of Awareness and Remarks to Ticket and ticket form. #661 2022-04-27 05:56:15 +00:00
Korina Cordero
0dee028045 Find customer and customer vehicle before warranty creation for warranty upload. #660 2022-04-25 08:42:43 +00:00
Korina Cordero
dad3caecf3 Fix bugs found when testing with app. #658 2022-04-12 11:00:43 +00:00
Korina Cordero
9bc1f44ca2 Clean up code. #658 2022-04-12 10:08:13 +00:00
Korina Cordero
b712b35a97 Fix checking for return. #658 2022-04-12 10:01:14 +00:00
Korina Cordero
6fff162c0e Improve error message and return value. #658 2022-04-12 09:59:35 +00:00
Korina Cordero
a6add363bd Refine the cleaning of mobile number. #658 2022-04-12 09:53:01 +00:00
Korina Cordero
466d6c124f Prepend country code to mobile numbers for SMS messaging. #658 2022-04-12 09:30:00 +00:00
ab2ca02227 Merge branch '655-import-yokohama-vehicle-battery-compatibility' into 'master'
Modify script to create vehicle if vehicle does not exist. Modify length of make in Vehicle. #655

Closes #655

See merge request jankstudio/resq!769
2022-04-11 03:06:51 +00:00
Korina Cordero
688b890fd7 Modify script to create vehicle if vehicle does not exist. Modify length of make in Vehicle. #655 2022-04-11 03:04:43 +00:00
d0d26e01e4 Merge branch '655-import-yokohama-vehicle-battery-compatibility' into 'master'
Resolve "Import Yokohama vehicle battery compatibility"

Closes #655

See merge request jankstudio/resq!767
2022-04-08 12:23:03 +00:00
Korina Cordero
bc1c6110e8 Fix issues found during testing. #655 2022-04-08 09:06:55 +00:00
Korina Cordero
928257ccdc Add motiv call to initializeOpenHubForm. #656 2022-04-07 09:58:17 +00:00
Korina Cordero
a50d591160 Redo warranty flow. #654 2022-04-07 09:32:23 +00:00
Korina Cordero
6cc9cddf1f Add command to import vehicle battery compatibility for Yokohama. #655 2022-04-06 11:01:27 +00:00
Korina Cordero
b831deacfb Add fixes. 2022-04-06 03:09:46 +00:00
Korina Cordero
789c919179 Redo command to include open job orders. 2022-04-05 10:30:49 +00:00
Korina Cordero
4e1613540d Add date argument to command. #654 2022-03-31 06:45:40 +00:00
Korina Cordero
618769ab5d Remove clearing of entitymanager. #654 2022-03-31 02:10:10 +00:00
Korina Cordero
3315565000 Create command to fulfill assigned job orders. #654 2022-03-30 10:56:09 +00:00
b4f28a3b17 Merge branch '652-make-command-to-test-getclosestopenhubs' into 'master'
Resolve "Make command to test getClosestOpenHubs"

Closes #652

See merge request jankstudio/resq!764
2022-03-24 08:20:52 +00:00
Korina Cordero
3e238347be Add hub output with distance. #652 2022-03-24 08:19:44 +00:00
Korina Cordero
c8629692e9 Change message when no hubs are found. Add checking for null if no hubs are found. #653 2022-03-24 07:44:03 +00:00
Korina Cordero
85be728bf6 Create command to test getClosestOpenHubs. #652 2022-03-24 07:32:06 +00:00
Korina Cordero
73f0e69b9a Fix issues found while testing. #651 2022-03-24 05:50:02 +00:00
Korina Cordero
e80ce9db66 Fix issues found while testing. #651 2022-03-24 05:38:18 +00:00
Korina Cordero
457bbece2b Fix issues found while testing. #651 2022-03-24 05:28:15 +00:00
Korina Cordero
b7c5f5dafe Add checking for hub slots. #651 2022-03-24 05:07:26 +00:00
Korina Cordero
d8f5b7833d Add flag for unavailable slots. #651 2022-03-23 09:48:37 +00:00
Korina Cordero
8c685536d3 Change query for vehicle manufacturers and vehicles to use raw sql. #650 2022-03-15 09:01:53 +00:00
Korina Cordero
a5a30ec7f9 Change hardcoded messages into entries in messages file. #649 2022-03-15 07:51:58 +00:00
Korina Cordero
ae477ea440 Move hardcoded labels to messages file. #649 2022-03-15 06:37:22 +00:00
Korina Cordero
4765c34be8 Update fuel prices for gas and diesel. #647 2022-03-09 03:44:16 +00:00
5b36e0d8d7 Add QR prefix removal to app api for warranty #644 2022-02-02 22:27:58 +08:00
b1150d6c93 Add clean serial functionality for QR prefix in CAPI customer warranty #643 2022-01-21 01:02:55 +08:00
Korina Cordero
8c057c216e Add mobile number to response. #641 2021-11-25 02:28:49 +00:00
Korina Cordero
5c03ccb1fb Add checking in hash service for invalid hashes. Add capi call to verify if hash belongs to customer. #641 2021-11-24 08:23:48 +00:00
Korina Cordero
b0de01ae1b Add get customer hash to api. #640 2021-11-23 05:29:51 +00:00
Korina Cordero
2e428378c6 Merge branch '632-resq-1-5-changes' of gitlab.com:jankstudio/resq into 640-new-rider-api-call-to-return-customer-hash 2021-11-23 03:12:00 +00:00
Korina Cordero
3dd2bf5de4 Remove modifications. #640 2021-11-23 03:02:03 +00:00
Korina Cordero
9c73a18b2e Add customer information to latest job order. #632 2021-11-23 02:50:49 +00:00
Korina Cordero
680a12e52a Add call to get customer hash. #640 2021-11-23 02:48:24 +00:00
Korina Cordero
0e5824af29 Add the hash generator and command to test hash generator. #640 2021-11-23 02:10:31 +00:00
Korina Cordero
ca21fcd5c9 Add landmark to response for latest jo. #632 2021-11-22 10:13:24 +00:00
Korina Cordero
1030b1934e Fix the response when no latest jo. #632 2021-11-22 08:10:12 +00:00
Korina Cordero
65c0ad1c56 Add call to get latest job order. #632 2021-11-22 06:02:50 +00:00
Korina Cordero
280a7c9c8f Fix issue found during testing. #632 2021-11-18 07:06:29 +00:00
Korina Cordero
c108647222 Add comment to response for getJOHistory. #632 2021-11-18 06:49:00 +00:00
ee07c9cc84 Fix decline in rider api to always return true, so rider app can get out of decline / accept screen 2021-11-08 18:45:36 +08:00
cc12e150f4 Merge branch '630-rider-app-timeout' into 'master-fix'
Resolve "Rider app timeout"

See merge request jankstudio/resq!743
2021-11-08 10:09:01 +00:00
Korina Cordero
09405d16ce Add setting of date_assign when JO is auto assigned. Add sql script to update date_assign of JOs. #630 2021-11-08 08:23:38 +00:00
Korina Cordero
05d50e28f7 Comment out debug log. #630 2021-11-08 07:45:31 +00:00
Korina Cordero
a7d6f20cc4 Commented out time check for schedule options. #637 2021-11-08 07:17:24 +00:00
Korina Cordero
f9de11ccb5 Fix the command to update unaccepted job orders. Add more checking before updating rider's availability. #630 2021-11-08 05:36:59 +00:00
Korina Cordero
8d5b67b020 Fix setting of landmark if no landmark is received. #632 2021-11-03 07:18:57 +00:00
Korina Cordero
12c85e5cbb Fix issue when fulfiling a JO in admin panel. #632 2021-11-03 07:02:26 +00:00
Korina Cordero
4ce09e9671 Change return response for locationSupport. #632 2021-11-03 06:27:36 +00:00
Korina Cordero
acf5d964cf Merge branch '636-fix-timing-of-vat-computation' of gitlab.com:jankstudio/resq into 632-resq-1-5-changes 2021-11-02 04:54:28 +00:00
Korina Cordero
0dce53beaa Revert VAT tax computation. #636 2021-11-02 04:46:30 +00:00
Korina Cordero
5c61e5ebea Add saving of landmark, if provided. #632 2021-10-29 08:24:42 +00:00
Korina Cordero
4a1ae91b78 Comment out call for completed job orders. Modify getJOHistory to only retrieve cancelled and fulfilled job orders. #632 2021-10-29 06:07:34 +00:00
Korina Cordero
918c06725e Add call to get completed job orders. #632 2021-10-29 05:51:12 +00:00
Korina Cordero
1f6162cb47 Fix sorting for ongoing job orders. #632 2021-10-28 09:43:07 +00:00
Korina Cordero
1d93c63da7 Add null checking for jo rating even if flag for rider rating is true. #632 2021-10-28 08:39:12 +00:00
Korina Cordero
8ebb123064 Add average rating for partners in response for closest partners. #632 2021-10-28 07:19:32 +00:00
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