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 |
|
|
|
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
|
1374a91dd4
|
Add checking for transaction origin. #347
|
2020-02-19 05:02:21 +00:00 |
|
Korina Cordero
|
524378f6e0
|
Add dashboard_enable to .env.dist. #334
|
2020-02-19 04:21:34 +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 |
|
