rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions
1769 commits 749 branches 8 tags 145 MiB
Commit graph

1769 commits

This branch
This branch
All branches
Author SHA1 Message Date
Korina Cordero
e93b6432b0 Add view all form for cmb. #365 2020-03-05 06:26:50 +00:00
Kendrick Chan
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
Kendrick Chan
bf535e37f5 Make sure rider's active jo is in an open status #362 2020-03-05 09:20:16 +08:00
Kendrick Chan
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
Kendrick Chan
de9e803ad4 Update rider status when job order status is changed #362 2020-03-05 08:57:32 +08:00
Kendrick Chan
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
Kendrick Chan
2e3c879fd5 Support rider status changes in dashboard map #362 2020-03-05 07:15:26 +08:00
Kendrick Chan
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
Kendrick Chan
977559b88d Set priority properly for job order and handle priority down button #360 2020-03-02 08:33:50 +08:00
Kendrick Chan
07753274c3 Add initial job order prioritization features #360 2020-03-01 22:14:13 +08:00
Kendrick Chan
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
Kendrick Chan
1ab5909dfd Add priority field for JobOrder #360 2020-02-29 23:38:05 +08:00
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
1a0fb13268 Fix view all edit button to use one step edit for CMB #270 2020-02-24 16:43:27 +08:00
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
e48e86340a Fix bug in one step form #270 2020-02-18 10:06:44 +08:00
Kendrick Chan
8e73c16b74 Fix typo in js for one step form #270 2020-02-18 10:05:59 +08:00