Commit graph

  • 07753274c3 Add initial job order prioritization features #360 Kendrick Chan 2020-03-01 22:14:13 +0800
  • ebc9b77eda Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 360-cmb-allow-reordering-of-rider-jo Kendrick Chan 2020-02-29 23:40:10 +0800
  • 1ab5909dfd Add priority field for JobOrder #360 Kendrick Chan 2020-02-29 23:38:05 +0800
  • 987097ff6a Add username of user to log. #330 Korina Cordero 2020-02-28 08:40:44 +0000
  • 4c27b4da06 Add date and time for logging. #330 Korina Cordero 2020-02-28 03:21:29 +0000
  • 8b96855395 Added generic onFlush function to EntityListener. #330 Korina Cordero 2020-02-27 07:29:17 +0000
  • 3496976bf5 Merge branch '358-cmb-clear-battery-details-when-new-customer-toggle-is-turned-on' into '270-final-cmb-fixes' Kendrick Chan 2020-02-27 05:25:02 +0000
  • f770e2b3ae Merge branch '358-cmb-clear-battery-details-when-new-customer-toggle-is-turned-on' into '270-final-cmb-fixes' Korina Cordero 2020-02-27 05:24:34 +0000
  • 0d148d8d50 Merge branch '359-cmb-remove-color-from-jo-pdf' into '270-final-cmb-fixes' Kendrick Chan 2020-02-27 05:24:30 +0000
  • f4451731d4 Merge branch '359-cmb-remove-color-from-jo-pdf' into '270-final-cmb-fixes' Korina Cordero 2020-02-27 05:00:46 +0000
  • 074a85a535 Merge branch '357-transition-fix-resq-s-geteditroute' into '270-final-cmb-fixes' Kendrick Chan 2020-02-27 04:59:18 +0000
  • 54fe1d3473 Merge branch '357-transition-fix-resq-s-geteditroute' into '270-final-cmb-fixes' Korina Cordero 2020-02-27 02:09:32 +0000
  • a0f7ca6abe Fix editRoute parameters for CMB. #357 357-transition-fix-resq-s-geteditroute Korina Cordero 2020-02-27 02:07:30 +0000
  • 2998154a55 Add collection update and collection get to logs. #330 Korina Cordero 2020-02-27 01:04:27 +0000
  • a629d9b024 Add entity listener for user. #330 Korina Cordero 2020-02-26 07:57:02 +0000
  • 3231aad154 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 330-entity-logging-service-bundle Korina Cordero 2020-02-26 00:54:40 +0000
  • 2ab0055286 Clear battery details when New Customer toggle is on. #358 358-cmb-clear-battery-details-when-new-customer-toggle-is-turned-on Korina Cordero 2020-02-25 09:09:51 +0000
  • 164e091c15 Remove color field from pdf form. #359 359-cmb-remove-color-from-jo-pdf Korina Cordero 2020-02-25 08:39:30 +0000
  • 3d40bc6238 Remove links to onestep edit from templates for resq. Fix for getEditRoute issues found during testing. #357 Korina Cordero 2020-02-25 07:18:55 +0000
  • 6d14677bd7 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 357-transition-fix-resq-s-geteditroute Korina Cordero 2020-02-25 03:38:18 +0000
  • d534ce3241 Add getEditRoute for resq. #357 Korina Cordero 2020-02-25 03:37:58 +0000
  • 5b19302752 Merge branch '354-cmb-and-resq-move-invoice-related-code-out-of-jocontroller' into '270-final-cmb-fixes' Kendrick Chan 2020-02-25 03:35:53 +0000
  • e7d5e5e228 Merge branch '354-cmb-and-resq-move-invoice-related-code-out-of-jocontroller' into '270-final-cmb-fixes' Korina Cordero 2020-02-25 03:34:18 +0000
  • 22be1eaf5a Fix edit for walkin JOs. #270 Korina Cordero 2020-02-24 10:33:13 +0000
  • 4700d2b840 Remove link to list of JOs ready to be fulfilled. #270 Korina Cordero 2020-02-24 09:28:38 +0000
  • 214e44405c Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 270-final-cmb-fixes Kendrick Chan 2020-02-24 16:45:43 +0800
  • 1a0fb13268 Fix view all edit button to use one step edit for CMB #270 Kendrick Chan 2020-02-24 16:43:27 +0800
  • 1d33974451 Merge branch '355-cmb-display-amount-when-loading-existing-service-charges' into '270-final-cmb-fixes' Kendrick Chan 2020-02-24 08:01:11 +0000
  • 6db68a1f64 Merge branch '355-cmb-display-amount-when-loading-existing-service-charges' into '270-final-cmb-fixes' Kendrick Chan 2020-02-24 08:01:03 +0000
  • 230dd41055 Add jo_service_charges to one step form. #355 355-cmb-display-amount-when-loading-existing-service-charges Korina Cordero 2020-02-24 07:57:43 +0000
  • 506908d266 Merge branch '355-cmb-display-amount-when-loading-existing-service-charges' into '270-final-cmb-fixes' Kendrick Chan 2020-02-24 03:08:50 +0000
  • 04bd88bbbb Merge branch '355-cmb-display-amount-when-loading-existing-service-charges' into '270-final-cmb-fixes' Korina Cordero 2020-02-24 03:07:02 +0000
  • 4b9b3622d5 Fix to display service charge amount when loading an existing JO. #355 Korina Cordero 2020-02-24 03:06:47 +0000
  • 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 Korina Cordero 2020-02-24 02:43:43 +0000
  • 0714acb426 Merge branch '331-refactor-warranty-system' into 'master' Korina Cordero 2020-02-21 08:26:18 +0000
  • c2d109ae0a Add event listeners to services.yaml for cmb and resq. #331 331-refactor-warranty-system Korina Cordero 2020-02-21 08:25:57 +0000
  • f3a691ab4c Merge branch '354-cmb-and-resq-move-invoice-related-code-out-of-jocontroller' of gitlab.com:jankstudio/resq into 331-refactor-warranty-system Korina Cordero 2020-02-21 05:19:27 +0000
  • e93e0dd943 Bug fix for loading JO form for edit. #354 354-cmb-and-resq-move-invoice-related-code-out-of-jocontroller Korina Cordero 2020-02-21 05:10:11 +0000
  • 9125a0d2fa Moved invoice code out of JO controller. #354 Korina Cordero 2020-02-21 03:22:17 +0000
  • 7dd9911e22 Move warranty creation out of the RiderAPIHandler. #331 Korina Cordero 2020-02-21 02:29:39 +0000
  • 39b9e50654 Merge branch '353-cmb-have-edit-go-to-onestep-edit' into '270-final-cmb-fixes' Kendrick Chan 2020-02-21 00:54:25 +0000
  • 8a328bf441 Move warranty creation from JO to event listener. #331 Korina Cordero 2020-02-20 07:17:42 +0000
  • 88ed88a8da Add event postPersist to the JO status listener. #331 Korina Cordero 2020-02-20 07:05:40 +0000
  • c6217e2f76 Move warranty creation from JO to event listener. #331 Korina Cordero 2020-02-20 07:01:41 +0000
  • ffae746a02 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 331-refactor-warranty-system Korina Cordero 2020-02-20 05:36:19 +0000
  • d05e6a44aa Merge branch '353-cmb-have-edit-go-to-onestep-edit' into '270-final-cmb-fixes' Korina Cordero 2020-02-20 05:10:37 +0000
  • 4a12fb6eb2 Change edit to edit onestep edit and walkin. #353 353-cmb-have-edit-go-to-onestep-edit Korina Cordero 2020-02-20 04:12:12 +0000
  • ffa25d6c79 Merge branch '347-cmb-fix-jo-form-display-when-loading-jo-from-view-all' into '270-final-cmb-fixes' Kendrick Chan 2020-02-19 08:37:49 +0000
  • fb9e19aff6 Merge branch '347-cmb-fix-jo-form-display-when-loading-jo-from-view-all' into '270-final-cmb-fixes' Korina Cordero 2020-02-19 06:46:55 +0000
  • cbd9f429d4 Fixed form for walkin when JO is loaded from View All. #347 347-cmb-fix-jo-form-display-when-loading-jo-from-view-all Korina Cordero 2020-02-19 06:46:26 +0000
  • 5ab6514a86 Fixed form for onestep when JO is loaded from View All. #347 Korina Cordero 2020-02-19 06:29:31 +0000
  • bbeec52c60 Merge branch '348-cmb-service-charge-maintenance' into '270-final-cmb-fixes' Kendrick Chan 2020-02-19 05:29:24 +0000
  • 03d2133716 Merge branch '334-trans-make-env-entry-for-disabling-dashboard' into '329-transition-branch-for-cmb-and-resq-merging' Kendrick Chan 2020-02-19 05:26:08 +0000
  • cb67bdf86c Merge branch '334-trans-make-env-entry-for-disabling-dashboard' into '329-transition-branch-for-cmb-and-resq-merging' Korina Cordero 2020-02-19 05:23:33 +0000
  • 7b5239e548 Add checking for dashboard_enable. #334 334-trans-make-env-entry-for-disabling-dashboard Korina Cordero 2020-02-19 05:22:57 +0000
  • 1374a91dd4 Add checking for transaction origin. #347 Korina Cordero 2020-02-19 05:02:21 +0000
  • 524378f6e0 Add dashboard_enable to .env.dist. #334 Korina Cordero 2020-02-19 04:21:34 +0000
  • 1e9cdb6658 Merge branch '348-cmb-service-charge-maintenance' into '270-final-cmb-fixes' Korina Cordero 2020-02-19 03:17:02 +0000
  • a62476a833 Add create, update, list, and delete for service charges. #348 348-cmb-service-charge-maintenance Korina Cordero 2020-02-19 03:16:27 +0000
  • 3cd6b16497 Merge branch '349-cmb-menu-for-cmb-only' into '270-final-cmb-fixes' Kendrick Chan 2020-02-19 01:13:20 +0000
  • 4b7857933f Merge branch '349-cmb-menu-for-cmb-only' into '270-final-cmb-fixes' Korina Cordero 2020-02-18 03:56:43 +0000
  • 15fa7aafc6 Fix display of discount for walkin form when reset button for invoice is clicked. #270 Korina Cordero 2020-02-18 03:55:11 +0000
  • 8306e9db4f Create separate menu.yaml files for Resq and CMB. #349 349-cmb-menu-for-cmb-only Korina Cordero 2020-02-18 03:35:34 +0000
  • 688ccd8a91 Fix display of discount when reset button for invoice is clicked. #270 Korina Cordero 2020-02-18 02:29:22 +0000
  • e48e86340a Fix bug in one step form #270 Kendrick Chan 2020-02-18 10:06:44 +0800
  • 8e73c16b74 Fix typo in js for one step form #270 Kendrick Chan 2020-02-18 10:05:59 +0800
  • 77fe7e8521 Remove service charges when invoice is reset in one step form #270 Kendrick Chan 2020-02-18 10:03:43 +0800
  • 39fdf318d4 Make getMeta in JobOrder entity return null if meta key is not found #270 Kendrick Chan 2020-02-18 09:55:13 +0800
  • 0f106ea790 Fix service charges bug in one step form #270 Kendrick Chan 2020-02-18 09:52:51 +0800
  • 9ca9be4324 Add service charges to parameters for one step. #341 341-cmb-add-service-charge-dropdown Korina Cordero 2020-02-18 01:51:00 +0000
  • 1c9ce12595 Merge branch '341-cmb-add-service-charge-dropdown' into '270-final-cmb-fixes' Kendrick Chan 2020-02-18 01:43:00 +0000
  • 82e1349236 Merge branch '341-cmb-add-service-charge-dropdown' into '270-final-cmb-fixes' Korina Cordero 2020-02-18 01:42:40 +0000
  • ebc6867c8f Edit for one step JO with service charges. #341 Korina Cordero 2020-02-18 01:42:16 +0000
  • 9a24b08bdd Display existing service charges when editing one step JO. #341 Korina Cordero 2020-02-18 01:15:14 +0000
  • d2afb99f4f Merge branch '344-cmb-rider-queue-management' into '270-final-cmb-fixes' Kendrick Chan 2020-02-17 17:01:50 +0000
  • 46d6e961e0 Merge branch '344-cmb-rider-queue-management' into '270-final-cmb-fixes' Kendrick Chan 2020-02-17 17:01:39 +0000
  • def4ed0357 Add active job order feature for rider #344 344-cmb-rider-queue-management Kendrick Chan 2020-02-18 01:00:19 +0800
  • 504d910621 Add saving to meta even if service charges are blank. #341 Korina Cordero 2020-02-17 14:56:35 +0000
  • f9c304422c Add fix when saving an invoice with no service charges. #341 Korina Cordero 2020-02-17 14:43:21 +0000
  • 0cff722c6a Add saving of service charges to JO and Invoice Item. #341 Korina Cordero 2020-02-17 14:18:19 +0000
  • f3f941e0a0 Add service charges to invoice generation. #341 Korina Cordero 2020-02-17 13:24:32 +0000
  • 115c207868 Add sending of service charge ids to generate invoice. #341 Korina Cordero 2020-02-17 12:21:18 +0000
  • 4ae899925d Merge branch '341-cmb-add-service-charge-dropdown' of gitlab.com:jankstudio/resq into 341-cmb-add-service-charge-dropdown Kendrick Chan 2020-02-17 16:13:12 +0800
  • 663698f087 Rename promo to discount in JO service, JO forms, and invoice generator. #341 Korina Cordero 2020-02-17 08:12:51 +0000
  • 34e9091297 Fix dropdown for service charges in one-step JO form #341 Kendrick Chan 2020-02-17 16:12:35 +0800
  • 5edbb33b65 Merge branch '341-cmb-add-service-charge-dropdown' of gitlab.com:jankstudio/resq into 341-cmb-add-service-charge-dropdown Korina Cordero 2020-02-17 07:46:01 +0000
  • 11bf116e68 Add sql file to populate service charge table. #341 Korina Cordero 2020-02-17 07:44:04 +0000
  • 6665c5ca0d Merge branch '341-cmb-add-service-charge-dropdown' of gitlab.com:jankstudio/resq into 341-cmb-add-service-charge-dropdown Kendrick Chan 2020-02-17 15:25:40 +0800
  • 147e949aff Add initial UI for service charge support in one step job order form #341 Kendrick Chan 2020-02-17 15:25:12 +0800
  • 6c11650b25 Add service charge entity. #341 Korina Cordero 2020-02-17 07:20:37 +0000
  • 6656890fd8 Merge branch '343-cmb-discount' into '270-final-cmb-fixes' Kendrick Chan 2020-02-17 06:21:50 +0000
  • 6d37f56a1a Merge branch '343-cmb-discount' into '270-final-cmb-fixes' Korina Cordero 2020-02-17 06:19:33 +0000
  • 984b0428d0 Fix for cmb to retain battery in invoice when editing JO. #343 343-cmb-discount Korina Cordero 2020-02-17 06:19:09 +0000
  • a15b45173c Fix discount computation. #343 Korina Cordero 2020-02-17 01:02:41 +0000
  • aae0dff495 Merge branch '343-cmb-discount' into 'master' Korina Cordero 2020-02-14 09:40:35 +0000
  • d439a411a8 Change computation of discount for CMB. #343 Korina Cordero 2020-02-14 09:40:08 +0000
  • d9c3a4dff8 Merge branch '340-cmb-walk-in-customer-form' into '270-final-cmb-fixes' Kendrick Chan 2020-02-14 03:46:06 +0000
  • be8c93b752 Merge branch '340-cmb-walk-in-customer-form' into '270-final-cmb-fixes' Korina Cordero 2020-02-14 03:39:49 +0000
  • ec409a9c34 Merge branch '340-cmb-walk-in-customer-form' into 'master' Korina Cordero 2020-02-14 03:39:09 +0000
  • ac91960bd7 Add mobile phone validation for JO when new customer is created. #340 340-cmb-walk-in-customer-form Korina Cordero 2020-02-14 03:38:37 +0000