rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions
2542 commits 749 branches 8 tags 145 MiB
Commit graph

2542 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kendrick Chan
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
Kendrick Chan
11c323f39a Merge branch '637-set-up-24-7-ordering-using-app' into 'master-fix' 
Resolve "Set up 24/7 ordering using app"

See merge request jankstudio/resq!750
 2021-11-08 10:08:10 +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
Kendrick Chan
4d66345ae3 Merge branch '636-fix-timing-of-vat-computation' into 'master-fix' 
Revert VAT tax computation. #636

See merge request jankstudio/resq!749
 2021-11-02 04:52:50 +00:00
Korina Cordero
0dce53beaa Revert VAT tax computation. #636 2021-11-02 04:46:30 +00:00
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
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
Kendrick Chan
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
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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