Commit graph

1533 commits

Author SHA1 Message Date
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
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
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
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
ed606a87af Merge branch '318-error_log-cleanup' into '270-final-cmb-fixes'
Resolve "error_log cleanup"

See merge request jankstudio/resq!364
2020-01-30 04:16:03 +00:00
Korina Cordero
10ecd6298a Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 318-error_log-cleanup 2020-01-30 04:03:44 +00:00
bfbe4ca95e Merge branch '318-error_log-cleanup' into 'master'
Resolve "error_log cleanup"

Closes #318

See merge request jankstudio/resq!363
2020-01-30 03:55:54 +00:00
Korina Cordero
dab8986ad1 Remove or comment out error_logs meant for debugging purposes. #318 2020-01-30 00:31:01 +00:00
84293cb45a Merge branch '317-delete-icon-for-battery-in-vehicle-screen' into '270-final-cmb-fixes'
Resolve "Delete icon for battery in vehicle screen"

See merge request jankstudio/resq!362
2020-01-29 11:18:50 +00:00
15ec71d3d0 Merge branch '317-delete-icon-for-battery-in-vehicle-screen' into 'master'
Resolve "Delete icon for battery in vehicle screen"

Closes #317

See merge request jankstudio/resq!361
2020-01-29 11:17:24 +00:00
Korina Cordero
33fdc857f2 Add deletion of battery from vehicle when vehicle has more than one compatible battery. #317 2020-01-29 11:16:07 +00:00
e8e97bcd6b Fix jo link in rider and customer popup in dashboard #270 2020-01-29 19:13:49 +08:00
Korina Cordero
234d993d8f Add deletion of compatible battery from vehicle. #317 2020-01-29 09:03:56 +00:00
41a6801c19 Fix string concat bug in jo tracking page #270 2020-01-29 01:20:40 +08:00
c8157b9509 Add functionality to job order tracking page #270 2020-01-29 01:13:47 +08:00
Ramon Gutierrez
4f1a5f2e5e Merge branch '315-cmb-add-customer-view-of-job-order' into '270-final-cmb-fixes'
Add customer jo tracking view #315

See merge request jankstudio/resq!359
2020-01-28 13:53:00 +00:00
Ramon Gutierrez
e914c6d2e1 Add customer jo tracking view #315 2020-01-28 21:51:32 +08:00
8d45b8e698 Merge branch '314-cmb-add-hub-distance-to-customer-on-one-step-hub-table' into '270-final-cmb-fixes'
Resolve "CMB - add hub distance to customer on one step hub table"

See merge request jankstudio/resq!358
2020-01-28 07:39:51 +00:00
Korina Cordero
bc8ce40b13 Add distance from customer to hub to hub table. #314 2020-01-28 07:24:14 +00:00
Korina Cordero
555bd5ae9a Add Cancel Job Order button to onestep form. #313 2020-01-28 05:20:11 +00:00
Korina Cordero
44276670e1 Merge branch '312-cmb-highlight-selected-hub-and-rider-in-onestep-edit' of gitlab.com:jankstudio/resq into 313-cmb-add-cancel-button-to-onestep-form 2020-01-28 05:04:09 +00:00
Korina Cordero
ffb4551fb1 Update composer lock after running composer require. #312 2020-01-28 05:03:20 +00:00
Korina Cordero
0daf2a2813 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 312-cmb-highlight-selected-hub-and-rider-in-onestep-edit 2020-01-28 03:00:42 +00:00
6dd3f3377e Merge branch '309-replace-63-in-templates-with-proper-country-code' into '270-final-cmb-fixes'
Resolve "Replace +63 in templates with proper country code"

See merge request jankstudio/resq!350
2020-01-28 02:54:08 +00:00
a82cfb2691 Fix bug for dashboard rider #270 2020-01-28 05:55:22 +08:00
9563bd8cb2 Fix dashboard bug for active riders not in the database #270 2020-01-28 05:53:52 +08:00
86b4601bb8 Fix bug in rider cache #270 2020-01-28 05:37:41 +08:00