Commit graph

693 commits

Author SHA1 Message Date
Korina Cordero
b4c8da134c Merge branch 'master-fix' of gitlab.com:jankstudio/resq into 575-adopt-hub-filtering-branch 2021-06-23 09:42:12 +00:00
Korina Cordero
e7395217da Fix typo. #586 2021-06-17 07:32:50 +00:00
Korina Cordero
614183fa2d Add CRUD UI for dealers. #586 2021-06-17 07:27:22 +00:00
Korina Cordero
4c3b895702 Add date range for warranty details report. Fix query to include all warranties. #587 2021-06-17 04:03:23 +00:00
0fb09f2e6d Add recommended extra battery inventory feature #582 2021-06-11 00:53:02 +08:00
Korina Cordero
c3ffbb20ff Add hub filtering code. #575 2021-06-02 10:00:35 +00:00
Korina Cordero
64f3248b59 Fix issues found during merging and testing. #570 2021-05-27 07:14:18 +00:00
Korina Cordero
5b42cf5ce9 Add one time promo. #570 2021-05-27 04:39:29 +00:00
Korina Cordero
97eccf8ab8 Fix for issues found during testing. #567 2021-05-19 09:11:56 +00:00
Korina Cordero
66e1a71890 Apply branch 551 changes. #567 2021-05-19 08:10:18 +00:00
Korina Cordero
7a6ccfb8eb Add Customer Source Report to admin panel. #547 2021-03-29 05:48:26 +00:00
Korina Cordero
e0fab6703c Reset the motolite battery flag when loading page and loading customer vehicle. #546 2021-03-24 15:20:44 +08:00
Korina Cordero
28f5edf605 Remove debug logs. #546 2021-03-24 15:20:44 +08:00
Korina Cordero
1ab103e3e4 Add changes to additional fields in JO incoming form. #546 2021-03-24 15:20:44 +08:00
Korina Cordero
c1533c24c4 Create marketing research sms and email flags for customer. #546 2021-03-24 15:20:44 +08:00
Korina Cordero
0103aadcc3 Add Marketing Research checkbox under Marketing Promo for Customer. #546 2021-03-18 23:13:42 +08:00
Korina Cordero
5b5d12cf42 Add inventory flag to SAP battery. #546 2021-03-18 23:13:42 +08:00
Korina Cordero
d4541a5fce Add Trade-in Lazada field for battery size. #546 2021-03-18 23:13:42 +08:00
Korina Cordero
bd75e159bd Add rider availability channel. #535 2021-02-10 03:35:32 +00:00
Korina Cordero
f31891393d Add shift schedule dropdown. #531 2021-01-21 08:44:56 +00:00
Korina Cordero
b17a95e35a Add container size to SAP battery form. #527 2020-12-07 09:05:00 +00:00
Korina Cordero
a9d631cbc2 Add list, create, update, and delete for container size. #527 2020-12-07 06:46:43 +00:00
Korina Cordero
debc3bc8cb Add new flag for SAP battery. #526 2020-12-01 09:12:21 +00:00
Korina Cordero
0752fe3726 Add create, list, update, and delete for SAP Battery. #524 2020-11-27 09:52:24 +00:00
Korina Cordero
bd80c6295a Add create, delete, update, and list for SAP battery size. #524 2020-11-27 08:43:47 +00:00
Korina Cordero
041cb7bafa CRUD for SAP battery brand. #524 2020-11-27 08:25:01 +00:00
668f49f335 Add warranty serial edit modal and ajax call for jo forms #525 2020-10-26 01:46:35 +08:00
f684fb532c Merge branch 'master' into '519-motiv-connectivity'
# Conflicts:
#   src/Controller/JobOrderController.php
2020-10-12 14:48:56 +00:00
1227e03e1a Add inventory count to hub table in job order processing form #519 2020-10-10 00:52:45 +08:00
Korina Cordero
aa89e74e94 Add DPA access when creating customer and job order. Add checking for email when email promo is checked. #486 2020-09-10 06:05:41 +00:00
Korina Cordero
ce7c1f5163 Add fulfill-cancel mode to display the timeline. #475 2020-09-09 04:03:59 +00:00
Korina Cordero
dfb3682088 Add the None option for why not willing to wait. #482 2020-09-03 03:10:05 +00:00
Korina Cordero
c30874e1c0 Change the wiling to wait checkbox into a dropdown. Add text field for not willing to wait. #479 2020-08-27 08:28:39 +00:00
Korina Cordero
d14bb71c77 Adjust the column spacing in JO form. #465 2020-08-13 08:17:51 +00:00
Korina Cordero
defadcd016 Remove redundant text field from JO form. #465 2020-08-12 06:22:06 +00:00
Korina Cordero
71b70d0c5a Merge branch '463-resq-message-prompt-for-non-serviceable-area' into '465-resq-august-13-release'
Resolve "Resq - message prompt for non-serviceable area"

See merge request jankstudio/resq!542
2020-08-12 05:41:56 +00:00
Korina Cordero
ce70966117 Add geofence checking to JO form. #463 2020-08-10 09:03:21 +00:00
Korina Cordero
e8220f4282 Add no trade in reason to form and JO entity. #462 2020-08-10 07:51:37 +00:00
Korina Cordero
4454f10d45 Merge branch '453-resq-july-30-release' of gitlab.com:jankstudio/resq into 462-resq-dropdown-for-trade-in-reason 2020-08-10 04:01:46 +00:00
Korina Cordero
1f39ab3ccf Add list of no trade in reasons. #462 2020-08-07 08:54:16 +00:00
Korina Cordero
df950006c1 Revert "Merge branch '457-cmb-add-telephone-number-to-search' into 'master'"
This reverts merge request !536
2020-08-05 10:17:40 +00:00
Korina Cordero
5942575fde Add responsible_party field to job order entity and JO forms. #459 2020-08-05 08:03:46 +00:00
Korina Cordero
407c860582 Add finish date column to list of all job orders. #456 2020-08-05 03:51:40 +00:00
Korina Cordero
78d0f4b150 Change text field to dropdown for reasons why customer will not wait. #454 2020-08-04 03:32:51 +00:00
Korina Cordero
a526b7bee5 Fix issue when user cancels the cancellation. #449 2020-08-04 02:27:44 +00:00
Korina Cordero
2e9a5585d4 Add dropdown for cancellation reasons. #449 2020-08-03 10:58:36 +00:00
Korina Cordero
3af78fd49b Add checking for SSL_ENABLE for Dashboard. #453 2020-07-30 03:23:03 +00:00
Korina Cordero
ca37b72d57 Check if role has permission to fulfill cancelled orders. #453 2020-07-29 05:22:33 +00:00
Korina Cordero
964dce9842 Add Willing to Wait tickbox and Reason for not waiting text field. #445 2020-07-28 10:10:59 +00:00
Korina Cordero
ed0eefc1d8 Add Battery Facilitated By column in View All. #443 2020-07-28 06:48:40 +00:00
Korina Cordero
886ed94d88 Merge branch '444-resq-include-date-filter-in-hub-view' of gitlab.com:jankstudio/resq into 443-resq-add-battery-facilitated-by-in-view-all-page 2020-07-28 06:15:39 +00:00
Korina Cordero
c3e36ad055 Add fulfill for cancelled job orders. #442 2020-07-28 05:58:21 +00:00
Korina Cordero
a432def97b Add date start to list of job orders behind schedule. #424 2020-07-27 07:48:10 +00:00
Korina Cordero
e85139b864 Add date start to the list of JOs in View All and Open. #424 2020-07-27 07:38:13 +00:00
Korina Cordero
afbe3aa00b Add route to fulfill a cancelled job order. #442 2020-07-23 10:34:01 +00:00
Korina Cordero
505177360e Add date filter for hub view. #444 2020-07-23 08:58:41 +00:00
Korina Cordero
6ed3c52e49 Commented out the Other Images section. #441 2020-07-21 10:04:47 +00:00
Korina Cordero
b680349e56 Limit uploaded photos to four. Rename images to generic names. #441 2020-07-21 09:58:06 +00:00
Korina Cordero
326bbeaed2 Add channel for rider availability to add/remove rider when rider goes online/offline. #436 2020-07-16 03:31:04 +00:00
Korina Cordero
40eb185fdb Add template for behind schedule JOs. #436 2020-07-15 08:58:06 +00:00
Korina Cordero
c61e3ac39e Set colors for assigned and in progress job orders in View All and View Open JO lists. #436 2020-07-13 03:48:05 +00:00
Korina Cordero
6bf4b76486 Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 436-cmb-uat-requests 2020-07-13 02:39:52 +00:00
Korina Cordero
a448177a1c Made the model year field a dropdown. #434 2020-07-08 04:21:17 +00:00
Korina Cordero
3fcb3d31b5 Limit customer vehicles to 2 per customer. #434 2020-07-07 07:34:43 +00:00
Korina Cordero
9c2c1e5895 Remove before pictures from job order. Also remove uploadArrive endpoint. #434 2020-07-06 09:10:33 +00:00
Korina Cordero
3de8b8762f Add checking if scheduled date and time are before the current date and time. #434 2020-07-06 07:51:26 +00:00
Korina Cordero
c3487358f1 Autopopulate the OR Name field with the customer name. #434 2020-07-03 07:29:47 +00:00
Korina Cordero
6e07e24e93 Made discount a dropdown. #434 2020-07-02 11:53:14 +00:00
32d3012802 Limit rider schedule to 7 - 4 and 8 - 5 #409 2020-07-01 23:43:24 +08:00
Korina Cordero
2cf5542037 Adjust max value for discount to 60. #434 2020-07-01 09:21:41 +00:00
Korina Cordero
1b9441a9ee Hide the promo/employee id field from both onestep and walkin forms. #434 2020-07-01 09:08:04 +00:00
Korina Cordero
9717effb0a Add signature and email address to display. Separate the before and after images. #432 2020-06-29 09:00:42 +00:00
Korina Cordero
7aed20019c Fix displaying of images. #432 2020-06-29 08:18:39 +00:00
Korina Cordero
32c83aa40c Add odometer and pictures when viewing JO. #432 2020-06-29 07:00:17 +00:00
Korina Cordero
e9981b24fa Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 432-cmb-display-details-in-jo 2020-06-29 02:56:08 +00:00
94116a2958 Add time restriction in analytics #409 2020-06-27 07:42:04 +08:00
Korina Cordero
481420294e Fix for JO not displaying errors when required fields are blank. #424 2020-06-26 03:26:54 +00:00
2803c264ac Allow analytics to be filtered by date range #409 2020-06-25 23:39:46 +08:00
Korina Cordero
87db4f4a4f Clear rider and hub when destination coordinates change. #424 2020-06-25 09:43:55 +00:00
Korina Cordero
be52d089d2 Fix JO saving when plate number is blank. #424 2020-06-25 08:50:08 +00:00
Korina Cordero
a65211a709 Remove the Action and Distance in KM from walkin form. Remove the Action columns in one step form. #424 2020-06-25 08:24:09 +00:00
Korina Cordero
47a52782f7 Remove prefix from channel. #424 2020-06-24 07:55:50 +00:00
Korina Cordero
4de9a00942 Add config variable for ssl. #424 2020-06-24 07:10:45 +00:00
b65893e821 Add aggregate data table for analytics output #409 2020-06-15 13:38:13 +08:00
e13e3c0dd5 Fix bug when no JO comes up for hub in 2018 #409 2020-06-14 18:54:52 +08:00
a2fdb346b3 Refactor schedule solver to solver per weekday and add charts and tables to template #409 2020-06-14 14:12:32 +08:00
d94e2353b0 Add schedule solver script and run it inside analytics controller #409 2020-06-11 01:15:58 +08:00
0911a1787e Create graph for overlaps #409 2020-06-03 01:18:12 +08:00
e150bf6181 Merge branch '409-add-analytics-for-forecasting' into 'master'
Resolve "Add analytics for forecasting"

Closes #409

See merge request jankstudio/resq!480
2020-05-26 10:00:27 +00:00
Korina Cordero
f21753bd07 Comment out checking of dpa consent. Comment out access to dpa consent. #418 2020-05-25 03:33:44 +00:00
8be67413d4 Add map display to show overlaps #409 2020-05-24 16:09:17 +08:00
06d3aa3b27 Add form for analytics forecasting #409 2020-05-23 23:07:00 +08:00
760f823794 Have graphs for all hubs in list #409 2020-05-22 23:56:51 +08: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
d63dfcabbd Create graphs for hours during the weekday and dates for the year #409 2020-05-21 00:33:32 +08: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
c1a8a5199b Add analytics menu, acl, controller, route, and template #409 2020-05-18 14:31:01 +08: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
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