Commit graph

650 commits

Author SHA1 Message Date
Korina Cordero
9cd5915e88 Add saving of serial when adding/editing/fulfilling a JO. #335 2020-02-11 08:09:55 +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
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
0af69bd963 Fix for payment bug. #327 2020-02-06 03:08:51 +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
a3e40de170 Add adding of customer and customer vehicle from one step form. #319 2020-02-05 03:15:30 +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
3789871f9a Add rider and date filter to search. #319 2020-02-04 08:43:39 +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
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
Korina Cordero
aa1a2b3bcb Move the hubArrive function to the service. #311 2020-01-31 09:04:04 +00:00
Korina Cordero
bf3136da62 Move the arrive function to the service. #311 2020-01-31 08:53:35 +00:00
Korina Cordero
b651d06ec8 Move cancelJobOrder to the service. #311 2020-01-31 08:16:11 +00:00
Korina Cordero
becd8d0c17 Move acceptJobOrder to the service. #311 2020-01-31 06:21:35 +00:00
Korina Cordero
3e5ea688bc Move logout and getJobOrder to the service. #311 2020-01-31 04:22:27 +00:00
Korina Cordero
cbc99778cd Move login to the service. #311 2020-01-30 08:52:41 +00:00
Korina Cordero
4d104d38e1 Move the register function from controller to service. #311 2020-01-30 07:47:34 +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
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
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
Korina Cordero
234d993d8f Add deletion of compatible battery from vehicle. #317 2020-01-29 09:03:56 +00:00
c8157b9509 Add functionality to job order tracking page #270 2020-01-29 01:13:47 +08:00
Ramon Gutierrez
e914c6d2e1 Add customer jo tracking view #315 2020-01-28 21:51:32 +08:00
Korina Cordero
bc8ce40b13 Add distance from customer to hub to hub table. #314 2020-01-28 07:24:14 +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
4719d89368 Add rider cache service #299 2020-01-28 04:32:05 +08:00
cba80ddd90 Have active job orders loaded from cache in dashboard map #299 2020-01-26 00:58:00 +08:00
Korina Cordero
fd0738ad57 Merge branch '309-replace-63-in-templates-with-proper-country-code' of gitlab.com:jankstudio/resq into 312-cmb-highlight-selected-hub-and-rider-in-onestep-edit 2020-01-25 01:50:06 +00:00
Korina Cordero
3eb7c2c426 Update RAPIController.php 2020-01-25 01:31:18 +00:00
Korina Cordero
c9185e6139 Bug fixes for RAPIController. #309 2020-01-24 08:48:16 +00:00
Korina Cordero
8e613a43b1 Bug fixes from merge. Remove hardcoded country code prefixes from onestep form. #309 2020-01-24 06:22:12 +00:00
Korina Cordero
5a138ce09f Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 309-replace-63-in-templates-with-proper-country-code 2020-01-24 05:37:30 +00:00
Korina Cordero
69f0612a2d Replace hardcoded country code prefixes with variables set in .env and messages files. #309 2020-01-24 04:05:48 +00:00
68a92b2daf Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 299-cmb-realtime-map 2020-01-23 18:17:10 +08:00
Korina Cordero
d6015978ae Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 307-cmb-fix-customer-hard-coded-country-code 2020-01-22 04:54:01 +00:00
ec5e67a641 Make customer marker popup load via ajax #299 2020-01-22 05:10:49 +08:00
eac8f41d84 Make rider markers load popup via ajax #299 2020-01-22 04:03:25 +08:00