Commit graph

83 commits

Author SHA1 Message Date
Korina Cordero
b212fa99bc Recommit warranty computation changes. #512 2020-10-02 03:15:07 +00:00
e53bb8f69b Revert "Merge branch '512-cmb-warranty-expiration-computation' into '488-cmb-live'"
This reverts merge request !594
2020-10-01 15:09:43 +00:00
Korina Cordero
d3bcc1176c Fix warranty computation. #512 2020-10-01 06:32:05 +00:00
8068a662f6 Check active jo before removing it for rider #488 2020-09-16 22:22:26 +08:00
1e23764452 Initialize jo_data as null in RAPI call #488 2020-09-16 20:23:36 +08:00
2c4167a093 Set job_order field to null if no ongoing in RAPI call #488 2020-09-16 20:18:07 +08:00
Korina Cordero
8bcd9b9546 Merge branch '496-cmb-clear-rider-s-active-jo-when-jo-is-cancelled' of gitlab.com:jankstudio/resq into 495-cmb-rider-cannot-start-second-jo-after-completion-of-first-jo 2020-09-16 08:08:12 +00:00
Korina Cordero
2b07a89544 Make explicit setting of active JO to null. #496 2020-09-16 08:07:10 +00:00
Korina Cordero
9ad9de61c7 Set rider's active job order to null after JO completion. #495 2020-09-16 08:05:05 +00:00
Korina Cordero
dbb05b16d9 Clear rider's active job order when JO is cancelled via rider app and admin panel. #496 2020-09-16 07:50:45 +00:00
Korina Cordero
92a7380b4f Fix display issue of cancel reason. #472 2020-09-07 03:27:38 +00:00
Korina Cordero
9052f8102c Get name for cancel reason. #472 2020-09-07 03:00:22 +00:00
Korina Cordero
171fa14e40 Add job order number to notifications. Add cancel reason to notifications if JO is cancelled. #484 2020-09-04 08:41:20 +00:00
Korina Cordero
3157ce7edc Fix error in goOnline. #478 2020-08-26 04:53:53 +00:00
Korina Cordero
309605da24 Move adding/removal of rider to and from rider cache when going online/offline. #478 2020-08-26 04:06:50 +00:00
198406a5ec Add notification sending for JOs cancelled by rider #472 2020-08-23 01:33:26 +08:00
678dfcc65d Fix generate url inside rider api handler #472 2020-08-23 01:26:19 +08:00
01f5717c1c Add notification sending when rider rejects JO #472 2020-08-23 01:09:45 +08:00
Korina Cordero
526296c8a3 Revert "Merge branch '467-cmb-release-2' into '457-cmb-add-telephone-number-to-search'"
This reverts commit 4874791fed
2020-08-14 11:21:53 +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
d61d71804d Return empty array for job order when no ongoing job order. #424 2020-07-24 06:42:38 +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
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
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
1a6ed417bf Split invoice items with quantity more than 1. #436 2020-07-14 03:15:51 +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
e8923c8faf Add checking for odometer maximum value. #434 2020-07-01 02:55:48 +00:00
Korina Cordero
818a8fff30 Add cash to mode of payments. #424 2020-06-26 05:22:46 +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
5822ea84a6 Add fix for rider being unavailable after completing a JO. #424 2020-06-23 09:54:50 +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
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