Commit graph

499 commits

Author SHA1 Message Date
Korina Cordero
f21753bd07 Comment out checking of dpa consent. Comment out access to dpa consent. #418 2020-05-25 03:33:44 +00:00
2aa6d417b7 Merge branch '408-resq-additional-dpa-behavior' into 'master'
Resolve "Resq - additional dpa behavior"

Closes #408

See merge request jankstudio/resq!471
2020-05-21 01:50:57 +00:00
Korina Cordero
adcd9f8c4c Add advance order job orders report. #413 2020-05-20 08:13:42 +00:00
Korina Cordero
c2ca48c402 Add auto assigned job orders report. #412 2020-05-20 07:40:18 +00:00
Korina Cordero
c5eaf348a8 Filter hubs in hubs dropdown to those with flag_hub_view set to true. Add flag_hub_view to Hub entity. Filter JOs whose status are not cancelled or fulfilled. #411 2020-05-20 05:22:08 +00:00
Korina Cordero
ef3f5d5cec Add route to edit hub view form. Remove pdf link from hub view. Filter JOs based on selected hub. #410 2020-05-19 06:55:55 +00:00
Korina Cordero
25997ae11e Add acl, menu item, template, and route for Hub View. #410 2020-05-19 03:30:50 +00:00
Korina Cordero
bbebdb04c8 Add checking for email address if email checkbox is checked. #408 2020-05-15 09:24:31 +00:00
Korina Cordero
af85a632e5 Add acl entry for display of DPA Consent. Add checking when adding/updating customer for DPA consent. #408 2020-05-15 08:48:58 +00:00
Korina Cordero
143c471a48 Add report for SMS messages. #397 2020-05-04 08:05:50 +00:00
f073baf518 Shift to maptiler and have the api key in the .env #384 2020-04-22 16:10:35 +08:00
Korina Cordero
c7af1c1592 Add rider_slots to hub. #381 2020-04-20 03:37:40 +00:00
Korina Cordero
f33a253cea Add transaction origin to mqtt message. #380 2020-04-17 06:07:32 +00:00
Korina Cordero
a30f9b2ce8 Modify how mobile customer markers are loaded when dashboard map is loaded. #380 2020-04-17 05:17:00 +00:00
Korina Cordero
3caf23b57d Add job order details report. #379 2020-04-16 07:17:18 +00:00
Korina Cordero
932bd7c770 Add mobile customer layer to the dashboard map. 2020-04-15 07:32:05 +00:00
Korina Cordero
4fd8292d2e Fix JO link in dashboard for resq. #377 2020-04-15 03:21:47 +00:00
Korina Cordero
e1b27dea9a Add branch_code and status_open to hub form. #374 2020-04-08 10:11:43 +00:00
Korina Cordero
0e09705c1d Merge branch 'master' of gitlab.com:jankstudio/resq into 374-auto-assign-hub-and-rider 2020-04-07 03:27:59 +00:00
42abdd8097 Add z-index to dashboard map to allow for user and reports menu #364 2020-04-07 11:24:23 +08:00
Korina Cordero
9a661763a0 Add auto assign to controller. #374 2020-04-06 09:46:54 +00:00
35f237f3fa Merge branch '368-cmb-list-all-active-jobs-of-rider-on-dashboard-popup-when-clicking-on-rider-icon' into '270-final-cmb-fixes'
Resolve "CMB - list all active jobs of rider on dashboard popup when clicking on rider icon"

See merge request jankstudio/resq!414
2020-03-10 09:19:33 +00:00
Korina Cordero
a3c9c16d51 Restore active job order for rider. #368 2020-03-10 09:15:11 +00:00
Korina Cordero
9327f02623 Display active job orders of rider. #368 2020-03-10 09:07:01 +00:00
Korina Cordero
63210ab463 Rename Delivery Instructions to CarFix Details. #369 2020-03-10 08:16:53 +00:00
Korina Cordero
c4da604ac8 Made plate number a required field if new customer. #367 2020-03-10 06:07:29 +00:00
Korina Cordero
2e884ff577 Add additional columns to list of open JOs. #365 2020-03-05 07:22:38 +00:00
Korina Cordero
e93b6432b0 Add view all form for cmb. #365 2020-03-05 06:26:50 +00:00
2e3c879fd5 Support rider status changes in dashboard map #362 2020-03-05 07:15:26 +08:00
07753274c3 Add initial job order prioritization features #360 2020-03-01 22:14:13 +08:00
3496976bf5 Merge branch '358-cmb-clear-battery-details-when-new-customer-toggle-is-turned-on' into '270-final-cmb-fixes'
Resolve "CMB - clear Battery Details when New Customer toggle is turned on"

See merge request jankstudio/resq!402
2020-02-27 05:25:02 +00:00
Korina Cordero
2ab0055286 Clear battery details when New Customer toggle is on. #358 2020-02-25 09:09:51 +00:00
Korina Cordero
3d40bc6238 Remove links to onestep edit from templates for resq. Fix for getEditRoute issues found during testing. #357 2020-02-25 07:18:55 +00:00
5b19302752 Merge branch '354-cmb-and-resq-move-invoice-related-code-out-of-jocontroller' into '270-final-cmb-fixes'
Resolve "CMB and Resq - move invoice-related code out of JOController"

See merge request jankstudio/resq!395
2020-02-25 03:35:53 +00:00
Korina Cordero
22be1eaf5a Fix edit for walkin JOs. #270 2020-02-24 10:33:13 +00:00
Korina Cordero
4b9b3622d5 Fix to display service charge amount when loading an existing JO. #355 2020-02-24 03:06:47 +00:00
Korina Cordero
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 2020-02-24 02:43:43 +00:00
Korina Cordero
e93e0dd943 Bug fix for loading JO form for edit. #354 2020-02-21 05:10:11 +00:00
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
7b5239e548 Add checking for dashboard_enable. #334 2020-02-19 05:22:57 +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