Commit graph

473 commits

Author SHA1 Message Date
Korina Cordero
5a0bf45983 Add annotations to controllers for outlet, promo, report, rider, search, and test. #222 2019-06-07 09:19:06 +00:00
Korina Cordero
0925dbd574 Remove annotations from destroy methods of battery, battery manufacturer, battery model, and api user since not needed. Add annotations for battery size, customer, geofence, and job order. #222 2019-06-07 08:18:01 +00:00
Korina Cordero
bd3b3df713 Convert the controllers for battery, APIUser, battery manufacturer, and battery model to use the Menu annotation. #222 2019-06-07 02:17:30 +00:00
3d1a1c3173 Convert HubController to use Menu annotation instead of base controller #222 2019-06-07 02:03:30 +08:00
841011d3d0 Convert HomeController to use Menu annotation instead of base controller #222 2019-06-07 01:22:09 +08:00
4359a8a95b Merge branch '220-display-geofence-area-coverage' into 'master'
Resolve "Display geofence area coverage"

Closes #220

See merge request jankstudio/resq!257
2019-06-05 17:06:12 +00:00
45892ceac9 Remove unneeded ACLGenerator in customer controller #194 2019-06-05 22:26:24 +08:00
93bc1c6c23 Rename auth bundle generator and voter #194 2019-06-05 19:43:45 +08:00
4654a4602f Remove references of App\Access\Generator and substitute with Generator from catalyst auth bundle #194 2019-06-05 17:06:13 +08:00
Korina Cordero
b2e394d1b2 Add highlighting of area in map and row when selecting an area. #220 2019-06-05 06:18:51 +00:00
29f574e25c Merge branch 'master' of gitlab.com:jankstudio/resq into 194-catalyst-api-bundle-acl 2019-06-05 11:37:53 +08:00
Korina Cordero
eaf77fc634 Add rows table to geofence page with Delete action. #220 2019-06-04 07:15:56 +00:00
Korina Cordero
f2a180420a Add upload KML feature for geofence. #220 2019-06-03 08:05:10 +00:00
Korina Cordero
9e9c59cd0b Display supported areas in google map. #220 2019-05-31 06:55:02 +00:00
Korina Cordero
e574ae966a Add geofence to menu under Location. Add list of saved coverage areas. #220 2019-05-30 09:21:23 +00:00
740110b42f Merge branch '180-rider-location-caching' into 'master'
Resolve "Rider location caching"

Closes #180

See merge request jankstudio/resq!252
2019-05-28 03:24:22 +00:00
Korina Cordero
3c9802bbd2 Fix error message when the user tries to update an API Role that has already been assigned to a user. #194 2019-05-10 07:08:42 +00:00
Korina Cordero
0d291b037c Fix the error message when user tries to update the role ID. #210 2019-05-10 07:02:37 +00:00
Korina Cordero
35321203f1 Add support for update and delete API User. #194 2019-05-10 01:10:28 +00:00
Korina Cordero
d42e1b1ed5 Add id to the User entity in the API bundle. Add support for list and add API user to the site. #194 2019-05-09 07:43:36 +00:00
Korina Cordero
b8ab5bb3c0 Add comments for the Generator and Voter classes in the auth bundle. Add support for add, update, and delete API Role. #194 2019-05-09 04:24:05 +00:00
Korina Cordero
2bd703fc5c Add routes for API roles and user. Add controller for API role. Display list of API roles. #194 2019-05-08 10:27:53 +00:00
Korina Cordero
3c236d0ab4 Merge branch 'master' of gitlab.com:jankstudio/resq into 194-catalyst-api-bundle-acl 2019-05-08 07:16:09 +00:00
Korina Cordero
9205429662 Add the legacy job order row details to the details page. #207 2019-05-01 09:34:00 +00:00
Korina Cordero
32fa839e2c Display the legacy job order details when Details is clicked. #207 2019-04-30 11:53:47 +00:00
Korina Cordero
115b99eb73 Add details form for legacy job order search results. #207 2019-04-30 10:58:46 +00:00
Korina Cordero
e61d77ad8b Remove checking for rider validity. Add call to RiderTracker service from the APIController. #180 2019-04-29 02:16:03 +00:00
Korina Cordero
be8ceb7e29 Add warr_tnv to the Battery entity. Add the tnv warranty to the add/edit forms. Add means to save/display the tnv warranty data in the forms. #203 2019-04-11 07:33:25 +00:00
Korina Cordero
24a0e5a2d1 Change brand and size parameters to brand_id and size_id. #201 2019-04-04 09:22:31 +00:00
Korina Cordero
620a750465 Add CAPI call to add a new battery. #201 2019-04-04 09:07:41 +00:00
62f97a00a4 Merge branch '197-report-to-track-battery-compatibility-conflict' into 'master'
Resolve "Report to track battery compatibility conflict"

Closes #197

See merge request jankstudio/resq!231
2019-04-04 06:55:57 +00:00
Korina Cordero
c80013bc02 Fix formatting issue for csv output. #197 2019-04-03 07:29:14 +00:00
Korina Cordero
3af6d6b7e8 Fix checking for battery conflicts. Add list of compatible batteries for vehicle. #197 2019-04-03 02:14:26 +00:00
Korina Cordero
b0386c4758 Add checking for battery conflicts in existing job orders. #197 2019-04-02 10:22:17 +00:00
b988abd852 Change error message for geofence error in mobile app #199 2019-04-02 12:06:55 +08:00
Korina Cordero
c720be1c2d Add twig files for the battery conflict report. Add link to the battery conflict report in base twig. Add controller functions to query for the report. #197 2019-04-01 08:57:49 +00:00
Korina Cordero
a22816d18a Add battery conflict report to acl.yaml. Add route to controller for battery conflict report #197 2019-03-29 10:06:58 +00:00
Korina Cordero
01f57fdc37 Made the Generator and Voter classes in the Auth bundle abstract. Modify the services.yaml to point to the Voter and Generator classes that extended the base classes from the Auth bundle. #194 2019-03-28 07:03:09 +00:00
Korina Cordero
eaac1dfb7d Create auth bundle with base classes for User and Role. Use base class for user and role in the User and Role entities in the API and the main site. #194 2019-03-27 06:58:08 +00:00
Korina Cordero
3e79c3960c Change the API call to warranties to sort by date_create #195 2019-03-22 05:16:59 +00:00
Korina Cordero
53332b989a Add ACL support for the API #194 2019-03-21 14:28:18 +00:00
Ramon Gutierrez
14817f19e7 Update global search layout and use single template for both views #193 2019-03-18 23:42:47 +08:00
Korina Cordero
97570405d6 Display the results into three separate tables #182 2019-03-18 03:20:22 -04:00
Korina Cordero
b021479d2e Fix display issue for search results #182 2019-03-15 05:16:22 -04:00
Korina Cordero
fc94bfbef1 Set a maximum number of results for the query. Fix the issue of the search word not sent to the controller. #182 2019-03-14 07:31:44 -04:00
Korina Cordero
bd1009dac9 Implement the search feature from the controller #182 2019-03-14 04:44:59 -04:00
Korina Cordero
dc842aab5e Create controller, route, and default page for search #182 2019-03-13 03:17:47 -04:00
a1408c618c Merge branch '141-geofencing-coverage-area-2' into 'master'
Resolve "Geofencing coverage area"

Closes #141

See merge request jankstudio/resq!221
2019-03-10 17:34:17 +00:00
27372264e9 Add geofence check for job order request api call #141 2019-03-11 01:32:52 +08:00
63dd85da17 Change rejection report user created by to rejection user #191 2019-03-04 01:51:20 +08:00
d791374b29 Separate and create detailed rejection report #190 2019-03-01 22:43:59 +08:00
71ed134e78 Output csv for rejection report #184 2019-02-26 03:07:56 +08:00
924c00c41f Fix date start and end filtering for rejection report #184 2019-02-24 02:29:50 +08:00
2c8f626aa6 Load data for rejection report in json format #184 2019-02-24 02:09:38 +08:00
Ramon Gutierrez
8b6066bb38 Update template path for rejection report form #184 2019-02-24 00:49:48 +08:00
f59476c2d3 Add routes, acl and template changes for rejection report #184 2019-02-23 23:31:46 +08:00
Ramon Gutierrez
623c80421a Add route and processing for hub rejections #183 2019-02-12 00:14:15 +08:00
e2ccf1bbc1 Add functionality to save facilitated by fields #181 2019-02-10 20:48:46 +08:00
7ae9fe4e2d Add facilitated by dropdowns for job order form #181 2019-02-09 21:44:35 +08:00
f0d94e034f Add first_name, last_name, and mobile_number fields to warranty #177 2019-01-30 22:12:36 +08:00
1bd5c30875 Fix assign rider so cancelled job orders cannot be assigned #175 2019-01-28 03:16:50 +08:00
4b24454549 Fix dispatch, so cancelled job orders cannot be assigned to a hub #175 2019-01-28 02:44:05 +08:00
dbc161d9c9 Fix warranty claim api bug #173 2019-01-22 22:54:04 +08:00
2f30d0c7c3 Update warranty api controller to handle sku instead of model / size for batteries #172 2019-01-21 02:09:16 +08:00
85121a973d Update battery api controller, routes and test scripts #172 2019-01-20 17:51:34 +08:00
296dedd732 Remove debug error logs #171 2019-01-19 23:45:34 +08:00
bc9cf2a74f Modify claim warranty api call #171 2019-01-10 02:26:42 +08:00
e4cedd9e4d Add get all warranties api call #171 2019-01-10 00:02:24 +08:00
4c9dba09ba Fix resend confirmation code issue #169 2018-11-13 04:23:17 +08:00
fac78e558d Add plate number warranty API call #166 2018-11-06 01:55:51 +08:00
6771b86d6c Change APIController to abstract class from interface #166 2018-11-06 01:30:52 +08:00
d78e30c9c2 Add battery model and size to warranty and change warranty routes #166 2018-11-06 01:14:19 +08:00
4867f1b6bb Finish warranty api calls #164 2018-10-26 00:58:32 +08:00
9fcae0f05b Add vehicle and battery apis #164 2018-10-25 13:35:27 +08:00
959d2c6efc Add warranty entity, refactor controller, and fix bugs #164 2018-10-24 22:20:45 +08:00
0d41b46ee9 Refactor api bundle to use security to handle authentication #164 2018-10-23 02:11:21 +08:00
2b9499861b Add catalyst api bundle and test controller #164 2018-10-15 01:19:29 +08:00
77d6d146c0 Add CSAT field to form and entity #163 2018-10-03 01:08:08 +08:00
b2d680ae64 Support test phone number for iphone / android testing #162 2018-09-28 09:46:52 +08:00
bad555fbd1 Change closest hub display limit to 50 #162 2018-09-23 15:08:59 +08:00
49977c1501 Merge branch '162-phase-2-changes' into 'master'
Set closest hubs limit to 30 #162

Closes #162

See merge request jankstudio/resq!188
2018-09-12 23:32:32 +00:00
9d5f880a14 Set closest hubs limit to 30 #162 2018-09-13 07:29:39 +08:00
root
4464edc803 Support new rider app has_motolite and flag_coolant format 2018-09-10 00:08:38 +08:00
root
d84a156a02 Add support for has_motolite and flag_coolant in change service rider api call 2018-09-08 19:28:15 +08:00
3ad32605fe Add support for coolant and non-coolant overheat service #162 2018-09-07 03:27:56 +08:00
1c53556713 Highlight mobile app sourced job orders in dispatch table #162 2018-09-03 15:57:03 +08:00
root
e7fd6cb9d1 Fix battery image issue for under warranty 2018-09-02 23:19:03 +08:00
root
45a84d1cc8 Fix edit invoice bug for rider api 2018-08-27 03:57:44 +08:00
30e08259db Add apple push notification service #162 2018-08-15 15:09:04 +08:00
e3a0e8e23c Have hub reassign and rider reassign send mqtt events to rider and user app #162 2018-08-15 12:59:57 +08:00
4b635631ba Change mqtt event when rider cancels to outlet_assign #162 2018-08-15 11:24:26 +08:00
f720ccd940 Add mqtt send for outlet_assign event #162 2018-08-15 10:43:54 +08:00
dbe152598f Merge branch 'master' of gitlab.com:jankstudio/resq into 162-phase-2-changes 2018-08-14 23:58:41 +08:00
2aa765d186 Allow rating of -1 for cancel rating for rider rating user api call #162 2018-08-14 23:58:00 +08:00
root
bbeb3be10d Make sure batt_id is null in change service rider api call 2018-08-14 23:45:27 +08:00
root
0cc667dbec Merge branch 'master' of https://gitlab.com/jankstudio/resq
Conflicts:
	utils/mqtt_sender/mqtt_sender.py
2018-08-14 13:52:30 +08:00
b5c67f1c91 Revert typecasting for now #162 2018-08-13 14:50:44 +08:00
root
b3eb68346f Revert to regular json_encode because auto int conversion sucks 2018-08-13 14:34:47 +08:00
051521679e Disable sending of MQTT message to user app when user cancels via api #162 2018-08-13 05:08:09 +08:00
fa659226bc Mark JO as rider rated when post rider rating api call is used #162 2018-08-13 05:01:33 +08:00