Commit graph

2013 commits

Author SHA1 Message Date
Korina Cordero
3a57c484a2 Mark notifications as read when user views the JO. User is redirected to the JO when clicking the View JO action. #433 2020-07-10 09:54:47 +00:00
Korina Cordero
00ae620878 Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 433-cmb-notifications-when-jo-is-cancelled-or-rejected 2020-07-10 04:14:13 +00:00
Korina Cordero
8734871142 Merge branch '434-cmb-uat-issues' into '424-cmb-release'
Fix bug when assigning rider to JO. #434

See merge request jankstudio/resq!505
2020-07-08 10:42:26 +00:00
Korina Cordero
7d19cfa1eb Fix bug when assigning rider to JO. #434 2020-07-08 10:41:28 +00:00
Korina Cordero
451ea6c280 Merge branch '434-cmb-uat-issues' into '424-cmb-release'
Modify checking for JO reassignment. #434

See merge request jankstudio/resq!504
2020-07-08 09:13:24 +00:00
Korina Cordero
c82a7a388d Modify checking for JO reassignment. #434 2020-07-08 09:12:35 +00:00
Korina Cordero
596e077243 Merge branch '434-cmb-uat-issues' into '424-cmb-release'
Made the model year field a dropdown. #434

See merge request jankstudio/resq!503
2020-07-08 04:24:27 +00:00
Korina Cordero
a448177a1c Made the model year field a dropdown. #434 2020-07-08 04:21:17 +00:00
Korina Cordero
954ccc5071 Merge branch '434-cmb-uat-issues' into '424-cmb-release'
Resolve "CMB - UAT issues"

See merge request jankstudio/resq!501
2020-07-07 11:39:40 +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
27f37de489 Fix discount issues. #434 2020-07-03 08:14:12 +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
Korina Cordero
9bb8380ca4 Add 45 minutes to date_schedule. #434 2020-07-02 02:59:23 +00:00
Korina Cordero
473e7a8e51 Return list of years for model year until current year. #434 2020-07-01 09:40:01 +00:00
Korina Cordero
2cf5542037 Adjust max value for discount to 60. #434 2020-07-01 09:21:41 +00:00
Korina Cordero
ada02f46a7 Comment saving of promo information. #434 2020-07-01 09:17:34 +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
e8923c8faf Add checking for odometer maximum value. #434 2020-07-01 02:55:48 +00:00
Korina Cordero
1c076228c6 Add Whatsapp to the list for transaction origin. #434 2020-07-01 02:35:12 +00:00
Korina Cordero
b4d1cd344d Add E-Wallet as mode of payment. #434 2020-07-01 02:20:57 +00:00
Korina Cordero
858849a764 Made customer notes non-mandatory. #434 2020-07-01 02:12:08 +00:00
Korina Cordero
fc6cf1883b Add notification controller and entity. #433 2020-06-30 11:04:38 +00:00
Korina Cordero
101565a251 Add NotificationType. #433 2020-06-30 06:48:39 +00:00
Korina Cordero
0b8b462f8f Add Notification entity. Modify User and JobOrder entities for notifications. #433 2020-06-30 06:47:43 +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
944fff8d95 Merge branch '409-add-analytics-for-forecasting' into 'master'
Add time restriction in analytics #409

Closes #409

See merge request jankstudio/resq!498
2020-06-26 23:46:40 +00:00
94116a2958 Add time restriction in analytics #409 2020-06-27 07:42:04 +08:00
Korina Cordero
818a8fff30 Add cash to mode of payments. #424 2020-06-26 05:22:46 +00:00
Korina Cordero
481420294e Fix for JO not displaying errors when required fields are blank. #424 2020-06-26 03:26:54 +00:00
78d351b103 Merge branch '409-add-analytics-for-forecasting' into 'master'
Allow analytics to be filtered by date range #409

Closes #409

See merge request jankstudio/resq!497
2020-06-26 01:12:43 +00:00
2803c264ac Allow analytics to be filtered by date range #409 2020-06-25 23:39:46 +08:00
Korina Cordero
bf572fa93c Remove error_log commands. #424 2020-06-25 10:57:14 +00: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
c3b4e1219b Add trim when getting plate number when adding a customer vehicle. #424 2020-06-25 04:43:00 +00:00
Korina Cordero
a1a60100f5 Add new event type for perform. Add event creation when JO is performed. #424 2020-06-25 03:11:08 +00:00
Korina Cordero
5ad416df1d Set yaml files for cmb. #424 2020-06-24 09:05:35 +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
Korina Cordero
5822ea84a6 Add fix for rider being unavailable after completing a JO. #424 2020-06-23 09:54:50 +00:00
Korina Cordero
0f5bf2e8d6 Fix error when rider is not selected. #424 2020-06-23 09:40:39 +00:00
Korina Cordero
21ae94c5b6 Change default mode of payment to credit card. #424 2020-06-23 06:06:15 +00:00
Korina Cordero
093a249689 Add JO status checking for getOngoingJobOrder. #424 2020-06-23 02:33:24 +00:00