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

2092 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kendrick Chan
4e6bc0d95f Add sql for clearing jo data for production #472 2020-08-22 11:07:01 +08:00
Kendrick Chan
b6d2726d41 Fix caching for rider marker name loading #472 2020-08-21 17:42:29 +08:00
Kendrick Chan
78554ec9c6 Fix getting rider name for rider markers #472 2020-08-21 17:04:30 +08:00
root
a2245fef2b Merge branch '457-cmb-add-telephone-number-to-search' of gitlab.com:jankstudio/resq into 457-cmb-add-telephone-number-to-search 2020-08-17 16:33:43 +08:00
root
a05f53fd88 Pass as option the rider availability url. #457 2020-08-17 16:32:43 +08:00
Korina Cordero
763d141860 Fix SSL problem. #457 2020-08-15 08:02:17 +00:00
Korina Cordero
a864b6b3eb Merge branch '457-cmb-add-telephone-number-to-search' of gitlab.com:jankstudio/resq into 457-cmb-add-telephone-number-to-search 2020-08-15 07:51:08 +00:00
Korina Cordero
4866d01eb3 Add ssl checking. #457 2020-08-15 07:31:17 +00:00
Korina Cordero
2f60c28068 Merge branch 'revert-4874791f' into '457-cmb-add-telephone-number-to-search' 
Revert "Merge branch '467-cmb-release-2' into '457-cmb-add-telephone-number-to-search'"

See merge request jankstudio/resq!550
 2020-08-14 11:22:41 +00: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
4874791fed Merge branch '467-cmb-release-2' into '457-cmb-add-telephone-number-to-search' 
# Conflicts:
#   config/routes/rider.yaml
#   public/assets/js/dashboard_map.js
#   public/assets/js/map_mqtt.js
#   src/Controller/RiderController.php
 2020-08-14 10:10:45 +00:00
Korina Cordero
166c4942f1 Add rider name to rider labels. #457 2020-08-14 09:35:57 +00:00
Korina Cordero
b1d397c127 Merge branch '458-cmb-service-type-transaction-names' of gitlab.com:jankstudio/resq into 457-cmb-add-telephone-number-to-search 2020-08-14 09:26:37 +00:00
Korina Cordero
b20c61a830 Remove rider name from labels in Dashboard. #457 2020-08-06 08:38:02 +00:00
Korina Cordero
518121211c Merge branch 'revert-030a3655' into 'master' 
Revert 030a3655

See merge request jankstudio/resq!537
 2020-08-05 10:31:32 +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
030a3655b3 Merge branch '457-cmb-add-telephone-number-to-search' into 'master' 
Resolve "CMB - add telephone number to search"

Closes #424 and #457

See merge request jankstudio/resq!536
 2020-08-05 10:17:24 +00:00
Korina Cordero
1a82676c25 Remove log messages. #457 2020-08-05 10:13:53 +00:00
Korina Cordero
62a4ffcdfd Add mobile number to customer vehicle search in JO forms. #457 2020-08-05 09:40:18 +00:00
Korina Cordero
11cdb161f0 Merge branch '459-cmb-add-responsible_party-to-jo' into '424-cmb-release' 
Resolve "CMB - add responsible_party to JO"

See merge request jankstudio/resq!534
 2020-08-05 08:10:25 +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
74039a8011 Set service types to battery sales, warranty replacement, jumpstart, and warranty claim. #458 2020-08-05 06:48:17 +00:00
Korina Cordero
1dabdee4b0 Merge branch '456-cmb-add-rider-s-finish-time-in-jo-list' into '424-cmb-release' 
Add finish date column to list of all job orders. #456

See merge request jankstudio/resq!532
 2020-08-05 04:04:08 +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
46bcf7f209 Fix zoom issue in dashboard map. #424 2020-08-04 08:08:56 +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
Kendrick Chan
e3b189b7ae Merge branch 'revert-fdce6c02' into '424-cmb-release' 
Revert "Add name to rider label. #424"

See merge request jankstudio/resq!531
 2020-08-04 05:39:19 +00:00
Kendrick Chan
55a4455586 Revert "Add name to rider label. #424" 
This reverts commit fdce6c02a4
 2020-08-04 05:39:07 +00:00
Korina Cordero
fdce6c02a4 Add name to rider label. #424 2020-07-27 09:49:53 +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
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
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
1cba6b0670 Merge branch '441-cmb-limit-uploaded-photos-to-four' into '424-cmb-release' 
Commented out the Other Images section. #441

See merge request jankstudio/resq!519
 2020-07-21 10:05:34 +00:00
Korina Cordero
6ed3c52e49 Commented out the Other Images section. #441 2020-07-21 10:04:47 +00:00
Korina Cordero
99eae1fae8 Merge branch '441-cmb-limit-uploaded-photos-to-four' into '424-cmb-release' 
Resolve "CMB - limit uploaded photos to four"

See merge request jankstudio/resq!518
 2020-07-21 09:59:25 +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
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