Commit graph

256 commits

Author SHA1 Message Date
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
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
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
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
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
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
Korina Cordero
2fb24e4e13 Add validation for mobile phone number. #339 2020-02-13 02:41:32 +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
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
4d8ddc5323 Modify the retrieval of the flags from request object. #324 2020-02-11 01:49:24 +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
0df0955cb3 Add rider assignment handler for resq. #333 2020-02-07 08:19:51 +00:00
Korina Cordero
8bbc39ec9e Merge branch '311-cmb-refactor-rapicontroller-into-a-service' of gitlab.com:jankstudio/resq into 329-transition-branch-for-cmb-and-resq-merging 2020-02-07 02:24:17 +00:00
Korina Cordero
8dbcd0478d Add riders and dates to query filters. #329 2020-02-06 07:29:23 +00:00
Korina Cordero
b7cae5afe2 Add getOtherParameters to Resq job order handler. #329 2020-02-06 07:21:39 +00:00
Korina Cordero
075c83fb0d Add checking for valid plate number before warranty creation after JO is fulfilled. #311 2020-02-06 05:25:30 +00:00
Korina Cordero
1fc64cef8a Add checking for valid plate number before warranty creation after JO is fulfilled. #311 2020-02-06 04:59:48 +00:00
Korina Cordero
91182fbc38 Remove git conflict message. #311 2020-02-05 23:47:53 +00:00
Korina Cordero
36657cbdf0 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 311-cmb-refactor-rapicontroller-into-a-service 2020-02-05 08:25:18 +00:00
Korina Cordero
3300400456 Move the rest of the functions to the service. #311 2020-02-05 08:19:10 +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
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
Korina Cordero
15bafe2363 Fix for query when multiple parameters are passed. #319 2020-02-04 10:33:12 +00:00
Korina Cordero
3789871f9a Add rider and date filter to search. #319 2020-02-04 08:43:39 +00:00
Korina Cordero
05af87ed9c Move payment to the service. Move updateVehicleBattery to the JO handler for RAPIController. #311 2020-01-31 10:05:08 +00:00
Korina Cordero
aa1a2b3bcb Move the hubArrive function to the service. #311 2020-01-31 09:04:04 +00:00
Korina Cordero
bf3136da62 Move the arrive function to the service. #311 2020-01-31 08:53:35 +00:00
Korina Cordero
b651d06ec8 Move cancelJobOrder to the service. #311 2020-01-31 08:16:11 +00:00
Korina Cordero
de4bf9f271 Bug fixes for acceptJobOrder. #311 2020-01-31 07:55:26 +00:00
Korina Cordero
becd8d0c17 Move acceptJobOrder to the service. #311 2020-01-31 06:21:35 +00:00
Korina Cordero
35ccaa73c3 Add country code to constructor of RiderAPIHandler service. #311 2020-01-31 06:04:18 +00:00
Korina Cordero
3e5ea688bc Move logout and getJobOrder to the service. #311 2020-01-31 04:22:27 +00:00
Korina Cordero
c3662cd185 Add login to interface. #311 2020-01-30 08:53:56 +00:00
Korina Cordero
cbc99778cd Move login to the service. #311 2020-01-30 08:52:41 +00:00
Korina Cordero
4d104d38e1 Move the register function from controller to service. #311 2020-01-30 07:47:34 +00:00
Korina Cordero
10ecd6298a Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 318-error_log-cleanup 2020-01-30 04:03:44 +00:00
Korina Cordero
dab8986ad1 Remove or comment out error_logs meant for debugging purposes. #318 2020-01-30 00:31:01 +00:00
Korina Cordero
bc8ce40b13 Add distance from customer to hub to hub table. #314 2020-01-28 07:24:14 +00:00
6dd3f3377e Merge branch '309-replace-63-in-templates-with-proper-country-code' into '270-final-cmb-fixes'
Resolve "Replace +63 in templates with proper country code"

See merge request jankstudio/resq!350
2020-01-28 02:54:08 +00:00
86b4601bb8 Fix bug in rider cache #270 2020-01-28 05:37:41 +08:00
4719d89368 Add rider cache service #299 2020-01-28 04:32:05 +08:00
2d6193318a Add ability to remove customer markers via status publish #299 2020-01-27 04:04:30 +08:00
cba80ddd90 Have active job orders loaded from cache in dashboard map #299 2020-01-26 00:58:00 +08:00
9e00c3f115 Fix publishing and subscribing for new / updated JOs #299 2020-01-25 05:11:53 +08:00
66be351bd3 Make MQTT key configurable #299 2020-01-24 20:46:25 +08:00
Korina Cordero
5a138ce09f Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 309-replace-63-in-templates-with-proper-country-code 2020-01-24 05:37:30 +00:00
fe7cfe6c86 Refactor RedisClientProvider #299 2020-01-24 03:19:51 +08:00
Korina Cordero
2c9f5180e3 Move warranty creation when JO is fulfilled to the warranty handler for CMB. #308 2020-01-23 07:47:32 +00:00
Korina Cordero
d569c666e3 Add warranty creation when JO is fulfilled to ResqJobOrderHandler. #305 2020-01-22 08:18:30 +00:00
Korina Cordero
d418f0ff5a Remove hardcoded prefix from customer. Add country code to .env and services.yaml. #307 2020-01-22 06:42:28 +00:00
Korina Cordero
d6015978ae Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 307-cmb-fix-customer-hard-coded-country-code 2020-01-22 04:54:01 +00:00
Korina Cordero
00816b4226 Add warranty creation after job order fulfillment. #304 2020-01-21 08:14:05 +00:00
Korina Cordero
c224b1773d Modify query to find customer vehicle using plate number. #302 2020-01-20 06:37:29 +00:00
Korina Cordero
260c218724 Added one step form for CMB. #270 2020-01-16 07:38:54 +00:00
Korina Cordero
99e8485065 Display invoice details for editing one step form. #270 2020-01-15 02:18:28 +00:00
Korina Cordero
8da95f2ed0 Add saving of updated form for one step job order. #270 2020-01-14 08:26:39 +00:00
Korina Cordero
3a167f0b38 Add links and routes to editing a one step job order form. #270 2020-01-14 03:34:00 +00:00
Korina Cordero
79ab60619b Add saving of one step job order data. #270 2020-01-10 10:26:32 +00:00
Korina Cordero
ed2975e8d3 Add validation when submitting a one step job order. #270 2020-01-10 09:53:51 +00:00
Korina Cordero
603919667f Add form tags for the one step form. #270 2020-01-09 02:19:24 +00:00
Korina Cordero
eea64645b5 Move updating of customer vehicle out of the command and into the warranty service. #290 2019-12-23 03:54:01 +00:00
Korina Cordero
10d9e6e5ae Update customer vehicle warranty information when warranty is uploaded. #290 2019-12-23 02:04:48 +00:00
Korina Cordero
85483ffab8 Add updating of customer vehicle information when warranty is added. #290 2019-12-20 13:16:45 +00:00
Korina Cordero
ff56db09b0 Add command to update customer vehicle from warranty data. #290 2019-12-20 07:30:08 +00:00
Korina Cordero
a10ef2b5d9 Fix testing issues found for warranty handler. #286 2019-12-18 07:57:39 +00:00
51850d0230 Add one step job order process form #270 2019-12-18 04:06:45 +08:00
Korina Cordero
0d3a96e038 Move updating of warranty to handler. #286 2019-12-17 01:05:55 +00:00
2f3e8df6d4 Fix dashboard map bug when rider has no assigned hub #270 2019-12-16 20:25:15 +08:00
Korina Cordero
a02c364c1f Fix testing issues with command. #286 2019-12-16 09:58:40 +00:00
Korina Cordero
7da009f673 Move getWarrantyPeriod into the WarrantyHandler. #286 2019-12-16 09:49:48 +00:00
Korina Cordero
bd2ea5fba3 Add the WarrantyHandler service. Move the computeDateExpire to the service. #286 2019-12-16 07:29:25 +00:00
Korina Cordero
d04a6976f2 Use OpenStreetMap for map in incoming form. #270 2019-12-05 07:40:52 +00:00
Korina Cordero
ade2c3b5de Add map manager interface. #270 2019-12-03 09:42:23 +00:00
Korina Cordero
1533987727 Add a TODO for the JobHandlerInterface. #270 2019-11-14 05:56:45 +00:00
Korina Cordero
4549e124eb Add job order queueing for riders assignments. #270 2019-11-14 05:54:37 +00:00
Korina Cordero
174f0142c9 Move getCustomerVehicleInfo to the customer handler service. #270 2019-11-13 02:14:46 +00:00
Korina Cordero
8f875f1e31 Move getCustomerVehicles to the customer handler service. #270 2019-11-13 01:53:48 +00:00
Korina Cordero
cc3db5b58c Move the delete customer to the service. #270 2019-11-12 07:48:35 +00:00
Korina Cordero
fb6823d25c Move the customer list to the customer handler service. #270 2019-11-12 07:25:56 +00:00
Korina Cordero
3a33a16cc5 Move the loading of customer list page to the customer service. #270 2019-11-12 06:41:16 +00:00
Korina Cordero
50e54f6acc Move the update of customer and customer vehicle to customer handler service. #270 2019-11-12 05:57:47 +00:00