|
|
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 |
|
|
|
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 |
|
|
|
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
|
4700d2b840
|
Remove link to list of JOs ready to be fulfilled. #270
|
2020-02-24 09:28:38 +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 |
|
|
|
1d33974451
|
Merge branch '355-cmb-display-amount-when-loading-existing-service-charges' into '270-final-cmb-fixes'
Add jo_service_charges to one step form. #355
See merge request jankstudio/resq!398
|
2020-02-24 08:01:11 +00:00 |
|
Korina Cordero
|
230dd41055
|
Add jo_service_charges to one step form. #355
|
2020-02-24 07:57:43 +00:00 |
|
|
|
506908d266
|
Merge branch '355-cmb-display-amount-when-loading-existing-service-charges' into '270-final-cmb-fixes'
Resolve "CMB - display amount when loading existing service charges"
See merge request jankstudio/resq!396
|
2020-02-24 03:08:50 +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
|
9125a0d2fa
|
Moved invoice code out of JO controller. #354
|
2020-02-21 03:22:17 +00:00 |
|
|
|
39b9e50654
|
Merge branch '353-cmb-have-edit-go-to-onestep-edit' into '270-final-cmb-fixes'
Resolve "CMB - Have edit go to onestep edit"
See merge request jankstudio/resq!394
|
2020-02-21 00:54:25 +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 |
|
|
|
bbeec52c60
|
Merge branch '348-cmb-service-charge-maintenance' into '270-final-cmb-fixes'
Resolve "CMB - service charge maintenance"
See merge request jankstudio/resq!391
|
2020-02-19 05:29:24 +00:00 |
|
Korina Cordero
|
1374a91dd4
|
Add checking for transaction origin. #347
|
2020-02-19 05:02:21 +00:00 |
|
Korina Cordero
|
a62476a833
|
Add create, update, list, and delete for service charges. #348
|
2020-02-19 03:16:27 +00:00 |
|
|
|
3cd6b16497
|
Merge branch '349-cmb-menu-for-cmb-only' into '270-final-cmb-fixes'
Resolve "CMB - menu for CMB only"
See merge request jankstudio/resq!390
|
2020-02-19 01:13:20 +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
|
8306e9db4f
|
Create separate menu.yaml files for Resq and CMB. #349
|
2020-02-18 03:35:34 +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 |
|
|
|
39fdf318d4
|
Make getMeta in JobOrder entity return null if meta key is not found #270
|
2020-02-18 09:55:13 +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
|
ebc6867c8f
|
Edit for one step JO with service charges. #341
|
2020-02-18 01:42:16 +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
|
504d910621
|
Add saving to meta even if service charges are blank. #341
|
2020-02-17 14:56:35 +00: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
|
f3f941e0a0
|
Add service charges to invoice generation. #341
|
2020-02-17 13:24:32 +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 |
|
Korina Cordero
|
5edbb33b65
|
Merge branch '341-cmb-add-service-charge-dropdown' of gitlab.com:jankstudio/resq into 341-cmb-add-service-charge-dropdown
|
2020-02-17 07:46:01 +00:00 |
|
Korina Cordero
|
11bf116e68
|
Add sql file to populate service charge table. #341
|
2020-02-17 07:44:04 +00:00 |
|
|
|
6665c5ca0d
|
Merge branch '341-cmb-add-service-charge-dropdown' of gitlab.com:jankstudio/resq into 341-cmb-add-service-charge-dropdown
|
2020-02-17 15:25:40 +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
|
6c11650b25
|
Add service charge entity. #341
|
2020-02-17 07:20:37 +00:00 |
|
|
|
6656890fd8
|
Merge branch '343-cmb-discount' into '270-final-cmb-fixes'
Change computation of discount for CMB. #343
See merge request jankstudio/resq!385
|
2020-02-17 06:21:50 +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
|
a15b45173c
|
Fix discount computation. #343
|
2020-02-17 01:02:41 +00:00 |
|
Korina Cordero
|
d439a411a8
|
Change computation of discount for CMB. #343
|
2020-02-14 09:40:08 +00:00 |
|
|
|
d9c3a4dff8
|
Merge branch '340-cmb-walk-in-customer-form' into '270-final-cmb-fixes'
Resolve "CMB - Walk-in customer form"
See merge request jankstudio/resq!383
|
2020-02-14 03:46:06 +00:00 |
|
Korina Cordero
|
ac91960bd7
|
Add mobile phone validation for JO when new customer is created. #340
|
2020-02-14 03:38:37 +00:00 |
|
Korina Cordero
|
6a944eeb16
|
Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 340-cmb-walk-in-customer-form
|
2020-02-14 03:09:57 +00:00 |
|
Korina Cordero
|
bea5d72d13
|
Modify the function names for walkin. #340
|
2020-02-14 03:07:42 +00:00 |
|
Korina Cordero
|
034ae108e0
|
Fix saving issue for JOEvent. #340
|
2020-02-14 01:47: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
|
60203cc7b5
|
Add routes for walk-in form. #340
|
2020-02-13 05:11:01 +00:00 |
|
|
|
3ec6ca0ee1
|
Merge branch '339-cmb-mobile-phone-validation-check' into '270-final-cmb-fixes'
Resolve "CMB - mobile phone validation check"
See merge request jankstudio/resq!381
|
2020-02-13 04:33:50 +00:00 |
|
Korina Cordero
|
62edf0f12c
|
Tweak validation for mobile phone number. #339
|
2020-02-13 04:04:28 +00:00 |
|
Korina Cordero
|
51e333de8b
|
Merge branch '329-transition-branch-for-cmb-and-resq-merging' of gitlab.com:jankstudio/resq into 339-cmb-mobile-phone-validation-check
|
2020-02-13 02:46:52 +00:00 |
|
Korina Cordero
|
2fb24e4e13
|
Add validation for mobile phone number. #339
|
2020-02-13 02:41:32 +00:00 |
|
