Commit graph

1905 commits

Author SHA1 Message Date
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
Korina Cordero
4f9e7959b5 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-12 01:41:50 +00:00
54fa550859 Merge branch '335-cmb-editable-battery-serial-number' into '329-transition-branch-for-cmb-and-resq-merging'
Resolve "CMB - editable battery serial number"

See merge request jankstudio/resq!377
2020-02-12 00:56:59 +00:00
Korina Cordero
fde400e01f Remove text 'No current battery' for serial. #335 2020-02-12 00:51:57 +00:00
866910db9d Updated composer #335 2020-02-11 20:42:31 +08:00
3981dd9537 Set services to CMB #335 2020-02-11 20:34:43 +08:00
fb76cb0445 Replace ObjectManager with EntityManagerInterface #335 2020-02-11 20:31:28 +08:00
d51a98a6a0 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 335-cmb-editable-battery-serial-number 2020-02-11 18:27:34 +08:00
Korina Cordero
9cd5915e88 Add saving of serial when adding/editing/fulfilling a JO. #335 2020-02-11 08:09:55 +00:00
Korina Cordero
f0212cc6d4 Add checkIfNewBattery function to job order service. Add RiderAPIHandler to the respective services.yaml. #336 2020-02-11 05:54:58 +00:00
Korina Cordero
23253a1e65 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 336-trans-method-to-check-if-new-battery 2020-02-11 05:03:47 +00:00
2226f7c819 Merge branch '311-cmb-refactor-rapicontroller-into-a-service' into '270-final-cmb-fixes'
Resolve "CMB - Refactor RAPIController into a service"

See merge request jankstudio/resq!367
2020-02-11 04:46:03 +00:00
cf7e026948 Merge branch '324-add-new-fields-for-jo-form' into '329-transition-branch-for-cmb-and-resq-merging'
Resolve "Add new fields for JO form"

See merge request jankstudio/resq!375
2020-02-11 02:05:56 +00:00
Korina Cordero
4d8ddc5323 Modify the retrieval of the flags from request object. #324 2020-02-11 01:49:24 +00:00
Korina Cordero
38d56d9c09 Set default value for the flags to false. #324 2020-02-11 01:36:13 +00:00
Korina Cordero
e202fb650c Disable the new fields if editing JO form. #324 2020-02-10 08:35:31 +00:00
Korina Cordero
716f263e6b Make editable the new fields in JO form. #324 2020-02-10 08:13:36 +00:00
Korina Cordero
5dc57dc073 Add new fields to customer form. #324 2020-02-10 05:44:00 +00:00
Korina Cordero
e260edc80d Add new fields to incoming job order form. #324 2020-02-10 03:40:00 +00:00
Korina Cordero
fc6edb2b25 Merge branch '329-transition-branch-for-cmb-and-resq-merging' of gitlab.com:jankstudio/resq into 324-add-new-fields-for-jo-form 2020-02-10 02:49:31 +00:00
Korina Cordero
52f075ccba Add new fields to customer. #324 2020-02-10 02:48:21 +00:00
d62a36b6db Merge branch '333-rider-assignment-handler-for-resq' into '329-transition-branch-for-cmb-and-resq-merging'
Add rider assignment handler for resq. #333

See merge request jankstudio/resq!373
2020-02-07 08:42:21 +00:00
Korina Cordero
0df0955cb3 Add rider assignment handler for resq. #333 2020-02-07 08:19:51 +00:00