Commit graph

1898 commits

Author SHA1 Message Date
Korina Cordero
74ed1a72b6 Made Resq default skin. #373 2020-04-03 07:49:37 +00:00
e3cb53cb78 Merge branch '270-final-cmb-fixes' into 'master'
Resolve "Final CMB Fixes"

Closes #270

See merge request jankstudio/resq!418
2020-04-03 02:54:28 +00:00
79a1c46cee Merge branch '329-transition-branch-for-cmb-and-resq-merging' into 'master'
Resolve "Transition branch for CMB and Resq merging"

Closes #329

See merge request jankstudio/resq!370
2020-04-03 02:49:25 +00:00
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
440cf35cf2 Merge branch '366-cmb-access-for-getcustomervehicles-2' into '270-final-cmb-fixes'
Resolve "CMB - access for getCustomerVehicles"

See merge request jankstudio/resq!411
2020-04-03 02:01:49 +00:00
8f72cc4486 Merge branch '372-api-call-get-list-of-warranties-given-list-of-serial-numbers' into 'master'
Resolve "API call - get list of warranties given list of serial numbers"

Closes #372

See merge request jankstudio/resq!417
2020-04-02 04:02:09 +00:00
Korina Cordero
1dac0c506e Remove message. #372 2020-04-02 04:01:08 +00:00
Korina Cordero
135ab10cd3 Add to response the list of serials with no warranties. #372 2020-04-02 03:58:21 +00:00
2c54a62442 Merge branch '371-imporsapbatterycommand-modifications' into 'master'
Resolve "ImportSAPBAtteryCommand modifications"

Closes #371

See merge request jankstudio/resq!416
2020-04-02 03:36:37 +00:00
Korina Cordero
719cccf778 Add API call to get warranties when given a list of serial numbers. #372 2020-04-02 03:33:02 +00:00
Korina Cordero
c38eb147c8 Add logging of duplicate entries when importing SAP batteries. #371 2020-04-01 08:33:25 +00:00
Korina Cordero
1829e9112e Add error_logging in case of duplicate SAP battery. #371 2020-04-01 04:30:08 +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
4f8568fe04 Merge branch '369-cmb-rename-delivery-instructions-in-one-step-and-walk-in-form-to-carfix-details' into '270-final-cmb-fixes'
Resolve "CMB - rename delivery instructions in one-step and walk-in form to "CarFix Details""

See merge request jankstudio/resq!413
2020-03-10 08:23:00 +00:00
Korina Cordero
63210ab463 Rename Delivery Instructions to CarFix Details. #369 2020-03-10 08:16:53 +00:00
c0595684d6 Merge branch '367-cmb-plate-number-required-if-new-customer-or-car' into '270-final-cmb-fixes'
Resolve "CMB - plate number required if new customer or car"

See merge request jankstudio/resq!412
2020-03-10 06:23:04 +00:00
Korina Cordero
d61d82b6e7 Add default value false to checking for new customer. #367 2020-03-10 06:22:25 +00:00
Korina Cordero
c4da604ac8 Made plate number a required field if new customer. #367 2020-03-10 06:07:29 +00:00
8e3df8f1c4 Treat blank serial as null to avoid unique exception in db #270 2020-03-06 07:42:00 +08:00
e4b8e44b06 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 270-final-cmb-fixes 2020-03-05 23:53:24 +08:00
60fb331b47 Fix role controller issue on saving #270 2020-03-05 23:52:40 +08:00
Korina Cordero
6a7cb9788e Fix access to customer vehicle search for walkin and one step. #366 2020-03-05 08:36:24 +00:00
5f6e89f10b Merge branch '365-cmb-add-columns-to-open-and-view-all-pages' into '270-final-cmb-fixes'
Resolve "CMB - add columns to Open and View All pages"

See merge request jankstudio/resq!408
2020-03-05 07:41:16 +00:00
Korina Cordero
1dd476fba9 Merge branch '365-cmb-add-columns-to-open-and-view-all-pages' of gitlab.com:jankstudio/resq into 366-cmb-access-for-getcustomervehicles-2 2020-03-05 07:29:22 +00:00
Korina Cordero
2e884ff577 Add additional columns to list of open JOs. #365 2020-03-05 07:22:38 +00:00
Korina Cordero
624cf2fb7d Return the additional values to template. #365 2020-03-05 07:17:03 +00:00
Korina Cordero
dafe7e6b1c Modify access to getCustomerVehicles. #366 2020-03-05 06:53:26 +00:00
Korina Cordero
e93b6432b0 Add view all form for cmb. #365 2020-03-05 06:26:50 +00:00
511d971814 Merge branch '362-cmb-fix-dashboard-status-change' into '270-final-cmb-fixes'
Make sure rider's active jo is in an open status #362

See merge request jankstudio/resq!407
2020-03-05 01:21:27 +00:00
bf535e37f5 Make sure rider's active jo is in an open status #362 2020-03-05 09:20:16 +08:00
d2a4b95805 Merge branch '362-cmb-fix-dashboard-status-change' into '270-final-cmb-fixes'
Update rider status when job order status is changed #362

See merge request jankstudio/resq!406
2020-03-05 00:58:36 +00:00
de9e803ad4 Update rider status when job order status is changed #362 2020-03-05 08:57:32 +08:00
a3f628efe6 Merge branch '362-cmb-fix-dashboard-status-change' into '270-final-cmb-fixes'
Support rider status changes in dashboard map #362

See merge request jankstudio/resq!405
2020-03-05 00:12:36 +00:00
2e3c879fd5 Support rider status changes in dashboard map #362 2020-03-05 07:15:26 +08:00
7124a7d2c8 Merge branch '360-cmb-allow-reordering-of-rider-jo' into '270-final-cmb-fixes'
Resolve "CMB: Allow reordering of rider JO"

See merge request jankstudio/resq!403
2020-03-02 00:35:04 +00:00
977559b88d Set priority properly for job order and handle priority down button #360 2020-03-02 08:33:50 +08:00
07753274c3 Add initial job order prioritization features #360 2020-03-01 22:14:13 +08:00
ebc9b77eda Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 360-cmb-allow-reordering-of-rider-jo
Conflicts:
	src/Entity/JobOrder.php
2020-02-29 23:40:10 +08:00
1ab5909dfd Add priority field for JobOrder #360 2020-02-29 23:38:05 +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
0d148d8d50 Merge branch '359-cmb-remove-color-from-jo-pdf' into '270-final-cmb-fixes'
Resolve "CMB - remove color from JO pdf"

See merge request jankstudio/resq!401
2020-02-27 05:24:30 +00:00
074a85a535 Merge branch '357-transition-fix-resq-s-geteditroute' into '270-final-cmb-fixes'
Resolve "TRANSITION - fix resq's getEditRoute"

See merge request jankstudio/resq!400
2020-02-27 04:59:18 +00:00
Korina Cordero
a0f7ca6abe Fix editRoute parameters for CMB. #357 2020-02-27 02:07:30 +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
164e091c15 Remove color field from pdf form. #359 2020-02-25 08:39:30 +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
Korina Cordero
6d14677bd7 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 357-transition-fix-resq-s-geteditroute 2020-02-25 03:38:18 +00:00
Korina Cordero
d534ce3241 Add getEditRoute for resq. #357 2020-02-25 03:37:58 +00:00