rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions
2149 commits 749 branches 8 tags 145 MiB
Commit graph

2149 commits

This branch
This branch
All branches
Author SHA1 Message Date
Korina Cordero
1bf29f86e6 Merge branch '438-cmb-rider-icon-should-be-green-when-rider-rejects-jo' into '424-cmb-release' 
Resolve "CMB - rider icon should be green when rider rejects JO"

See merge request jankstudio/resq!516
 2020-07-21 07:20:27 +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
34b71fe9e7 Merge branch '437-cmb-rider-cannot-go-offline-if-rider-has-assigned-jos' into '424-cmb-release' 
Resolve "CMB - rider cannot go offline if rider has assigned JOs"

See merge request jankstudio/resq!515
 2020-07-21 07:14:17 +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
f0de318acf Merge branch '440-cmb-set-jo-time-started-when-rider-accepts-jo' into '424-cmb-release' 
Resolve "CMB - set JO time started when rider accepts JO"

See merge request jankstudio/resq!514
 2020-07-21 07:11:57 +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
Kendrick Chan
655b632849 Fix availability if active jo is closed #424 2020-07-16 15:12:44 +08:00
Kendrick Chan
4b22344e72 Minor cleanup #424 2020-07-16 15:00:50 +08:00
Kendrick Chan
9e649c9d70 Fix bug in rider availability check #424 2020-07-16 14:56:20 +08:00
Kendrick Chan
a8b5a59ddb Display marker only if rider is 'online' #424 2020-07-16 14:54:26 +08:00
Kendrick Chan
3d861537b5 Add debug for rider availability #424 2020-07-16 14:52:59 +08:00
Kendrick Chan
2d292e1f9d Do not display marker for inactive rider #424 2020-07-16 14:50:36 +08:00
Kendrick Chan
e79ae22f32 Fix rider available ajax call to rely on active job order #424 2020-07-16 14:40:30 +08:00
Kendrick Chan
3f2cc2b82a Add debug console log for putting markers #424 2020-07-16 14:36:23 +08:00
Kendrick Chan
9fd31a1531 Make dashmap available in ajax call #424 2020-07-16 14:33:45 +08:00
Kendrick Chan
2745e0dac0 Fix hardcoded availability of rider in ajax call #424 2020-07-16 14:31:51 +08:00
Kendrick Chan
718125f2bf Remove debug js for mqtt messasges to make it easier #424 2020-07-16 14:23:42 +08:00
Kendrick Chan
1b2ea61891 Fix js error #424 2020-07-16 14:20:44 +08:00
Kendrick Chan
b24bae3788 Add rider availability ajax call #424 2020-07-16 14:19:16 +08:00
Kendrick Chan
f060223fb5 Add console debug for rider availability packets #424 2020-07-16 13:53:55 +08:00
Korina Cordero
72f2490f71 Merge branch '436-cmb-uat-requests' into '424-cmb-release' 
Fix issue of icon not displaying when rider goes online. #436

See merge request jankstudio/resq!513
 2020-07-16 05:10:54 +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
dc678fd622 Merge branch '436-cmb-uat-requests' into '424-cmb-release' 
Add channel for rider availability to add/remove rider when rider goes online/offline. #436

See merge request jankstudio/resq!512
 2020-07-16 03:32:40 +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
a16e600ba4 Merge branch '436-cmb-uat-requests' into '424-cmb-release' 
Add template for behind schedule JOs. #436

See merge request jankstudio/resq!511
 2020-07-15 08:59:08 +00:00
Korina Cordero
40eb185fdb Add template for behind schedule JOs. #436 2020-07-15 08:58:06 +00:00
Korina Cordero
b9f96fff4f Merge branch '436-cmb-uat-requests' into '424-cmb-release' 
Add list of job orders behind schedule. #436

See merge request jankstudio/resq!510
 2020-07-15 08:45:15 +00:00
Korina Cordero
4c8ea2f69b Add list of job orders behind schedule. #436 2020-07-15 08:40:30 +00:00
Korina Cordero
ae5c18a761 Merge branch '436-cmb-uat-requests' into '424-cmb-release' 
Add label to rider icons. #436

See merge request jankstudio/resq!509
 2020-07-15 03:52:27 +00:00
Korina Cordero
340344729d Add label to rider icons. #436 2020-07-15 03:37:49 +00:00
Korina Cordero
423ab20d77 Merge branch '436-cmb-uat-requests' into '424-cmb-release' 
Split invoice items with quantity more than 1. #436

See merge request jankstudio/resq!508
 2020-07-14 03:25:39 +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
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
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