Commit graph

460 commits

Author SHA1 Message Date
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
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
Korina Cordero
a62476a833 Add create, update, list, and delete for service charges. #348 2020-02-19 03:16:27 +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
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
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
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
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
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
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
984b0428d0 Fix for cmb to retain battery in invoice when editing JO. #343 2020-02-17 06:19:09 +00:00
Korina Cordero
d439a411a8 Change computation of discount for CMB. #343 2020-02-14 09:40: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
fde400e01f Remove text 'No current battery' for serial. #335 2020-02-12 00:51:57 +00: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
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
60e3d3673f Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 329-transition-branch-for-cmb-and-resq-merging 2020-02-06 05:38:57 +00:00
Korina Cordero
295dbaa254 Remove Rider label and added option AllRiders to Rider dropdown. #319 2020-02-05 05:39:45 +00:00
Korina Cordero
cf783bf1cb Added validations to customer and customer vehicle data. #319 2020-02-05 05:28:59 +00:00
Korina Cordero
a3e40de170 Add adding of customer and customer vehicle from one step form. #319 2020-02-05 03:15:30 +00:00
6cdb5d0312 Fix battery fetching for new customer in one step jo form #319 2020-02-05 05:14:42 +08:00
d943015f4a Merge branch '319-cmb-one-step-form-display-rider-distance' of gitlab.com:jankstudio/resq into 319-cmb-one-step-form-display-rider-distance 2020-02-05 04:37:33 +08:00
746b25ad74 Fix one step form for CMB to allow for new customer and vehicle #319 2020-02-05 04:36:33 +08:00
Korina Cordero
b6700eed36 Add rider and date query parameters for list of to be fulfilled and open job orders. #319 2020-02-04 11:15:10 +00:00
4ad0db07e8 Add new customer option enabling customer and vehicle fields #319 2020-02-04 18:39:14 +08:00
Korina Cordero
3789871f9a Add rider and date filter to search. #319 2020-02-04 08:43:39 +00:00
Korina Cordero
96efa32a12 Fixes for battery_ajax_get. #323 2020-02-04 01:39:14 +00:00
Korina Cordero
6bcdf70902 Display the battery to be added to the form. #323 2020-02-03 11:03:52 +00:00
Korina Cordero
fd2fe4fb6f Add routes and UI elements to add compatible battery to vehicle. #323 2020-02-03 08:59:22 +00:00
84293cb45a Merge branch '317-delete-icon-for-battery-in-vehicle-screen' into '270-final-cmb-fixes'
Resolve "Delete icon for battery in vehicle screen"

See merge request jankstudio/resq!362
2020-01-29 11:18:50 +00:00
e8e97bcd6b Fix jo link in rider and customer popup in dashboard #270 2020-01-29 19:13:49 +08:00
Korina Cordero
234d993d8f Add deletion of compatible battery from vehicle. #317 2020-01-29 09:03:56 +00:00
41a6801c19 Fix string concat bug in jo tracking page #270 2020-01-29 01:20:40 +08:00
c8157b9509 Add functionality to job order tracking page #270 2020-01-29 01:13:47 +08:00