Commit graph

2540 commits

Author SHA1 Message Date
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
07f7457937 Merge branch '636-fix-timing-of-vat-computation' into 'master-fix'
Fix response for vat ex price . #636

See merge request jankstudio/resq!748
2021-10-28 02:12:23 +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
764c9e690c Merge branch '636-fix-timing-of-vat-computation' into 'master-fix'
Resolve "Fix timing of vat computation"

See merge request jankstudio/resq!747
2021-10-26 05:20:02 +00:00
Korina Cordero
0fe66f4719 Fix display of VAT. #636 2021-10-25 08:50:15 +00:00
Korina Cordero
44611915e5 Fix VAT computation when trade ins and discounts are present. #636 2021-10-25 08:37:19 +00:00
97070ded9a Merge branch '633-refuel-fee-changes' into 'master-fix'
Resolve "Refuel fee changes"

See merge request jankstudio/resq!746
2021-10-22 10:44:01 +00:00
Korina Cordero
50c67d7088 Modify the fuel charges for gas and diesel. #633 2021-10-22 10:19:37 +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
1f067dd2ef Merge branch '631-change-dealer-information-for-selected-warranties' into 'master-fix'
Resolve "Change dealer information for selected warranties"

See merge request jankstudio/resq!744
2021-10-21 04:10:31 +00:00
Korina Cordero
46ea41f034 Add command to update dealer information for warranties. #631 2021-10-21 03:21:09 +00:00
94f2cc75a7 Merge branch '628-sort-the-compatible-batteries-by-price-descending' into 'master-fix'
Resolve "Sort the compatible batteries by price descending"

See merge request jankstudio/resq!741
2021-10-12 08:06:11 +00:00
Korina Cordero
d750c6b8ba Add sorting to Vehicle's getBatteries. #628 2021-10-12 07:53:17 +00:00
8056cb6d29 Merge branch '626-improve-loading-for-jo-for-dispatch' into 'master-fix'
Resolve "Improve loading for JO for Dispatch"

See merge request jankstudio/resq!740
2021-10-08 12:36:07 +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
38ce447b0a Merge branch '625-new-rider-cannot-log-in-to-app' into 'master-fix'
Resolve "New rider cannot log in to app"

See merge request jankstudio/resq!739
2021-10-06 04:14:23 +00:00
Korina Cordero
c6654bd3c6 Add creation of rider api user when rider is created. #625 2021-10-06 03:52:37 +00:00
697fa20071 Merge branch '624-app-error-when-customer-requests-tire-assistance' into 'master-fix'
Resolve "App error when customer requests tire assistance"

See merge request jankstudio/resq!738
2021-09-29 07:03:50 +00:00
Korina Cordero
21cf667b47 Add check for battery. #624 2021-09-29 06:44:04 +00:00
1db04374ec Merge branch '622-arrive-button-does-not-show-up-when-jo-is-auto-assigned' into 'master-fix'
Resolve "Arrive button does not show up when JO is auto assigned"

See merge request jankstudio/resq!736
2021-09-09 10:53:22 +00:00
Korina Cordero
f43d2f10fe Change QoS level to 1 when publishing messages. #622 2021-09-09 10:42:31 +00:00
0ababa77c2 Merge branch '621-check-for-null-current-job-order-when-re-assigning-rider-to-jo' into 'master-fix'
Resolve "Check for null current job order when re-assigning rider to JO"

See merge request jankstudio/resq!735
2021-09-09 03:52:47 +00:00
Korina Cordero
8dd06b2d5e Add null check for previous rider when re-assigning rider. #621 2021-09-09 03:40:53 +00:00
8ef2617f87 Merge branch '620-add-new-shift-to-rider-optimization' into 'master-fix'
Add new hour shifts to script. #620

See merge request jankstudio/resq!734
2021-09-08 03:06:40 +00:00
Korina Cordero
89370b4bd0 Add new hour shifts to script. #620 2021-09-08 03:04:31 +00:00
4ea21f7004 Merge branch '620-add-new-shift-to-rider-optimization' into 'master-fix'
Resolve "Add new shift to rider optimization"

See merge request jankstudio/resq!733
2021-09-08 02:23:13 +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
82a49aa7ca Merge branch '618-add-new-events-to-jo-details-and-jo-events-reports' into 'master-fix'
Resolve "Add new events to JO Details and JO Events Reports"

See merge request jankstudio/resq!731
2021-08-24 09:56:34 +00:00
Korina Cordero
55172332ed Merge branch 'master-fix' of gitlab.com:jankstudio/resq into 618-add-new-events-to-jo-details-and-jo-events-reports 2021-08-24 09:17:56 +00:00
e271034331 Merge branch '617-migrate-rider-api' into 'master-fix'
Resolve "Migrate Rider API"

See merge request jankstudio/resq!730
2021-08-24 08:59:04 +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