|
|
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 |
|
|
|
214e44405c
|
Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 270-final-cmb-fixes
Conflicts:
src/Controller/JobOrderController.php
|
2020-02-24 16:45:43 +08:00 |
|
|
|
1a0fb13268
|
Fix view all edit button to use one step edit for CMB #270
|
2020-02-24 16:43:27 +08:00 |
|
Korina Cordero
|
9125a0d2fa
|
Moved invoice code out of JO controller. #354
|
2020-02-21 03:22:17 +00:00 |
|
Korina Cordero
|
4a12fb6eb2
|
Change edit to edit onestep edit and walkin. #353
|
2020-02-20 04:12:12 +00:00 |
|
Korina Cordero
|
a62476a833
|
Add create, update, list, and delete for service charges. #348
|
2020-02-19 03:16:27 +00: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 |
|
|
|
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
|
f3f941e0a0
|
Add service charges to invoice generation. #341
|
2020-02-17 13:24:32 +00: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
|
bea5d72d13
|
Modify the function names for walkin. #340
|
2020-02-14 03:07:42 +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
|
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 |
|
Korina Cordero
|
fb2d716721
|
Add update of customer vehicle and warranty creation after rider sets JO to fulfilled. #304
|
2020-01-21 08:38:52 +00:00 |
|
Korina Cordero
|
00816b4226
|
Add warranty creation after job order fulfillment. #304
|
2020-01-21 08:14:05 +00:00 |
|
|
|
4bb67ce7b7
|
Merge branch '290-update-customer-vehicle-info-when-warranty-is-added' into 'master'
Resolve "Update customer vehicle info when warranty is added"
Closes #290
See merge request jankstudio/resq!332
|
2020-01-20 02:48:15 +00:00 |
|
|
|
3ae9d8ab8d
|
Merge branch '285-link-new-warranty-to-customer' into 'master'
Resolve "Link new warranty to customer"
Closes #285
See merge request jankstudio/resq!329
|
2020-01-20 02:46:05 +00:00 |
|
|
|
d72f1dd4c1
|
Merge branch '288-additional-validations-for-warranty-upload' into 'master'
Resolve "Additional validations for warranty upload"
Closes #288
See merge request jankstudio/resq!330
|
2020-01-20 02:36:03 +00:00 |
|
|
|
d2286f21ff
|
Add rider_id to RAPI login return data #299
|
2020-01-19 19:49:38 +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
|
91e495f251
|
Add checking for duplicate ID. #298
|
2020-01-17 08:11:09 +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
|
35f0d9c7be
|
Add riders to one step job order map. #270
|
2020-01-16 03:51:46 +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
|
0ed4e10251
|
Add rider assignment to one step form. #270
|
2020-01-10 05:33:11 +00:00 |
|
Korina Cordero
|
b4f1cbfcf0
|
Add battery sap code to report. #291
|
2020-01-09 08:31:03 +00:00 |
|
Korina Cordero
|
380bb23e25
|
Add model year from and model year to to report. #291
|
2020-01-08 01:35:59 +00:00 |
|
Korina Cordero
|
f74b8cff88
|
Add sql query to get vehicle battery compatibility data. #291
|
2020-01-07 10:15:53 +00:00 |
|
Korina Cordero
|
16763c5386
|
Add vehicle battery compatibility report. #291
|
2020-01-07 08:36:00 +00:00 |
|
Korina Cordero
|
10d9e6e5ae
|
Update customer vehicle warranty information when warranty is uploaded. #290
|
2019-12-23 02:04:48 +00:00 |
|
Korina Cordero
|
85483ffab8
|
Add updating of customer vehicle information when warranty is added. #290
|
2019-12-20 13:16:45 +00:00 |
|
Korina Cordero
|
a10ef2b5d9
|
Fix testing issues found for warranty handler. #286
|
2019-12-18 07:57:39 +00:00 |
|
|
|
51850d0230
|
Add one step job order process form #270
|
2019-12-18 04:06:45 +08:00 |
|
Korina Cordero
|
0d3a96e038
|
Move updating of warranty to handler. #286
|
2019-12-17 01:05:55 +00:00 |
|
|
|
008e482fe8
|
Modify dashboard to display customers and riders with popup details #270
|
2019-12-17 02:08:32 +08:00 |
|
Korina Cordero
|
bc74339fbf
|
Add checking if serial exists. #288
|
2019-12-16 06:18:37 +00:00 |
|
Korina Cordero
|
9c9018171e
|
Add quick registration test for CAPI. #288
|
2019-12-16 04:05:04 +00:00 |
|
Korina Cordero
|
e62c3dc097
|
Add checking for serial and plate number. #288
|
2019-12-13 09:38:26 +00:00 |
|
Korina Cordero
|
ced7292413
|
Add customer and customer vehicle when warranty is registered via API. #285
|
2019-12-10 08:19:21 +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
|
d04a6976f2
|
Use OpenStreetMap for map in incoming form. #270
|
2019-12-05 07:40:52 +00:00 |
|
Korina Cordero
|
ade2c3b5de
|
Add map manager interface. #270
|
2019-12-03 09:42:23 +00:00 |
|
|
|
ec5b8951da
|
Merge branch '281-create-customers-via-third-party-api' into 'master'
Resolve "Create customers via third party API"
Closes #281
See merge request jankstudio/resq!327
|
2019-11-28 06:52:20 +00:00 |
|
