Commit graph

1034 commits

Author SHA1 Message Date
Korina Cordero
f46c56c41e Remove postPersist. #330 2020-03-03 08:24:47 +00:00
Korina Cordero
c748a19da8 Modify doctrine.yaml to support multiple entity managers. #330 2020-03-03 06:59:46 +00:00
Korina Cordero
5c22fd7cc7 Add EntityLog entity for logging . #330 2020-03-02 08:33:05 +00:00
Korina Cordero
28ae096a87 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 330-entity-logging-service-bundle 2020-03-02 05:42:16 +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
Korina Cordero
987097ff6a Add username of user to log. #330 2020-02-28 08:40:44 +00:00
Korina Cordero
4c27b4da06 Add date and time for logging. #330 2020-02-28 03:21:29 +00:00
Korina Cordero
8b96855395 Added generic onFlush function to EntityListener. #330 2020-02-27 07:29:17 +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
Korina Cordero
a0f7ca6abe Fix editRoute parameters for CMB. #357 2020-02-27 02:07:30 +00:00
Korina Cordero
2998154a55 Add collection update and collection get to logs. #330 2020-02-27 01:04:27 +00:00
Korina Cordero
a629d9b024 Add entity listener for user. #330 2020-02-26 07:57:02 +00:00
Korina Cordero
3231aad154 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 330-entity-logging-service-bundle 2020-02-26 00:54:40 +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
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
230dd41055 Add jo_service_charges to one step form. #355 2020-02-24 07:57:43 +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
f3a691ab4c Merge branch '354-cmb-and-resq-move-invoice-related-code-out-of-jocontroller' of gitlab.com:jankstudio/resq into 331-refactor-warranty-system 2020-02-21 05:19:27 +00:00
Korina Cordero
9125a0d2fa Moved invoice code out of JO controller. #354 2020-02-21 03:22:17 +00:00
Korina Cordero
7dd9911e22 Move warranty creation out of the RiderAPIHandler. #331 2020-02-21 02:29:39 +00:00
Korina Cordero
8a328bf441 Move warranty creation from JO to event listener. #331 2020-02-20 07:17:42 +00:00
Korina Cordero
c6217e2f76 Move warranty creation from JO to event listener. #331 2020-02-20 07:01:41 +00:00
Korina Cordero
ffae746a02 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 331-refactor-warranty-system 2020-02-20 05:36:19 +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
5ab6514a86 Fixed form for onestep when JO is loaded from View All. #347 2020-02-19 06:29:31 +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
39fdf318d4 Make getMeta in JobOrder entity return null if meta key is not found #270 2020-02-18 09:55:13 +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
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