Commit graph

1777 commits

Author SHA1 Message Date
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
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
592c8e8149 Merge branch '336-trans-method-to-check-if-new-battery' into '329-transition-branch-for-cmb-and-resq-merging'
Resolve "TRANS - method to check if new battery"

See merge request jankstudio/resq!378
2020-02-13 02:46:49 +00:00
Korina Cordero
1595954ab7 Merge branch '329-transition-branch-for-cmb-and-resq-merging' of gitlab.com:jankstudio/resq into 336-trans-method-to-check-if-new-battery 2020-02-13 02:45:58 +00:00
Korina Cordero
2fb24e4e13 Add validation for mobile phone number. #339 2020-02-13 02:41:32 +00:00
Korina Cordero
29be1e9493 Fix wiring for resq rider api handler. #329 2020-02-12 06:34:03 +00:00
Korina Cordero
f354631dfa Add RiderAPIHandler to services.yaml for resq and cmb. #329 2020-02-12 06:14:12 +00:00
Korina Cordero
c81a56c6e6 Modify the checking if service type is new battery. #336 2020-02-12 02:33:14 +00:00