Commit graph

1769 commits

Author SHA1 Message Date
Korina Cordero
f0212cc6d4 Add checkIfNewBattery function to job order service. Add RiderAPIHandler to the respective services.yaml. #336 2020-02-11 05:54:58 +00:00
Korina Cordero
23253a1e65 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 336-trans-method-to-check-if-new-battery 2020-02-11 05:03:47 +00:00
2226f7c819 Merge branch '311-cmb-refactor-rapicontroller-into-a-service' into '270-final-cmb-fixes'
Resolve "CMB - Refactor RAPIController into a service"

See merge request jankstudio/resq!367
2020-02-11 04:46:03 +00:00
cf7e026948 Merge branch '324-add-new-fields-for-jo-form' into '329-transition-branch-for-cmb-and-resq-merging'
Resolve "Add new fields for JO form"

See merge request jankstudio/resq!375
2020-02-11 02:05:56 +00:00
Korina Cordero
4d8ddc5323 Modify the retrieval of the flags from request object. #324 2020-02-11 01:49:24 +00:00
Korina Cordero
38d56d9c09 Set default value for the flags to false. #324 2020-02-11 01:36:13 +00:00
Korina Cordero
e202fb650c Disable the new fields if editing JO form. #324 2020-02-10 08:35:31 +00:00
Korina Cordero
716f263e6b Make editable the new fields in JO form. #324 2020-02-10 08:13:36 +00:00
Korina Cordero
5dc57dc073 Add new fields to customer form. #324 2020-02-10 05:44:00 +00:00
Korina Cordero
e260edc80d Add new fields to incoming job order form. #324 2020-02-10 03:40:00 +00:00
Korina Cordero
fc6edb2b25 Merge branch '329-transition-branch-for-cmb-and-resq-merging' of gitlab.com:jankstudio/resq into 324-add-new-fields-for-jo-form 2020-02-10 02:49:31 +00:00
Korina Cordero
52f075ccba Add new fields to customer. #324 2020-02-10 02:48:21 +00:00
d62a36b6db Merge branch '333-rider-assignment-handler-for-resq' into '329-transition-branch-for-cmb-and-resq-merging'
Add rider assignment handler for resq. #333

See merge request jankstudio/resq!373
2020-02-07 08:42:21 +00:00
Korina Cordero
0df0955cb3 Add rider assignment handler for resq. #333 2020-02-07 08:19:51 +00:00
Korina Cordero
8bbc39ec9e Merge branch '311-cmb-refactor-rapicontroller-into-a-service' of gitlab.com:jankstudio/resq into 329-transition-branch-for-cmb-and-resq-merging 2020-02-07 02:24:17 +00:00
Korina Cordero
088dca5a11 Create two separate services.yaml for resq and cmb. #329 2020-02-06 07:53:56 +00:00
Korina Cordero
eceb20f2b6 Add resq counterparts in services.yaml. #329 2020-02-06 07:33:08 +00:00
Korina Cordero
8dbcd0478d Add riders and dates to query filters. #329 2020-02-06 07:29:23 +00:00
Korina Cordero
b7cae5afe2 Add getOtherParameters to Resq job order handler. #329 2020-02-06 07:21:39 +00:00
Korina Cordero
49d0e6b97e Resolve missed merge conflict. #329 2020-02-06 05:43:15 +00:00
Korina Cordero
60e3d3673f Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 329-transition-branch-for-cmb-and-resq-merging 2020-02-06 05:38:57 +00:00
Korina Cordero
075c83fb0d Add checking for valid plate number before warranty creation after JO is fulfilled. #311 2020-02-06 05:25:30 +00:00
Korina Cordero
1fc64cef8a Add checking for valid plate number before warranty creation after JO is fulfilled. #311 2020-02-06 04:59:48 +00:00
506505bff5 Merge branch '327-rapicontroller-fix-for-payment' into 'master'
Resolve "RAPIController fix for payment"

Closes #327

See merge request jankstudio/resq!369
2020-02-06 03:15:29 +00:00
Korina Cordero
0af69bd963 Fix for payment bug. #327 2020-02-06 03:08:51 +00:00
Korina Cordero
91182fbc38 Remove git conflict message. #311 2020-02-05 23:47:53 +00:00
3e2d0db5cd Merge branch '319-cmb-one-step-form-display-rider-distance' into '270-final-cmb-fixes'
Resolve "CMB - one step form display rider distance"

See merge request jankstudio/resq!368
2020-02-05 11:07:43 +00:00
Korina Cordero
36657cbdf0 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 311-cmb-refactor-rapicontroller-into-a-service 2020-02-05 08:25:18 +00:00
Korina Cordero
3300400456 Move the rest of the functions to the service. #311 2020-02-05 08:19:10 +00:00
Korina Cordero
295dbaa254 Remove Rider label and added option AllRiders to Rider dropdown. #319 2020-02-05 05:39:45 +00:00
Korina Cordero
cf783bf1cb Added validations to customer and customer vehicle data. #319 2020-02-05 05:28:59 +00:00
Korina Cordero
a3e40de170 Add adding of customer and customer vehicle from one step form. #319 2020-02-05 03:15:30 +00:00
eee516a6b5 Merge branch '319-cmb-one-step-form-display-rider-distance' into '270-final-cmb-fixes'
Resolve "CMB - one step form display rider distance"

See merge request jankstudio/resq!366
2020-02-04 21:22:12 +00:00
6cdb5d0312 Fix battery fetching for new customer in one step jo form #319 2020-02-05 05:14:42 +08:00
cb5fa96307 Fix bug with missing entity manager for one step edit #319 2020-02-05 04:45:27 +08:00
d943015f4a Merge branch '319-cmb-one-step-form-display-rider-distance' of gitlab.com:jankstudio/resq into 319-cmb-one-step-form-display-rider-distance 2020-02-05 04:37:33 +08:00
746b25ad74 Fix one step form for CMB to allow for new customer and vehicle #319 2020-02-05 04:36:33 +08:00
Korina Cordero
b6700eed36 Add rider and date query parameters for list of to be fulfilled and open job orders. #319 2020-02-04 11:15:10 +00:00
4ad0db07e8 Add new customer option enabling customer and vehicle fields #319 2020-02-04 18:39:14 +08:00
Korina Cordero
15bafe2363 Fix for query when multiple parameters are passed. #319 2020-02-04 10:33:12 +00:00
Korina Cordero
3789871f9a Add rider and date filter to search. #319 2020-02-04 08:43:39 +00:00
f3e1fd437c Merge branch '323-add-button-for-battery-compatibility-in-vehicle-form' into 'master'
Resolve "Add button for battery compatibility in vehicle form"

Closes #323

See merge request jankstudio/resq!365
2020-02-04 01:58:34 +00:00
Korina Cordero
56a797533d Add processing of deleting and adding a battery in one request. #323 2020-02-04 01:54:43 +00:00
Korina Cordero
96efa32a12 Fixes for battery_ajax_get. #323 2020-02-04 01:39:14 +00:00
ca8d6fb57d Add multipolygon type #319 2020-02-04 09:12:17 +08:00
2093bbde92 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 319-cmb-one-step-form-display-rider-distance 2020-02-04 08:58:57 +08:00
Korina Cordero
ac908e9bcd Add saving of battery to vehicle. #323 2020-02-03 11:23:57 +00:00
Korina Cordero
6bcdf70902 Display the battery to be added to the form. #323 2020-02-03 11:03:52 +00:00
Korina Cordero
fd2fe4fb6f Add routes and UI elements to add compatible battery to vehicle. #323 2020-02-03 08:59:22 +00:00
Korina Cordero
05af87ed9c Move payment to the service. Move updateVehicleBattery to the JO handler for RAPIController. #311 2020-01-31 10:05:08 +00:00