Commit graph

588 commits

Author SHA1 Message Date
Korina Cordero
c7af1c1592 Add rider_slots to hub. #381 2020-04-20 03:37:40 +00:00
Korina Cordero
f33a253cea Add transaction origin to mqtt message. #380 2020-04-17 06:07:32 +00:00
Korina Cordero
a30f9b2ce8 Modify how mobile customer markers are loaded when dashboard map is loaded. #380 2020-04-17 05:17:00 +00:00
Korina Cordero
3caf23b57d Add job order details report. #379 2020-04-16 07:17:18 +00:00
Korina Cordero
932bd7c770 Add mobile customer layer to the dashboard map. 2020-04-15 07:32:05 +00:00
Korina Cordero
4fd8292d2e Fix JO link in dashboard for resq. #377 2020-04-15 03:21:47 +00:00
Korina Cordero
e1b27dea9a Add branch_code and status_open to hub form. #374 2020-04-08 10:11:43 +00:00
Korina Cordero
0e09705c1d Merge branch 'master' of gitlab.com:jankstudio/resq into 374-auto-assign-hub-and-rider 2020-04-07 03:27:59 +00:00
42abdd8097 Add z-index to dashboard map to allow for user and reports menu #364 2020-04-07 11:24:23 +08:00
Korina Cordero
9a661763a0 Add auto assign to controller. #374 2020-04-06 09:46:54 +00:00
35f237f3fa Merge branch '368-cmb-list-all-active-jobs-of-rider-on-dashboard-popup-when-clicking-on-rider-icon' into '270-final-cmb-fixes'
Resolve "CMB - list all active jobs of rider on dashboard popup when clicking on rider icon"

See merge request jankstudio/resq!414
2020-03-10 09:19:33 +00:00
Korina Cordero
a3c9c16d51 Restore active job order for rider. #368 2020-03-10 09:15:11 +00:00
Korina Cordero
9327f02623 Display active job orders of rider. #368 2020-03-10 09:07:01 +00:00
Korina Cordero
63210ab463 Rename Delivery Instructions to CarFix Details. #369 2020-03-10 08:16:53 +00:00
Korina Cordero
c4da604ac8 Made plate number a required field if new customer. #367 2020-03-10 06:07:29 +00:00
Korina Cordero
2e884ff577 Add additional columns to list of open JOs. #365 2020-03-05 07:22:38 +00:00
Korina Cordero
e93b6432b0 Add view all form for cmb. #365 2020-03-05 06:26:50 +00:00
2e3c879fd5 Support rider status changes in dashboard map #362 2020-03-05 07:15:26 +08:00
07753274c3 Add initial job order prioritization features #360 2020-03-01 22:14:13 +08:00
3496976bf5 Merge branch '358-cmb-clear-battery-details-when-new-customer-toggle-is-turned-on' into '270-final-cmb-fixes'
Resolve "CMB - clear Battery Details when New Customer toggle is turned on"

See merge request jankstudio/resq!402
2020-02-27 05:25:02 +00:00
Korina Cordero
2ab0055286 Clear battery details when New Customer toggle is on. #358 2020-02-25 09:09:51 +00:00
Korina Cordero
3d40bc6238 Remove links to onestep edit from templates for resq. Fix for getEditRoute issues found during testing. #357 2020-02-25 07:18:55 +00:00
5b19302752 Merge branch '354-cmb-and-resq-move-invoice-related-code-out-of-jocontroller' into '270-final-cmb-fixes'
Resolve "CMB and Resq - move invoice-related code out of JOController"

See merge request jankstudio/resq!395
2020-02-25 03:35:53 +00:00
Korina Cordero
22be1eaf5a Fix edit for walkin JOs. #270 2020-02-24 10:33:13 +00:00
Korina Cordero
4b9b3622d5 Fix to display service charge amount when loading an existing JO. #355 2020-02-24 03:06:47 +00:00
Korina Cordero
311cea8d48 Merge branch '329-transition-branch-for-cmb-and-resq-merging' of gitlab.com:jankstudio/resq into 355-cmb-display-amount-when-loading-existing-service-charges 2020-02-24 02:43:43 +00:00
Korina Cordero
e93e0dd943 Bug fix for loading JO form for edit. #354 2020-02-21 05:10:11 +00:00
Korina Cordero
4a12fb6eb2 Change edit to edit onestep edit and walkin. #353 2020-02-20 04:12:12 +00:00
ffa25d6c79 Merge branch '347-cmb-fix-jo-form-display-when-loading-jo-from-view-all' into '270-final-cmb-fixes'
Resolve "CMB - fix JO form display when loading JO from View All"

See merge request jankstudio/resq!393
2020-02-19 08:37:49 +00:00
Korina Cordero
cbd9f429d4 Fixed form for walkin when JO is loaded from View All. #347 2020-02-19 06:46:26 +00:00
Korina Cordero
5ab6514a86 Fixed form for onestep when JO is loaded from View All. #347 2020-02-19 06:29:31 +00:00
Korina Cordero
7b5239e548 Add checking for dashboard_enable. #334 2020-02-19 05:22:57 +00:00
Korina Cordero
a62476a833 Add create, update, list, and delete for service charges. #348 2020-02-19 03:16:27 +00:00
Korina Cordero
15fa7aafc6 Fix display of discount for walkin form when reset button for invoice is clicked. #270 2020-02-18 03:55:11 +00:00
Korina Cordero
688ccd8a91 Fix display of discount when reset button for invoice is clicked. #270 2020-02-18 02:29:22 +00:00
e48e86340a Fix bug in one step form #270 2020-02-18 10:06:44 +08:00
8e73c16b74 Fix typo in js for one step form #270 2020-02-18 10:05:59 +08:00
77fe7e8521 Remove service charges when invoice is reset in one step form #270 2020-02-18 10:03:43 +08:00
0f106ea790 Fix service charges bug in one step form #270 2020-02-18 09:52:51 +08:00
1c9ce12595 Merge branch '341-cmb-add-service-charge-dropdown' into '270-final-cmb-fixes'
Resolve "CMB - add service charge dropdown"

See merge request jankstudio/resq!387
2020-02-18 01:43:00 +00:00
Korina Cordero
9a24b08bdd Display existing service charges when editing one step JO. #341 2020-02-18 01:15:14 +00:00
d2afb99f4f Merge branch '344-cmb-rider-queue-management' into '270-final-cmb-fixes'
Add active job order feature for rider #344

See merge request jankstudio/resq!388
2020-02-17 17:01:50 +00:00
def4ed0357 Add active job order feature for rider #344 2020-02-18 01:00:19 +08:00
Korina Cordero
f9c304422c Add fix when saving an invoice with no service charges. #341 2020-02-17 14:43:21 +00:00
Korina Cordero
0cff722c6a Add saving of service charges to JO and Invoice Item. #341 2020-02-17 14:18:19 +00:00
Korina Cordero
115c207868 Add sending of service charge ids to generate invoice. #341 2020-02-17 12:21:18 +00:00
4ae899925d Merge branch '341-cmb-add-service-charge-dropdown' of gitlab.com:jankstudio/resq into 341-cmb-add-service-charge-dropdown 2020-02-17 16:13:12 +08:00
Korina Cordero
663698f087 Rename promo to discount in JO service, JO forms, and invoice generator. #341 2020-02-17 08:12:51 +00:00
34e9091297 Fix dropdown for service charges in one-step JO form #341 2020-02-17 16:12:35 +08:00
147e949aff Add initial UI for service charge support in one step job order form #341 2020-02-17 15:25:12 +08:00
Korina Cordero
984b0428d0 Fix for cmb to retain battery in invoice when editing JO. #343 2020-02-17 06:19:09 +00:00
Korina Cordero
d439a411a8 Change computation of discount for CMB. #343 2020-02-14 09:40:08 +00:00
Korina Cordero
d07adc606b Add saving of walkin form. #340 2020-02-13 08:53:57 +00:00
Korina Cordero
7e116d8d3e Add function to load walk-in form. #340 2020-02-13 07:32:18 +00:00
Korina Cordero
fde400e01f Remove text 'No current battery' for serial. #335 2020-02-12 00:51:57 +00:00
Korina Cordero
9cd5915e88 Add saving of serial when adding/editing/fulfilling a JO. #335 2020-02-11 08:09:55 +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
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
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
6cdb5d0312 Fix battery fetching for new customer in one step jo form #319 2020-02-05 05:14:42 +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
3789871f9a Add rider and date filter to search. #319 2020-02-04 08:43:39 +00:00
Korina Cordero
96efa32a12 Fixes for battery_ajax_get. #323 2020-02-04 01:39:14 +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
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
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
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
555bd5ae9a Add Cancel Job Order button to onestep form. #313 2020-01-28 05:20:11 +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
Korina Cordero
79b758f547 Fix for rider icons not displaying in map. #312 2020-01-27 06:33:03 +00:00
Korina Cordero
655ead7739 Change color of hubs and riders. #312 2020-01-27 04:30:31 +00:00
Korina Cordero
eb9b8bfdd2 Fix bug for onestep edit when user selects another hub but does not select a new rider. #312 2020-01-27 02:24:52 +00:00
2d6193318a Add ability to remove customer markers via status publish #299 2020-01-27 04:04:30 +08:00
Korina Cordero
adc6cc8c80 Add highlight to selected hub and rider when loading onestepedit form for resq. #312 2020-01-25 10:47:41 +00:00
Korina Cordero
96bed8a49e Add highlight to selected hub and rider when loading onestepedit form. #312 2020-01-25 10:42:26 +00:00
Korina Cordero
6468954316 Display hubs and riders in non-dynamic table for onestep edit. #312 2020-01-25 06:08:14 +00:00
9e00c3f115 Fix publishing and subscribing for new / updated JOs #299 2020-01-25 05:11:53 +08:00
c753be54cb Refactor dashboard map js to use classes #299 2020-01-25 01:57:15 +08: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
d418f0ff5a Remove hardcoded prefix from customer. Add country code to .env and services.yaml. #307 2020-01-22 06:42:28 +00: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
e463876c91 Create marker in dashboard map when rider id is not yet there #299 2020-01-19 21:42:16 +08:00
3667e122d0 Add mqtt websocket server settings in env file #299 2020-01-19 21:26:43 +08:00
67a7b86f32 Add handler for rider location updates in dashboard #299 2020-01-19 03:30:37 +08:00
b435cdfa1b Fix bug in map script for dashboard #299 2020-01-19 00:19:49 +08:00
ece4e6dd4d Add MQTT subscribe functionality in main dashboard #299 2020-01-18 22:45:40 +08:00
bbaaf250c6 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 299-cmb-realtime-map
Conflicts:
	config/services.yaml
2020-01-18 22:40:25 +08:00
cdf58ccc07 Merge branch '298-static-content' into 'master'
Resolve "Static Content"

Closes #298

See merge request jankstudio/resq!338
2020-01-17 08:31:21 +00:00
Korina Cordero
2aed73b2d5 Add Static Content feature. #298 2020-01-17 07:55:35 +00:00
Korina Cordero
d810fc821a Add Warranty Details Report. #297 2020-01-17 06:35:03 +00:00
Korina Cordero
260c218724 Added one step form for CMB. #270 2020-01-16 07:38:54 +00:00
Korina Cordero
35f0d9c7be Add riders to one step job order map. #270 2020-01-16 03:51:46 +00:00
Korina Cordero
a92c8c90f0 Added a di after battery details for Invoice. #270 2020-01-15 06:34:16 +00:00
Korina Cordero
99e8485065 Display invoice details for editing one step form. #270 2020-01-15 02:18:28 +00:00
Korina Cordero
8da95f2ed0 Add saving of updated form for one step job order. #270 2020-01-14 08:26:39 +00:00
Korina Cordero
3a167f0b38 Add links and routes to editing a one step job order form. #270 2020-01-14 03:34:00 +00:00
Korina Cordero
ed2975e8d3 Add validation when submitting a one step job order. #270 2020-01-10 09:53:51 +00:00
Korina Cordero
b7b673fdaf Add rider selection to one step form. #270 2020-01-10 05:53:28 +00:00
Korina Cordero
0ed4e10251 Add rider assignment to one step form. #270 2020-01-10 05:33:11 +00:00
Korina Cordero
72abf2f211 Add rider assignment section to form. #270 2020-01-09 08:23:49 +00:00
Korina Cordero
0771f2b8d0 Add selection of hub. #270 2020-01-09 08:12:12 +00:00
Korina Cordero
16763c5386 Add vehicle battery compatibility report. #291 2020-01-07 08:36:00 +00:00
51850d0230 Add one step job order process form #270 2019-12-18 04:06:45 +08:00
Korina Cordero
a21d0509fd Fix centering issue for hub map when dispatching a job order. #270 2019-12-17 03:12:45 +00:00
Korina Cordero
2d023b5e69 Fix location issue in incoming job order. #270 2019-12-17 02:42:50 +00:00
1b6727ca3d Expand map to 100% height #270 2019-12-17 09:10:55 +08:00
e4277b8915 Remove footer #270 2019-12-17 09:10:40 +08:00
008e482fe8 Modify dashboard to display customers and riders with popup details #270 2019-12-17 02:08:32 +08:00
bd1dd36e5e Prettify the map in the dashboard #270 2019-12-16 20:26:49 +08:00
Korina Cordero
494ae85467 Add OpenStreet implementation to resq form. #270 2019-12-16 08:56:00 +00:00
Korina Cordero
185ac8aa0d Add TODO for the access token. #270 2019-12-16 08:32:49 +00:00
Korina Cordero
8e33149557 Add TODO for the OSM implementation for job order. #270 2019-12-16 08:26:08 +00:00
Korina Cordero
8bbe245ce9 Add snippet and comments that will not display the riders by default. #270 2019-12-16 05:24:02 +00:00
Korina Cordero
fdf6861819 Change icons for the hub map. #270 2019-12-09 08:08:17 +00:00
Korina Cordero
bf2231037d Change implementation of all maps for job order to OpenStreet. #270 2019-12-09 08:02:29 +00:00
Korina Cordero
5bdc1a7f86 Use OpenStreetMap for map in incoming JO form. #270 2019-12-06 08:16:04 +00:00
Korina Cordero
d04a6976f2 Use OpenStreetMap for map in incoming form. #270 2019-12-05 07:40:52 +00:00
Korina Cordero
93692415a6 Add rider id to marker popup. #270 2019-12-05 05:30:13 +00:00
Korina Cordero
734aaac320 Add display of rider markers for OSM. #270 2019-12-05 05:13:15 +00:00
Korina Cordero
505fa86f72 Fix console error when google or bing maps are used. #270 2019-12-04 08:13:24 +00:00
Korina Cordero
e2dd980a2d Rename twig block for javascript. #270 2019-12-04 03:28:33 +00:00
Korina Cordero
ade2c3b5de Add map manager interface. #270 2019-12-03 09:42:23 +00:00
Korina Cordero
9e9dba957e Change the map in the Dashboard to use leaflet and openmaps. #270 2019-12-02 08:24:17 +00:00
Korina Cordero
743bbf9c61 Add warranty class report to yaml files, templates and ReportController. #283 2019-11-27 08:04:42 +00:00
Korina Cordero
11b60c8655 Merge branch '258-upload-warranty-csv' into 'master'
Resolve "Upload warranty csv"

Closes #258

See merge request jankstudio/resq!305
2019-11-18 03:10:07 +00:00
Korina Cordero
d385d32d2e Move the adding of customer and customer vehicle to customer handler service. #270 2019-11-12 03:58:51 +00:00
Korina Cordero
341db63735 Create a twig template for job order for resq, separate from cmb. #270 2019-11-11 04:52:32 +00:00
Korina Cordero
a0ad1b0047 Add asterisks to required fields for job order. #270 2019-11-07 02:39:02 +00:00
Korina Cordero
954ae0e2d3 Removed the color, status, and fuel type fields for customer vehicle. #270 2019-11-07 02:10:13 +00:00
Korina Cordero
29cc7374cc Add custom trade in types, warranty class, and modes of payment. #270 2019-10-29 04:54:51 +00:00
Korina Cordero
f5606d83c0 Add label to rider markers. #270 2019-10-28 07:38:05 +00:00