Korina Cordero
|
615b5a3390
|
Merge branch 'master' of gitlab.com:jankstudio/resq into 329-transition-branch-for-cmb-and-resq-merging
|
2020-04-03 02:32:07 +00:00 |
|
|
|
03d2133716
|
Merge branch '334-trans-make-env-entry-for-disabling-dashboard' into '329-transition-branch-for-cmb-and-resq-merging'
Resolve "TRANS - make .env entry for disabling dashboard"
See merge request jankstudio/resq!392
|
2020-02-19 05:26:08 +00:00 |
|
Korina Cordero
|
7b5239e548
|
Add checking for dashboard_enable. #334
|
2020-02-19 05:22:57 +00:00 |
|
Korina Cordero
|
524378f6e0
|
Add dashboard_enable to .env.dist. #334
|
2020-02-19 04:21:34 +00:00 |
|
|
|
592c8e8149
|
Merge branch '336-trans-method-to-check-if-new-battery' into '329-transition-branch-for-cmb-and-resq-merging'
Resolve "TRANS - method to check if new battery"
See merge request jankstudio/resq!378
|
2020-02-13 02:46:49 +00:00 |
|
Korina Cordero
|
1595954ab7
|
Merge branch '329-transition-branch-for-cmb-and-resq-merging' of gitlab.com:jankstudio/resq into 336-trans-method-to-check-if-new-battery
|
2020-02-13 02:45:58 +00:00 |
|
Korina Cordero
|
29be1e9493
|
Fix wiring for resq rider api handler. #329
|
2020-02-12 06:34:03 +00:00 |
|
Korina Cordero
|
f354631dfa
|
Add RiderAPIHandler to services.yaml for resq and cmb. #329
|
2020-02-12 06:14:12 +00:00 |
|
Korina Cordero
|
c81a56c6e6
|
Modify the checking if service type is new battery. #336
|
2020-02-12 02:33:14 +00:00 |
|
Korina Cordero
|
4f9e7959b5
|
Merge branch '329-transition-branch-for-cmb-and-resq-merging' of gitlab.com:jankstudio/resq into 336-trans-method-to-check-if-new-battery
|
2020-02-12 01:41:50 +00:00 |
|
|
|
54fa550859
|
Merge branch '335-cmb-editable-battery-serial-number' into '329-transition-branch-for-cmb-and-resq-merging'
Resolve "CMB - editable battery serial number"
See merge request jankstudio/resq!377
|
2020-02-12 00:56:59 +00:00 |
|
Korina Cordero
|
fde400e01f
|
Remove text 'No current battery' for serial. #335
|
2020-02-12 00:51:57 +00:00 |
|
|
|
866910db9d
|
Updated composer #335
|
2020-02-11 20:42:31 +08:00 |
|
|
|
3981dd9537
|
Set services to CMB #335
|
2020-02-11 20:34:43 +08:00 |
|
|
|
fb76cb0445
|
Replace ObjectManager with EntityManagerInterface #335
|
2020-02-11 20:31:28 +08:00 |
|
|
|
d51a98a6a0
|
Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 335-cmb-editable-battery-serial-number
|
2020-02-11 18:27:34 +08: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
|
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 |
|
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 |
|
|
|
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
|
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
|
de4bf9f271
|
Bug fixes for acceptJobOrder. #311
|
2020-01-31 07:55:26 +00:00 |
|
Korina Cordero
|
becd8d0c17
|
Move acceptJobOrder to the service. #311
|
2020-01-31 06:21:35 +00:00 |
|
Korina Cordero
|
35ccaa73c3
|
Add country code to constructor of RiderAPIHandler service. #311
|
2020-01-31 06:04:18 +00:00 |
|
Korina Cordero
|
3e5ea688bc
|
Move logout and getJobOrder to the service. #311
|
2020-01-31 04:22:27 +00:00 |
|
Korina Cordero
|
c3662cd185
|
Add login to interface. #311
|
2020-01-30 08:53:56 +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
|
74c239cfd6
|
Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 311-cmb-refactor-rapicontroller-into-a-service
|
2020-01-30 06:16:02 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
676bf40004
|
Merge branch '299-cmb-realtime-map' into '270-final-cmb-fixes'
Resolve "CMB - realtime map"
See merge request jankstudio/resq!354
|
2020-01-27 20:36:26 +00:00 |
|
|
|
4719d89368
|
Add rider cache service #299
|
2020-01-28 04:32:05 +08:00 |
|
|
|
bdb306e5e1
|
Fix bug in mqtt_rider script #299
|
2020-01-28 04:31:41 +08: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
|
ce9a1abd6e
|
Merge branch '312-cmb-highlight-selected-hub-and-rider-in-onestep-edit' of gitlab.com:jankstudio/resq into 311-cmb-refactor-rapicontroller-into-a-service
|
2020-01-27 03:32:16 +00:00 |
|
Korina Cordero
|
879e1129ee
|
Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 311-cmb-refactor-rapicontroller-into-a-service
|
2020-01-27 03:30:50 +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 |
|
|
|
a5a95a45d0
|
Create new mqtt_rider utility script for rider location caching #299
|
2020-01-27 04:03:53 +08:00 |
|
|
|
f350b3ebb8
|
Make command to load active job order cache #299
|
2020-01-26 02:06:30 +08:00 |
|
|
|
cba80ddd90
|
Have active job orders loaded from cache in dashboard map #299
|
2020-01-26 00:58:00 +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 |
|
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
|
5279e88618
|
Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 312-cmb-highlight-selected-hub-and-rider-in-onestep-edit
|
2020-01-25 01:23:52 +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 |
|
|
|
66be351bd3
|
Make MQTT key configurable #299
|
2020-01-24 20:46:25 +08: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 |
|
|
|
ce0d0fb29c
|
Add initial job order active cache that listens to JobOrder entity events #299
|
2020-01-24 03:21:14 +08:00 |
|
|
|
fe7cfe6c86
|
Refactor RedisClientProvider #299
|
2020-01-24 03:19:51 +08:00 |
|
|
|
fb52b59ad9
|
Refactor mqtt sender script #299
|
2020-01-24 03:17:42 +08:00 |
|
|
|
0297d66dd5
|
Merge branch '299-cmb-realtime-map' into '270-final-cmb-fixes'
Resolve "CMB - realtime map"
See merge request jankstudio/resq!348
|
2020-01-23 10:18:24 +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 |
|
|
|
1545f62325
|
Merge branch '308-cmb-move-warranty-creation-to-the-warranty-handler-for-cmbjoborderhandler' into '270-final-cmb-fixes'
Move warranty creation when JO is fulfilled to the warranty handler for CMB. #308
See merge request jankstudio/resq!347
|
2020-01-23 10:16:21 +00:00 |
|
Korina Cordero
|
2c9f5180e3
|
Move warranty creation when JO is fulfilled to the warranty handler for CMB. #308
|
2020-01-23 07:47:32 +00:00 |
|
|
|
39adfe1958
|
Merge branch '305-cmb-add-warranty-creation-when-jo-is-fulfilled-to-resqjoborderhandler' into '270-final-cmb-fixes'
Resolve "CMB - Add warranty creation when JO is fulfilled to ResqJobOrderHandler"
See merge request jankstudio/resq!346
|
2020-01-23 04:09:42 +00:00 |
|
|
|
5ac6127e19
|
Merge branch '307-cmb-fix-customer-hard-coded-country-code' into '270-final-cmb-fixes'
Resolve "CMB fix customer hard-coded country code"
See merge request jankstudio/resq!345
|
2020-01-23 03:52:03 +00:00 |
|
Korina Cordero
|
2f9f787e1d
|
Added CMB CustomerHandler in services.yaml. #305
|
2020-01-23 03:49:44 +00:00 |
|
Korina Cordero
|
d569c666e3
|
Add warranty creation when JO is fulfilled to ResqJobOrderHandler. #305
|
2020-01-22 08:18:30 +00:00 |
|
Korina Cordero
|
8727c227e4
|
Merge branch '307-cmb-fix-customer-hard-coded-country-code' of gitlab.com:jankstudio/resq into 305-cmb-add-warranty-creation-when-jo-is-fulfilled-to-resqjoborderhandler
|
2020-01-22 07:33:31 +00:00 |
|
Korina Cordero
|
026a1aa4ba
|
Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 305-cmb-add-warranty-creation-when-jo-is-fulfilled-to-resqjoborderhandler
|
2020-01-22 07:31:02 +00: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 |
|
|
|
68fd16e67c
|
Shift to CMB configuration #299
|
2020-01-21 22:08:12 +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 |
|
|
|
d2286f21ff
|
Add rider_id to RAPI login return data #299
|
2020-01-19 19:49:38 +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 |
|
|
|
425c235ca6
|
Include kml directory in gitignore #299
|
2020-01-18 22:46:42 +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 |
|
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
|
79ab60619b
|
Add saving of one step job order data. #270
|
2020-01-10 10:26:32 +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
|
603919667f
|
Add form tags for the one step form. #270
|
2020-01-09 02:19:24 +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 |
|
|
|
5852b82523
|
Make resq translation file the default #270
|
2019-12-16 20:26:28 +08:00 |
|
|
|
5b2b56546b
|
Add default resq services and comment out cmb for easy swap #270
|
2019-12-16 20:25:55 +08:00 |
|
|
|
2f3e8df6d4
|
Fix dashboard map bug when rider has no assigned hub #270
|
2019-12-16 20:25:15 +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
|
1533987727
|
Add a TODO for the JobHandlerInterface. #270
|
2019-11-14 05:56:45 +00:00 |
|
Korina Cordero
|
4549e124eb
|
Add job order queueing for riders assignments. #270
|
2019-11-14 05:54:37 +00:00 |
|
Korina Cordero
|
174f0142c9
|
Move getCustomerVehicleInfo to the customer handler service. #270
|
2019-11-13 02:14:46 +00:00 |
|
Korina Cordero
|
8f875f1e31
|
Move getCustomerVehicles to the customer handler service. #270
|
2019-11-13 01:53:48 +00:00 |
|
Korina Cordero
|
cc3db5b58c
|
Move the delete customer to the service. #270
|
2019-11-12 07:48:35 +00:00 |
|
Korina Cordero
|
fb6823d25c
|
Move the customer list to the customer handler service. #270
|
2019-11-12 07:25:56 +00:00 |
|
Korina Cordero
|
3a33a16cc5
|
Move the loading of customer list page to the customer service. #270
|
2019-11-12 06:41:16 +00:00 |
|
Korina Cordero
|
0a8ba8ca7d
|
Remove old implementation for update customer. #270
|
2019-11-12 06:06:11 +00:00 |
|
Korina Cordero
|
50e54f6acc
|
Move the update of customer and customer vehicle to customer handler service. #270
|
2019-11-12 05:57:47 +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
|
58c671fe88
|
Add TODO for country code prefix. #270
|
2019-11-11 05:25:48 +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
|
9165fa1ef1
|
Remove error_logs. #270
|
2019-11-07 02:11:30 +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
|
2bb213ef33
|
Move the dashboard routes to home.yaml. #270
|
2019-10-30 06:06:40 +00:00 |
|
Korina Cordero
|
934afecee2
|
Remove unnecessary comments from command. #270
|
2019-10-30 02:20:32 +00:00 |
|
Korina Cordero
|
f70155a137
|
Update redis cache for rider session when rider registers or logs in. #270
|
2019-10-30 01:50:06 +00:00 |
|
Korina Cordero
|
c3195418b1
|
Add command to seed current rider sessions to redis cache. #270
|
2019-10-30 01:24:54 +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 |
|
Korina Cordero
|
c05921cdf7
|
Add autorefresh for rider locations in map. #270
|
2019-10-25 08:59:52 +00:00 |
|
Korina Cordero
|
76b291f6d7
|
Add the rider tracker service to retrieve and display all rider locations. #270
|
2019-10-24 11:23:20 +00:00 |
|
Korina Cordero
|
01ffdea2d7
|
Add map to Dashboard. #270
|
2019-10-24 06:39:22 +00:00 |
|
Korina Cordero
|
26d2dab6d8
|
Remove warranty creation when service type is battery replacement under warranty. #270
|
2019-10-18 07:07:16 +00:00 |
|
Korina Cordero
|
a209475849
|
Add warranty creation when rider confirms payment of JO. #270
|
2019-10-16 07:36:36 +00:00 |
|
Korina Cordero
|
e7584b103c
|
Add warranty creation after a job order is fulfilled. #270
|
2019-10-16 06:53:13 +00:00 |
|
Korina Cordero
|
74e0938465
|
Add autocomplete for maps in outlet, hub, and partner. #270
|
2019-10-15 06:18:59 +00:00 |
|
Korina Cordero
|
ff58ccf9d0
|
Add autocomplete for maps in job order. Set the default region in translation files. #270
|
2019-10-15 06:04:49 +00:00 |
|
Korina Cordero
|
c2fbb75a69
|
Change Delivery Instructions label to Delivery Instructions - CarFix Job Order No. #270
|
2019-10-15 05:24:13 +00:00 |
|
Korina Cordero
|
c6b31569a6
|
Create service types for CMB. #270
|
2019-10-13 09:49:09 +00:00 |
|
Korina Cordero
|
eb6e311862
|
Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 270-final-cmb-fixes
|
2019-10-13 08:08:22 +00:00 |
|
Korina Cordero
|
906cf2b6af
|
Add normalize name method to process special cases for battery size. #270
|
2019-10-13 08:04:54 +00:00 |
|
|
|
361b8c0433
|
Change century logo in main template #270
|
2019-10-12 21:57:06 +08:00 |
|
Korina Cordero
|
6d0af26981
|
Redo the import tradein price command. #270
|
2019-10-11 09:13:30 +00:00 |
|
Korina Cordero
|
02b88bca64
|
Redo the battery vehicle compatibility command. #270
|
2019-10-11 09:03:51 +00:00 |
|
Korina Cordero
|
c0d363dd25
|
Redo the import battery data command. #270
|
2019-10-11 05:40:22 +00:00 |
|
Korina Cordero
|
7adcb5244e
|
Add command to add tradein prices to battery sizes using a csv file. #270
|
2019-10-10 07:37:08 +00:00 |
|
Korina Cordero
|
111bb55a50
|
Add command to add prices to batteries using a csv file. #270
|
2019-10-10 06:59:46 +00:00 |
|
Korina Cordero
|
a8792c3209
|
Set the default point for maps. #270
|
2019-10-10 03:03:26 +00:00 |
|
Korina Cordero
|
7e44688322
|
Add to translation file default point for map. #270
|
2019-10-09 06:51:05 +00:00 |
|
Korina Cordero
|
610bbdcc7c
|
Add trade in type for cmb. #270
|
2019-10-09 06:35:11 +00:00 |
|
Korina Cordero
|
a9ed02b0b2
|
Limit the service types to 2 for POC. Have job order return which twig template to display. #270
|
2019-10-07 07:16:03 +00:00 |
|
Korina Cordero
|
eb0e19d27f
|
Add country code prefix to messages. Made the country code a constant. #270
|
2019-10-04 02:36:36 +00:00 |
|
Korina Cordero
|
f6df19a58f
|
Add sql script that deletes the data from battery and vehicle tables. #270
|
2019-10-03 06:01:43 +00:00 |
|
Korina Cordero
|
547c13d73b
|
Fix the adding of compatible batteries for a vehicle. #270
|
2019-10-03 05:39:02 +00:00 |
|
Korina Cordero
|
dcd34f6f73
|
Fix adding of compatible batteries to vehicles. #270
|
2019-10-03 04:12:12 +00:00 |
|
Korina Cordero
|
2b48c702d4
|
Fix for fatal error in command. #270
|
2019-10-03 03:44:45 +00:00 |
|
Korina Cordero
|
54a367af96
|
Add images and icons for cmb. Add messages for cmb. #270
|
2019-10-03 02:12:43 +00:00 |
|
Korina Cordero
|
5ab7cd6e4c
|
Add vehicle and vehicle manufacturers in the import command. #270
|
2019-10-02 12:56:22 +00:00 |
|
Korina Cordero
|
54c9871189
|
merge import batter commands under one command. #270
|
2019-10-02 11:27:10 +00:00 |
|
Korina Cordero
|
a29ea8756b
|
Add command to add batteries. #270
|
2019-10-02 07:41:19 +00:00 |
|
Korina Cordero
|
5348d2c51c
|
Add command to add battery sizes from given csv file. #270
|
2019-10-02 05:36:38 +00:00 |
|
Korina Cordero
|
987668ffbc
|
Add command to add battery models from given csv file. #270
|
2019-10-02 05:04:36 +00:00 |
|
Korina Cordero
|
5980715128
|
Add command to add battery manufacturers from given csv file. #270
|
2019-10-02 04:49:56 +00:00 |
|
Korina Cordero
|
f205f04b48
|
Move the invoice generation out of the job order service and into the invoice generator service. #270
|
2019-10-02 01:47:57 +00:00 |
|
Korina Cordero
|
08bd23fe30
|
Fix issue of invalid meta urls. #270
|
2019-10-01 10:12:25 +00:00 |
|
Korina Cordero
|
7989f6b6d6
|
Move retrieval of job order rows to the job service. #270
|
2019-10-01 08:35:55 +00:00 |
|
Korina Cordero
|
2f555483be
|
Move generate PDF form to the job order service. #270
|
2019-10-01 07:14:51 +00:00 |
|
Korina Cordero
|
7de72e2ca3
|
Move unlock processor and unlock assignor to the job order service. #270
|
2019-10-01 06:27:55 +00:00 |
|
Korina Cordero
|
304ef3274c
|
Move reject hub to the job order service. #270
|
2019-10-01 05:48:20 +00:00 |
|
Korina Cordero
|
e6482d44f0
|
Move reassignment of hub and rider to the job order service. #270
|
2019-10-01 04:22:49 +00:00 |
|
Korina Cordero
|
12555f3452
|
Move the initialization of rider and hub forms and hub reassignment to the job order service. #270
|
2019-10-01 02:04:16 +00:00 |
|
Korina Cordero
|
a7b5341f0d
|
Move the initialization of the fulfillment and hub forms to the service. #270
|
2019-09-30 08:55:35 +00:00 |
|
Korina Cordero
|
365b316dba
|
Add exception handling to the job order service. #270
|
2019-09-30 08:24:59 +00:00 |
|
Korina Cordero
|
2e2f43152c
|
Move the initialization of parameters for view all and processing job order forms to the service. #270
|
2019-09-30 07:09:10 +00:00 |
|
Korina Cordero
|
34dc619392
|
Move the initialization of parameters for new and edit job order forms to the service. #270
|
2019-09-30 06:28:13 +00:00 |
|
Korina Cordero
|
7754ddc594
|
Move the assign rider, dispatch, fulfill, and cancel job order code to the service. #270
|
2019-09-30 05:26:50 +00:00 |
|
Korina Cordero
|
bd8696311c
|
Move the dispatch and assign rider to job order to the service. #270
|
2019-09-27 09:59:55 +00:00 |
|
Korina Cordero
|
37c0945db9
|
Move the validation for incoming and editing job orders from the controller to the service. #270
|
2019-09-27 06:56:17 +00:00 |
|
|
|
6c3bc652fa
|
Merge branch 'origin/265-cmb-project' into '270-final-cmb-fixes'
Move origin/265 to 270
See merge request jankstudio/resq!317
|
2019-09-27 01:55:33 +00:00 |
|
Korina Cordero
|
6e3be9edc8
|
Rename from Cmb to CMB. #265
|
2019-09-26 06:57:01 +00:00 |
|
Korina Cordero
|
98a6bfc8ae
|
Create invoice and job generator for cmb. Modify services.yaml for cmb. #265
|
2019-09-25 05:45:40 +00:00 |
|
Korina Cordero
|
f766965f81
|
Add checking for invoice change. #265
|
2019-09-25 03:52:14 +00:00 |
|
Korina Cordero
|
7f973fd10a
|
Merge branch 'master' of gitlab.com:jankstudio/resq into origin/265-cmb-project
|
2019-09-25 02:34:59 +00:00 |
|
Korina Cordero
|
b129609d53
|
Refactor submission of updated job order. #265
|
2019-09-25 02:20:16 +00:00 |
|
Korina Cordero
|
ca97897a2a
|
Move the saving of new job order to a job order generator service. #265
|
2019-09-24 06:58:55 +00:00 |
|
Korina Cordero
|
cf8c3bb8e1
|
Move setting of invoice status and createdby inside the invoice generator. #265
|
2019-09-20 09:53:49 +00:00 |
|
Korina Cordero
|
89ec286a9f
|
Rename processCriteria to generateInvoice. Added constants to invoice generator. #265
|
2019-09-20 09:30:08 +00:00 |
|
Korina Cordero
|
dc2eecbe0c
|
Rename InvoiceCreator to InvoiceGenerator. #265
|
2019-09-20 06:38:52 +00:00 |
|
Korina Cordero
|
cce4638c78
|
Rename invoice creator for resq. Make most public methods in invoice creator protected. #265
|
2019-09-20 06:09:17 +00:00 |
|
Korina Cordero
|
f1cc1dfae1
|
Create interface for invoice creator. #265
|
2019-09-19 07:28:48 +00:00 |
|
Korina Cordero
|
37a8309943
|
Merge branch '265-cmb-project' of gitlab.com:jankstudio/resq into origin/265-cmb-project
|
2019-09-19 00:41:06 +00:00 |
|
