Commit graph

1363 commits

Author SHA1 Message Date
Korina Cordero
407c860582 Add finish date column to list of all job orders. #456 2020-08-05 03:51:40 +00:00
Korina Cordero
46bcf7f209 Fix zoom issue in dashboard map. #424 2020-08-04 08:08:56 +00:00
Korina Cordero
117974d2cb Add CustomerNotWaitReason. #453 2020-08-04 08:00:21 +00:00
Korina Cordero
8f6aa72cc0 Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 424-cmb-release 2020-08-04 07:57:15 +00:00
Korina Cordero
8a026ef44a Add fix to dashboard map zoom error. #424 2020-08-04 07:52:27 +00:00
55a4455586 Revert "Add name to rider label. #424"
This reverts commit fdce6c02a4
2020-08-04 05:39:07 +00:00
Korina Cordero
21c1535e89 Add Lazada to Transaction Origin. #455 2020-08-04 03:45:23 +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
4cd75acb46 Add updating of landmark, willing to wait, and reason when updating JO form. #453 2020-07-31 01:42:50 +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
18dd63ac16 Make Landmark field in JO required. #447 2020-07-28 08:07:56 +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
fdce6c02a4 Add name to rider label. #424 2020-07-27 09:49:53 +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
ed53e494b4 Fix bug where JO goes back to assigned when updated. #424 2020-07-24 08:57:33 +00:00
Korina Cordero
d61d71804d Return empty array for job order when no ongoing job order. #424 2020-07-24 06:42:38 +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
febd4d6e09 Comment out the error_log for header longitude and latitude. #424 2020-07-23 06:53:01 +00:00
Korina Cordero
ff83dec5ce Add upload photo event type. #424 2020-07-23 04:40:48 +00:00
Korina Cordero
eadcd4604a Add getHeaderCoordinates to rider api. #424 2020-07-23 03:55:33 +00:00
Korina Cordero
232ebfe3fc Add RIDER_FINISH event. Add date_complete to API response. #424 2020-07-23 02:50:13 +00:00
Korina Cordero
37fef914d9 Add checking for null for other images. #424 2020-07-22 06:35:12 +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
127b4a6f7b Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 438-cmb-rider-icon-should-be-green-when-rider-rejects-jo 2020-07-21 07:17:56 +00:00
Korina Cordero
d7a5bd7dda Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 437-cmb-rider-cannot-go-offline-if-rider-has-assigned-jos 2020-07-21 07:12:46 +00:00
Korina Cordero
6b65e92711 Add date_start to the job order data response. #440 2020-07-21 07:10:45 +00:00
Korina Cordero
d01aa82e31 Clear rider when JO has been rejected. Send event for rider availability when rider rejects JO. #437 2020-07-21 04:58:14 +00:00
Korina Cordero
109911bbb0 Clear rider when JO has been rejected. Send event for rider availability when rider rejects JO. #437 2020-07-21 04:51:50 +00:00
Korina Cordero
95a070051e Add checking for assigned job orders when rider is logging out or going offline. #437 2020-07-20 08:21:34 +00:00
Korina Cordero
20f5e46726 Add date_accept to the responses when getting a job order. #440 2020-07-17 06:17:55 +00:00
655b632849 Fix availability if active jo is closed #424 2020-07-16 15:12:44 +08:00
e79ae22f32 Fix rider available ajax call to rely on active job order #424 2020-07-16 14:40:30 +08:00
2745e0dac0 Fix hardcoded availability of rider in ajax call #424 2020-07-16 14:31:51 +08:00
b24bae3788 Add rider availability ajax call #424 2020-07-16 14:19:16 +08:00
Korina Cordero
0c845b456e Fix issue of icon not displaying when rider goes online. #436 2020-07-16 05:09:53 +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
4c8ea2f69b Add list of job orders behind schedule. #436 2020-07-15 08:40:30 +00:00
Korina Cordero
1a6ed417bf Split invoice items with quantity more than 1. #436 2020-07-14 03:15:51 +00:00
Korina Cordero
6cb3f1be66 Fix the quantity in invoice when user orders more than one battery of the same type. #436 2020-07-13 09:38:47 +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
7d19cfa1eb Fix bug when assigning rider to JO. #434 2020-07-08 10:41:28 +00:00
Korina Cordero
c82a7a388d Modify checking for JO reassignment. #434 2020-07-08 09:12:35 +00:00
Korina Cordero
a448177a1c Made the model year field a dropdown. #434 2020-07-08 04:21:17 +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
32d3012802 Limit rider schedule to 7 - 4 and 8 - 5 #409 2020-07-01 23:43:24 +08: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
ada02f46a7 Comment saving of promo information. #434 2020-07-01 09:17:34 +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
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
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
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
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
47a52782f7 Remove prefix from channel. #424 2020-06-24 07:55:50 +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
16b136b0d3 Make sure blank job_order is in data for get ongoing job order rider api call #424 2020-06-23 00:10:08 +08:00
Korina Cordero
9d41ecb228 Add fix for security checking for verifyJobOrder. #424 2020-06-22 11:39:58 +00:00
Korina Cordero
47eaa6488f Add display name for payment method in rider API JO data. #424 2020-06-22 10:56:41 +00:00
Korina Cordero
42d086ff5d Add sending of mqtt event when JO is assigned to rider. #424 2020-06-22 10:05:01 +00:00
Korina Cordero
a3cf1572f1 Refactor the controller for the API response. #424 2020-06-22 06:41:24 +00:00
Korina Cordero
0f0169cff4 Fix return value for verifyJobOrder. #424 2020-06-22 04:32:58 +00:00
Korina Cordero
db4ab726ab Fix bug in completeJobOrder. #424 2020-06-22 04:00:08 +00:00
Korina Cordero
2f8dca3dbc Fix responses for verifyJobOrder. #424 2020-06-22 03:45:50 +00:00
Korina Cordero
3abb6f0efb Add verifyJobOrder API call. #424 2020-06-22 03:13:41 +00:00
cbaf1ed6a6 Fix customer signature issue #424 2020-06-21 20:08:27 +08:00
eb2d173ea7 Add email and customer signature to complete call in rider api #424 2020-06-21 19:14:30 +08:00
2b13adffa0 Add customer email to jo details in rider api #424 2020-06-21 17:04:41 +08:00
f519ec01dc Set paid status in payment call in rider api #424 2020-06-21 16:46:11 +08:00
1e3b621a91 Send null for extra images if blank for rider api #424 2020-06-21 16:27:43 +08:00
d59174d721 Replace speedomtr with speedometer #424 2020-06-21 16:26:10 +08:00
4ec5ddd993 Add mode of payment to payment in rider api #424 2020-06-21 15:52:34 +08:00
fe363e1df6 Add request object to format job order data method #424 2020-06-21 14:49:31 +08:00
60323acce3 Add request to URL extra image generation #424 2020-06-21 14:48:27 +08:00
ce9a2f42b9 Add images and odometer to JO info #424 2020-06-21 14:44:10 +08:00
391909c493 Fix typo in job order status constant #424 2020-06-21 10:27:24 +08:00
59e6e9eb5c Support null date_status_change for rider api #424 2020-06-20 21:49:35 +08:00