Commit graph

924 commits

Author SHA1 Message Date
60fb331b47 Fix role controller issue on saving #270 2020-03-05 23:52:40 +08:00
Korina Cordero
6a7cb9788e Fix access to customer vehicle search for walkin and one step. #366 2020-03-05 08:36:24 +00:00
Korina Cordero
dafe7e6b1c Modify access to getCustomerVehicles. #366 2020-03-05 06:53:26 +00:00
977559b88d Set priority properly for job order and handle priority down button #360 2020-03-02 08:33:50 +08:00
07753274c3 Add initial job order prioritization features #360 2020-03-01 22:14:13 +08:00
Korina Cordero
3d40bc6238 Remove links to onestep edit from templates for resq. Fix for getEditRoute issues found during testing. #357 2020-02-25 07:18:55 +00:00
Korina Cordero
6d14677bd7 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 357-transition-fix-resq-s-geteditroute 2020-02-25 03:38:18 +00:00
Korina Cordero
d534ce3241 Add getEditRoute for resq. #357 2020-02-25 03:37:58 +00:00
5b19302752 Merge branch '354-cmb-and-resq-move-invoice-related-code-out-of-jocontroller' into '270-final-cmb-fixes'
Resolve "CMB and Resq - move invoice-related code out of JOController"

See merge request jankstudio/resq!395
2020-02-25 03:35:53 +00:00
Korina Cordero
22be1eaf5a Fix edit for walkin JOs. #270 2020-02-24 10:33:13 +00:00
214e44405c Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 270-final-cmb-fixes
Conflicts:
	src/Controller/JobOrderController.php
2020-02-24 16:45:43 +08:00
1a0fb13268 Fix view all edit button to use one step edit for CMB #270 2020-02-24 16:43:27 +08:00
Korina Cordero
9125a0d2fa Moved invoice code out of JO controller. #354 2020-02-21 03:22:17 +00:00
Korina Cordero
4a12fb6eb2 Change edit to edit onestep edit and walkin. #353 2020-02-20 04:12:12 +00:00
Korina Cordero
a62476a833 Add create, update, list, and delete for service charges. #348 2020-02-19 03:16:27 +00:00
1c9ce12595 Merge branch '341-cmb-add-service-charge-dropdown' into '270-final-cmb-fixes'
Resolve "CMB - add service charge dropdown"

See merge request jankstudio/resq!387
2020-02-18 01:43:00 +00:00
d2afb99f4f Merge branch '344-cmb-rider-queue-management' into '270-final-cmb-fixes'
Add active job order feature for rider #344

See merge request jankstudio/resq!388
2020-02-17 17:01:50 +00:00
def4ed0357 Add active job order feature for rider #344 2020-02-18 01:00:19 +08:00
Korina Cordero
f3f941e0a0 Add service charges to invoice generation. #341 2020-02-17 13:24:32 +00:00
Korina Cordero
984b0428d0 Fix for cmb to retain battery in invoice when editing JO. #343 2020-02-17 06:19:09 +00:00
Korina Cordero
d439a411a8 Change computation of discount for CMB. #343 2020-02-14 09:40:08 +00:00
Korina Cordero
bea5d72d13 Modify the function names for walkin. #340 2020-02-14 03:07:42 +00:00
Korina Cordero
d07adc606b Add saving of walkin form. #340 2020-02-13 08:53:57 +00:00
Korina Cordero
7e116d8d3e Add function to load walk-in form. #340 2020-02-13 07:32:18 +00:00
Korina Cordero
9cd5915e88 Add saving of serial when adding/editing/fulfilling a JO. #335 2020-02-11 08:09:55 +00:00
Korina Cordero
8bbc39ec9e Merge branch '311-cmb-refactor-rapicontroller-into-a-service' of gitlab.com:jankstudio/resq into 329-transition-branch-for-cmb-and-resq-merging 2020-02-07 02:24:17 +00:00
Korina Cordero
49d0e6b97e Resolve missed merge conflict. #329 2020-02-06 05:43:15 +00:00
Korina Cordero
60e3d3673f Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 329-transition-branch-for-cmb-and-resq-merging 2020-02-06 05:38:57 +00:00
Korina Cordero
0af69bd963 Fix for payment bug. #327 2020-02-06 03:08:51 +00:00
Korina Cordero
36657cbdf0 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 311-cmb-refactor-rapicontroller-into-a-service 2020-02-05 08:25:18 +00:00
Korina Cordero
3300400456 Move the rest of the functions to the service. #311 2020-02-05 08:19:10 +00:00
Korina Cordero
a3e40de170 Add adding of customer and customer vehicle from one step form. #319 2020-02-05 03:15:30 +00:00
6cdb5d0312 Fix battery fetching for new customer in one step jo form #319 2020-02-05 05:14:42 +08:00
cb5fa96307 Fix bug with missing entity manager for one step edit #319 2020-02-05 04:45:27 +08:00
d943015f4a Merge branch '319-cmb-one-step-form-display-rider-distance' of gitlab.com:jankstudio/resq into 319-cmb-one-step-form-display-rider-distance 2020-02-05 04:37:33 +08:00
746b25ad74 Fix one step form for CMB to allow for new customer and vehicle #319 2020-02-05 04:36:33 +08:00
Korina Cordero
3789871f9a Add rider and date filter to search. #319 2020-02-04 08:43:39 +00:00
Korina Cordero
56a797533d Add processing of deleting and adding a battery in one request. #323 2020-02-04 01:54:43 +00:00
Korina Cordero
96efa32a12 Fixes for battery_ajax_get. #323 2020-02-04 01:39:14 +00:00
Korina Cordero
ac908e9bcd Add saving of battery to vehicle. #323 2020-02-03 11:23:57 +00:00
Korina Cordero
6bcdf70902 Display the battery to be added to the form. #323 2020-02-03 11:03:52 +00:00
Korina Cordero
fd2fe4fb6f Add routes and UI elements to add compatible battery to vehicle. #323 2020-02-03 08:59:22 +00:00
Korina Cordero
05af87ed9c Move payment to the service. Move updateVehicleBattery to the JO handler for RAPIController. #311 2020-01-31 10:05:08 +00:00
Korina Cordero
aa1a2b3bcb Move the hubArrive function to the service. #311 2020-01-31 09:04:04 +00:00
Korina Cordero
bf3136da62 Move the arrive function to the service. #311 2020-01-31 08:53:35 +00:00
Korina Cordero
b651d06ec8 Move cancelJobOrder to the service. #311 2020-01-31 08:16:11 +00:00
Korina Cordero
becd8d0c17 Move acceptJobOrder to the service. #311 2020-01-31 06:21:35 +00:00
Korina Cordero
3e5ea688bc Move logout and getJobOrder to the service. #311 2020-01-31 04:22:27 +00:00
Korina Cordero
cbc99778cd Move login to the service. #311 2020-01-30 08:52:41 +00:00
Korina Cordero
4d104d38e1 Move the register function from controller to service. #311 2020-01-30 07:47:34 +00:00
Korina Cordero
10ecd6298a Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 318-error_log-cleanup 2020-01-30 04:03:44 +00:00
Korina Cordero
dab8986ad1 Remove or comment out error_logs meant for debugging purposes. #318 2020-01-30 00:31:01 +00:00
84293cb45a Merge branch '317-delete-icon-for-battery-in-vehicle-screen' into '270-final-cmb-fixes'
Resolve "Delete icon for battery in vehicle screen"

See merge request jankstudio/resq!362
2020-01-29 11:18:50 +00:00
Korina Cordero
33fdc857f2 Add deletion of battery from vehicle when vehicle has more than one compatible battery. #317 2020-01-29 11:16:07 +00:00
Korina Cordero
234d993d8f Add deletion of compatible battery from vehicle. #317 2020-01-29 09:03:56 +00:00
c8157b9509 Add functionality to job order tracking page #270 2020-01-29 01:13:47 +08:00
Ramon Gutierrez
e914c6d2e1 Add customer jo tracking view #315 2020-01-28 21:51:32 +08:00
Korina Cordero
bc8ce40b13 Add distance from customer to hub to hub table. #314 2020-01-28 07:24:14 +00:00
Korina Cordero
0daf2a2813 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 312-cmb-highlight-selected-hub-and-rider-in-onestep-edit 2020-01-28 03:00:42 +00:00
6dd3f3377e Merge branch '309-replace-63-in-templates-with-proper-country-code' into '270-final-cmb-fixes'
Resolve "Replace +63 in templates with proper country code"

See merge request jankstudio/resq!350
2020-01-28 02:54:08 +00:00
a82cfb2691 Fix bug for dashboard rider #270 2020-01-28 05:55:22 +08:00
9563bd8cb2 Fix dashboard bug for active riders not in the database #270 2020-01-28 05:53:52 +08:00
4719d89368 Add rider cache service #299 2020-01-28 04:32:05 +08:00
cba80ddd90 Have active job orders loaded from cache in dashboard map #299 2020-01-26 00:58:00 +08:00
Korina Cordero
fd0738ad57 Merge branch '309-replace-63-in-templates-with-proper-country-code' of gitlab.com:jankstudio/resq into 312-cmb-highlight-selected-hub-and-rider-in-onestep-edit 2020-01-25 01:50:06 +00:00
Korina Cordero
3eb7c2c426 Update RAPIController.php 2020-01-25 01:31:18 +00:00
Korina Cordero
c9185e6139 Bug fixes for RAPIController. #309 2020-01-24 08:48:16 +00:00
Korina Cordero
8e613a43b1 Bug fixes from merge. Remove hardcoded country code prefixes from onestep form. #309 2020-01-24 06:22:12 +00:00
Korina Cordero
5a138ce09f Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 309-replace-63-in-templates-with-proper-country-code 2020-01-24 05:37:30 +00:00
Korina Cordero
69f0612a2d Replace hardcoded country code prefixes with variables set in .env and messages files. #309 2020-01-24 04:05:48 +00:00
68a92b2daf Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 299-cmb-realtime-map 2020-01-23 18:17:10 +08:00
Korina Cordero
d6015978ae Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 307-cmb-fix-customer-hard-coded-country-code 2020-01-22 04:54:01 +00:00
ec5e67a641 Make customer marker popup load via ajax #299 2020-01-22 05:10:49 +08:00
eac8f41d84 Make rider markers load popup via ajax #299 2020-01-22 04:03:25 +08:00
Korina Cordero
fb2d716721 Add update of customer vehicle and warranty creation after rider sets JO to fulfilled. #304 2020-01-21 08:38:52 +00:00
Korina Cordero
00816b4226 Add warranty creation after job order fulfillment. #304 2020-01-21 08:14:05 +00:00
4bb67ce7b7 Merge branch '290-update-customer-vehicle-info-when-warranty-is-added' into 'master'
Resolve "Update customer vehicle info when warranty is added"

Closes #290

See merge request jankstudio/resq!332
2020-01-20 02:48:15 +00:00
3ae9d8ab8d Merge branch '285-link-new-warranty-to-customer' into 'master'
Resolve "Link new warranty to customer"

Closes #285

See merge request jankstudio/resq!329
2020-01-20 02:46:05 +00:00
d72f1dd4c1 Merge branch '288-additional-validations-for-warranty-upload' into 'master'
Resolve "Additional validations for warranty upload"

Closes #288

See merge request jankstudio/resq!330
2020-01-20 02:36:03 +00:00
d2286f21ff Add rider_id to RAPI login return data #299 2020-01-19 19:49:38 +08:00
bbaaf250c6 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 299-cmb-realtime-map
Conflicts:
	config/services.yaml
2020-01-18 22:40:25 +08:00
cdf58ccc07 Merge branch '298-static-content' into 'master'
Resolve "Static Content"

Closes #298

See merge request jankstudio/resq!338
2020-01-17 08:31:21 +00:00
Korina Cordero
91e495f251 Add checking for duplicate ID. #298 2020-01-17 08:11:09 +00:00
Korina Cordero
2aed73b2d5 Add Static Content feature. #298 2020-01-17 07:55:35 +00:00
Korina Cordero
d810fc821a Add Warranty Details Report. #297 2020-01-17 06:35:03 +00:00
Korina Cordero
35f0d9c7be Add riders to one step job order map. #270 2020-01-16 03:51:46 +00:00
Korina Cordero
8da95f2ed0 Add saving of updated form for one step job order. #270 2020-01-14 08:26:39 +00:00
Korina Cordero
3a167f0b38 Add links and routes to editing a one step job order form. #270 2020-01-14 03:34:00 +00:00
Korina Cordero
ed2975e8d3 Add validation when submitting a one step job order. #270 2020-01-10 09:53:51 +00:00
Korina Cordero
0ed4e10251 Add rider assignment to one step form. #270 2020-01-10 05:33:11 +00:00
Korina Cordero
b4f1cbfcf0 Add battery sap code to report. #291 2020-01-09 08:31:03 +00:00
Korina Cordero
380bb23e25 Add model year from and model year to to report. #291 2020-01-08 01:35:59 +00:00
Korina Cordero
f74b8cff88 Add sql query to get vehicle battery compatibility data. #291 2020-01-07 10:15:53 +00:00
Korina Cordero
16763c5386 Add vehicle battery compatibility report. #291 2020-01-07 08:36:00 +00:00
Korina Cordero
10d9e6e5ae Update customer vehicle warranty information when warranty is uploaded. #290 2019-12-23 02:04:48 +00:00
Korina Cordero
85483ffab8 Add updating of customer vehicle information when warranty is added. #290 2019-12-20 13:16:45 +00:00
Korina Cordero
a10ef2b5d9 Fix testing issues found for warranty handler. #286 2019-12-18 07:57:39 +00:00
51850d0230 Add one step job order process form #270 2019-12-18 04:06:45 +08:00
Korina Cordero
0d3a96e038 Move updating of warranty to handler. #286 2019-12-17 01:05:55 +00:00
008e482fe8 Modify dashboard to display customers and riders with popup details #270 2019-12-17 02:08:32 +08:00
Korina Cordero
bc74339fbf Add checking if serial exists. #288 2019-12-16 06:18:37 +00:00
Korina Cordero
9c9018171e Add quick registration test for CAPI. #288 2019-12-16 04:05:04 +00:00
Korina Cordero
e62c3dc097 Add checking for serial and plate number. #288 2019-12-13 09:38:26 +00:00
Korina Cordero
ced7292413 Add customer and customer vehicle when warranty is registered via API. #285 2019-12-10 08:19:21 +00:00
Korina Cordero
bf2231037d Change implementation of all maps for job order to OpenStreet. #270 2019-12-09 08:02:29 +00:00
Korina Cordero
d04a6976f2 Use OpenStreetMap for map in incoming form. #270 2019-12-05 07:40:52 +00:00
Korina Cordero
ade2c3b5de Add map manager interface. #270 2019-12-03 09:42:23 +00:00
ec5b8951da Merge branch '281-create-customers-via-third-party-api' into 'master'
Resolve "Create customers via third party API"

Closes #281

See merge request jankstudio/resq!327
2019-11-28 06:52:20 +00:00
Korina Cordero
28b93a83d0 Add index for plate number in warranty. Finish warranty class report. #283 2019-11-28 05:20:29 +00:00
Korina Cordero
743bbf9c61 Add warranty class report to yaml files, templates and ReportController. #283 2019-11-27 08:04:42 +00:00
Korina Cordero
8921f2442b Add prefix for vehicle data. #281 2019-11-27 03:37:42 +00:00
Korina Cordero
16cd59dbfd Add route to register customer. Finish register function. #281 2019-11-27 03:23:39 +00:00
Korina Cordero
9efc0e3a75 Add CustomerController to CAPI. #281 2019-11-26 07:53:31 +00:00
50cb1d8617 Merge branch '277-apicontroller-changes-to-handle-duplicate-customer-mobile-numbers' into 'master'
Resolve "APIController changes to handle duplicate customer mobile numbers"

Closes #277

See merge request jankstudio/resq!322
2019-11-26 05:47:25 +00:00
Korina Cordero
7e5ffdcf26 Add index for plate number. #278 2019-11-25 03:21:50 +00:00
Korina Cordero
bf86a46082 Fix for errors found during testing. #277 2019-11-21 08:03:33 +00:00
Korina Cordero
0adffd92d7 Add checking if mobile session belongs to an existing customer. #277 2019-11-21 06:16:31 +00:00
Korina Cordero
9c4db034d0 Add command to create customer and customer vehicle from warranty. #274 2019-11-19 08:35:58 +00:00
Korina Cordero
0d60fe1a9d Add reason for invalid warranty. #258 2019-11-18 04:42:55 +00:00
Korina Cordero
11b60c8655 Merge branch '258-upload-warranty-csv' into 'master'
Resolve "Upload warranty csv"

Closes #258

See merge request jankstudio/resq!305
2019-11-18 03:10:07 +00:00
a55d093dce Add warranty class to popapp comparison report #273 2019-11-15 09:16:30 +08:00
Korina Cordero
174f0142c9 Move getCustomerVehicleInfo to the customer handler service. #270 2019-11-13 02:14:46 +00:00
Korina Cordero
8f875f1e31 Move getCustomerVehicles to the customer handler service. #270 2019-11-13 01:53:48 +00:00
Korina Cordero
cc3db5b58c Move the delete customer to the service. #270 2019-11-12 07:48:35 +00:00
Korina Cordero
fb6823d25c Move the customer list to the customer handler service. #270 2019-11-12 07:25:56 +00:00
Korina Cordero
3a33a16cc5 Move the loading of customer list page to the customer service. #270 2019-11-12 06:41:16 +00:00
Korina Cordero
0a8ba8ca7d Remove old implementation for update customer. #270 2019-11-12 06:06:11 +00:00
Korina Cordero
50e54f6acc Move the update of customer and customer vehicle to customer handler service. #270 2019-11-12 05:57:47 +00:00
Korina Cordero
d385d32d2e Move the adding of customer and customer vehicle to customer handler service. #270 2019-11-12 03:58:51 +00:00
Korina Cordero
9165fa1ef1 Remove error_logs. #270 2019-11-07 02:11:30 +00:00
Korina Cordero
954ae0e2d3 Removed the color, status, and fuel type fields for customer vehicle. #270 2019-11-07 02:10:13 +00:00
Korina Cordero
f70155a137 Update redis cache for rider session when rider registers or logs in. #270 2019-10-30 01:50:06 +00:00
Korina Cordero
29cc7374cc Add custom trade in types, warranty class, and modes of payment. #270 2019-10-29 04:54:51 +00:00
Korina Cordero
f5606d83c0 Add label to rider markers. #270 2019-10-28 07:38:05 +00:00
Korina Cordero
c05921cdf7 Add autorefresh for rider locations in map. #270 2019-10-25 08:59:52 +00:00
Korina Cordero
76b291f6d7 Add the rider tracker service to retrieve and display all rider locations. #270 2019-10-24 11:23:20 +00:00
Korina Cordero
ed0486fbf5 Improve geofence error message. #271 2019-10-23 05:58:05 +00:00
Korina Cordero
f6dce241ac Move retrieval of env variable to the geofence service. #271 2019-10-23 05:30:12 +00:00
Korina Cordero
e169766efd Modify the error message if delivery is not in the coverage areas. #271 2019-10-22 07:14:30 +00:00
Korina Cordero
590b9b82b4 Add geofence variable to env.dist. Add checking to APIController if geofence is on or not. #271 2019-10-22 07:14:15 +00:00
Korina Cordero
26d2dab6d8 Remove warranty creation when service type is battery replacement under warranty. #270 2019-10-18 07:07:16 +00:00
Korina Cordero
a209475849 Add warranty creation when rider confirms payment of JO. #270 2019-10-16 07:36:36 +00:00
Korina Cordero
610bbdcc7c Add trade in type for cmb. #270 2019-10-09 06:35:11 +00:00
Korina Cordero
a9ed02b0b2 Limit the service types to 2 for POC. Have job order return which twig template to display. #270 2019-10-07 07:16:03 +00:00
Korina Cordero
eb0e19d27f Add country code prefix to messages. Made the country code a constant. #270 2019-10-04 02:36:36 +00:00
Korina Cordero
08bd23fe30 Fix issue of invalid meta urls. #270 2019-10-01 10:12:25 +00:00
Korina Cordero
7989f6b6d6 Move retrieval of job order rows to the job service. #270 2019-10-01 08:35:55 +00:00
Korina Cordero
2f555483be Move generate PDF form to the job order service. #270 2019-10-01 07:14:51 +00:00
Korina Cordero
7de72e2ca3 Move unlock processor and unlock assignor to the job order service. #270 2019-10-01 06:27:55 +00:00
Korina Cordero
304ef3274c Move reject hub to the job order service. #270 2019-10-01 05:48:20 +00:00
Korina Cordero
e6482d44f0 Move reassignment of hub and rider to the job order service. #270 2019-10-01 04:22:49 +00:00
Korina Cordero
12555f3452 Move the initialization of rider and hub forms and hub reassignment to the job order service. #270 2019-10-01 02:04:16 +00:00
Korina Cordero
a7b5341f0d Move the initialization of the fulfillment and hub forms to the service. #270 2019-09-30 08:55:35 +00:00
Korina Cordero
365b316dba Add exception handling to the job order service. #270 2019-09-30 08:24:59 +00:00
Korina Cordero
2e2f43152c Move the initialization of parameters for view all and processing job order forms to the service. #270 2019-09-30 07:09:10 +00:00
Korina Cordero
34dc619392 Move the initialization of parameters for new and edit job order forms to the service. #270 2019-09-30 06:28:13 +00:00
Korina Cordero
7754ddc594 Move the assign rider, dispatch, fulfill, and cancel job order code to the service. #270 2019-09-30 05:26:50 +00:00
Korina Cordero
bd8696311c Move the dispatch and assign rider to job order to the service. #270 2019-09-27 09:59:55 +00:00
Korina Cordero
37c0945db9 Move the validation for incoming and editing job orders from the controller to the service. #270 2019-09-27 06:56:17 +00:00
Korina Cordero
f766965f81 Add checking for invoice change. #265 2019-09-25 03:52:14 +00:00
Korina Cordero
7f973fd10a Merge branch 'master' of gitlab.com:jankstudio/resq into origin/265-cmb-project 2019-09-25 02:34:59 +00:00
Korina Cordero
b129609d53 Refactor submission of updated job order. #265 2019-09-25 02:20:16 +00:00
Korina Cordero
ca97897a2a Move the saving of new job order to a job order generator service. #265 2019-09-24 06:58:55 +00:00
Korina Cordero
cf8c3bb8e1 Move setting of invoice status and createdby inside the invoice generator. #265 2019-09-20 09:53:49 +00:00
Korina Cordero
89ec286a9f Rename processCriteria to generateInvoice. Added constants to invoice generator. #265 2019-09-20 09:30:08 +00:00
Korina Cordero
dc2eecbe0c Rename InvoiceCreator to InvoiceGenerator. #265 2019-09-20 06:38:52 +00:00
Korina Cordero
f1cc1dfae1 Create interface for invoice creator. #265 2019-09-19 07:28:48 +00:00
06a53352fe Merge branch 'origin/265-cmb-project' into 'master'
Origin/265 cmb project

See merge request jankstudio/resq!314
2019-09-17 06:49:45 +00:00
Korina Cordero
74cc496b49 Add plate number to report. #267 2019-09-17 05:29:04 +00:00
Korina Cordero
bee8a0d9fe Fix query to get customers for report. #267 2019-09-17 03:32:37 +00:00
Korina Cordero
4a50729a41 Create command to generate report. #267 2019-09-16 15:28:53 +00:00
Korina Cordero
2a81103773 Add method and form for the report. #267 2019-09-16 10:47:48 +00:00
Korina Cordero
0fadccc16c Add translations for the job order in pdf form. #265 2019-09-13 06:14:18 +00:00
Korina Cordero
f1f6db475c Fix issue where user cannot update policy contents. #263 2019-09-06 07:17:39 +00:00
Korina Cordero
417bd3c0e1 Add getPrivacyPolicy to third party API. #263 2019-09-06 07:10:54 +00:00
Korina Cordero
dbee60bf46 Include invalid plate numbers in warranty. Return a csv file with the invalid entries that cannot be inserted into the database. #258 2019-08-29 10:48:08 +00:00
Korina Cordero
33e0e6b41b Add route and access for warranty upload. Add method to WarrantyController to handle the upload. Add template for warranty upload. #258 2019-08-29 07:26:11 +00:00
Korina Cordero
da4f694c03 Add setPrivacyPolicy to WarrantyController for third party API. Add route to third party api yaml. Add comment to APIController and WarrantyController indicating whether third party API or mobile API. Modify checking for required parameters, instead of using empty() to use isset()). #256 2019-08-28 03:10:19 +00:00
Korina Cordero
96bd2684b1 Revert "Merge branch '256-privacy-policy-for-warranty' into 'master'"
This reverts merge request !302
2019-08-28 01:56:01 +00:00
Korina Cordero
ff1e634cdc Remove error_log line from setPrivacyPolicy method. #256 2019-08-27 08:05:34 +00:00
Korina Cordero
9efc347a7f Add setPrivacyPolicy method to APIController. Add route and acl for setting of privacy policy for warranty. Allow null to be set for setPrivacyPolicy in Warranty entity. Modify the checking for missing parameters, from empty to isset. #256 2019-08-27 07:49:10 +00:00
Korina Cordero
26e805b5a1 Merge branch 'master' of gitlab.com:jankstudio/resq into 251-edit-warranty-via-api 2019-08-27 04:39:30 +00:00
Korina Cordero
004eb49e9d Merge branch '253-remove-owner-name-from-customer-battery-search' into 'master'
Resolve "Remove owner name from Customer Battery Search"

Closes #253

See merge request jankstudio/resq!298
2019-08-27 04:22:56 +00:00
Korina Cordero
f20fd4b44b Merge branch '250-invalidate-warranty-via-api' into 'master'
Resolve "Invalidate warranty via api"

Closes #250

See merge request jankstudio/resq!295
2019-08-27 04:22:20 +00:00
Korina Cordero
1425d82e99 Remove TODO line. Add parameter type for the entitymanager. #255 2019-08-22 10:58:59 +00:00
Korina Cordero
ce83ed689b Redo the processing of the popapp csv file. #255 2019-08-22 10:48:32 +00:00
Korina Cordero
b4c8b83742 Modify query for customer vehicle to get only one customer vehicle. #255 2019-08-22 06:47:33 +00:00
Korina Cordero
33db797ca6 Get the oldest mobile session of customer. #252 2019-08-19 05:17:06 +00:00
Korina Cordero
832e88b61c Add customer contact numbers from Customer and Mobile Session to the report. Add date when customer registered for the mobile application. #252 2019-08-19 04:51:42 +00:00
Korina Cordero
24961b836f Remove owner's name from the Customer Battery Status Search. #253 2019-08-16 08:21:22 +00:00
Korina Cordero
f0841a0b73 Add the existing data from csv file to the report. #252 2019-08-16 06:45:15 +00:00
Korina Cordero
cf89311e17 Add delete method to WarrantyController. #250 2019-08-16 03:01:25 +00:00
Korina Cordero
af60b0db71 Add update warranty method to WarrantyController for third party. #251 2019-08-16 02:40:45 +00:00
Korina Cordero
2f8eab2236 Add checking for null on date_expire for warranty. #250 2019-08-16 01:53:24 +00:00
Korina Cordero
e634f2ee32 Add method to cancel warranty in WarrantyController. Add route and acl for cancel warranty. Add test command to test cancel warranty. #250 2019-08-15 08:25:34 +00:00
Korina Cordero
a36e9f810b Comment out the displaying of report details. #249 2019-08-15 06:15:53 +00:00
Korina Cordero
498b61be48 Add export to CSV button. Add method to controller that uploads a csv file and outputs a csv report of the results. #249 2019-08-15 05:52:29 +00:00
Korina Cordero
c11393b69e Add Activation Status column to report. #248 2019-08-09 08:01:23 +00:00
Korina Cordero
99f0a9cf44 Display customer and warranty information for serials from the uploaded CSV file. #248 2019-08-09 07:42:18 +00:00
Korina Cordero
a5e6a632f4 Add upload of csv file to ReportController. Add templates for upload. #248 2019-08-08 08:33:20 +00:00
a703cbf2bf Revert "Merge branch '247-warranty-data-fixes-for-android' into 'master'"
This reverts merge request !291
2019-08-07 17:20:48 +00:00
e3bca2c07d Add null checks and set to '' for json data #247 2019-08-07 22:37:08 +08:00
Korina Cordero
e0bcfefead Fix if statement for the phone number. #246 2019-08-07 08:24:09 +00:00
3df29fc842 Add special number for app store testing #246 2019-08-07 16:06:10 +08:00
Korina Cordero
bccbeda83a Remove the time element from date purchase, date expiry, and date claim. #245 2019-08-07 05:55:52 +00:00
Korina Cordero
871609fe5d Change display of mobile session id to mobile phone number when listing reviews and when viewing review details. #244 2019-08-07 05:41:40 +00:00
a0c8f01c4b Revert "Merge branch '243-limit-nearest-partner-api-call-to-5' into 'master'"
This reverts merge request !286
2019-08-05 15:28:53 +00:00
2e95ac301e Hardcode limit of 5 to getting nearest partners API call #243 2019-08-05 17:41:20 +08:00
Korina Cordero
cb6899bfe8 Fix for undefined variable bug. Declare average_rating outside if statement. #241 2019-08-02 02:30:55 +00:00
Korina Cordero
580f79b6ef Fix the query for mobile policy in updateInfo. #239 2019-07-31 07:17:45 +00:00
Korina Cordero
6655869c4f Activate all warranties found for a plate number. #238 2019-07-31 02:19:46 +00:00
Korina Cordero
74740f6228 Merge branch '236-add-warranty-to-admin-panel' into 'master'
Resolve "Add warranty to admin panel"

Closes #236

See merge request jankstudio/resq!277
2019-07-30 06:35:58 +00:00
Korina Cordero
9c2fd4ed3a Add default value for purchase date. Default for date expiry and date claim is empty. #236 2019-07-30 06:33:40 +00:00
Korina Cordero
ad27ec3cf2 Add update warranty. #236 2019-07-30 06:20:16 +00:00
Korina Cordero
31dd5c4cf2 Add checking for otp mode for sending of confirmation code. #237 2019-07-30 03:55:50 +00:00
Korina Cordero
978735adbd Fix error for add warranty. #236 2019-07-30 03:39:32 +00:00
Korina Cordero
2e022c893c Add form for warranty submission. #236 2019-07-29 08:32:48 +00:00
Korina Cordero
08247f30f6 Merge branch 'master' of gitlab.com:jankstudio/resq into 236-add-warranty-to-admin-panel 2019-07-29 05:37:50 +00:00
Korina Cordero
a18654b0d1 Add OTP_MODE variable to .env.dist. Modify checking for the confirmCode to set, depending on the value of OTP_MODE. #237 2019-07-29 05:33:12 +00:00
Korina Cordero
2deea2ea8e Add form to add/update warranty. #236 2019-07-29 04:38:00 +00:00
Korina Cordero
2d1a91842a Rename the old Warranty controller to WarrantySearchController. Rename the old warranty.yaml to warranty_search.yaml. Add create, update, and view warranty to menu and acl yamls. Add WarrantyController and template file for Warranty. #236 2019-07-26 08:21:00 +00:00
Korina Cordero
3c460b86c9 Use the env vars for the policy in the command. Improve the queries for privacy policy. #235 2019-07-25 03:19:20 +00:00
Korina Cordero
06adce710f Add policy ids to the .env.dist file. Modify the query to get policy in the APIController. #233 2019-07-25 00:42:40 +00:00
Korina Cordero
b657ae95d5 Add setting of privacy policy for customer when user updates info for mobile session and when user sends privacy settings for third party and promo. #233 2019-07-24 08:45:52 +00:00
Korina Cordero
50a3afb213 Add privacy policy in menu and acl yaml files. Add routes for private policy functions. Add PrivatePolicyController. Add twig files for private policy. #233 2019-07-23 09:57:14 +00:00
Korina Cordero
fef70c36a4 Add average_rating for partner. #228 2019-07-22 04:12:20 +00:00
b87242e356 Fix findWarranty bug in API controller #232 2019-07-21 09:50:57 +08:00
da32614181 Add partner review api call #231 2019-07-20 15:15:47 +08:00
899f9df721 Remove mobile_session from review information in mobile api #231 2019-07-20 12:51:52 +08:00
7a8ff5bf42 Add longitude and latitude to partner information in mobile API calls #231 2019-07-20 12:45:28 +08:00
f1f1d9253b Remove partner list from get services mobile api call #231 2019-07-20 10:29:52 +08:00
Korina Cordero
f43c20482e Restructure the response to get vehicle for API. #230 2019-07-18 05:59:33 +00:00
Korina Cordero
6cde81f0ab Fix conflicts with API Controller #227 2019-07-16 00:20:22 +00:00
Korina Cordero
189bb58880 Fix merge conflicts with master. #227 2019-07-15 23:51:49 +00:00
Korina Cordero
e8b76e8810 Add getClosestPartners method to the APIController that takes in a longitude, latitude, results limit, and service id to find the closes partners. #228 2019-07-08 06:57:24 +00:00
Korina Cordero
5c70cad362 Add API call to get details and reviews for a given partner. #228 2019-07-07 09:28:18 +00:00
Korina Cordero
4782bd7fe8 Add API call to list other services. #228 2019-07-07 08:29:22 +00:00
Korina Cordero
19325761db Add list, view, and delete for review. Fix typographical errors in Partner forms. #228 2019-07-05 12:03:34 +00:00
Korina Cordero
d1209d2474 Add CRUD functionalities to Partners. #228 2019-07-05 07:26:16 +00:00
Korina Cordero
56f152fa70 Add CRUD functionalities to Other Services. #228 2019-07-05 03:29:41 +00:00
Korina Cordero
79b0d3082d Fix typo when calling getBatterySize(). #227 2019-07-03 02:56:35 +00:00
Korina Cordero
13b955d0b6 Add route to activate warranty. Move the code to search for warranty to a separate function. Fix bug in Warranty entity when setting flag_activated. #227 2019-07-02 09:15:06 +00:00
Korina Cordero
48b509ad43 Return warranty information with customer vehicle information for job order history. #227 2019-07-02 07:42:22 +00:00
Korina Cordero
1573ec0aa4 Return warranty information with customer vehicle information. #227 2019-07-02 07:17:38 +00:00
Korina Cordero
60cab330b3 Add flag_activated field for warranties in resq API responses. #227 2019-07-01 08:26:58 +00:00
e4062b94f3 Remove geofence functionality #226 2019-06-27 15:13:29 +08:00
Korina Cordero
0daa4d6bc0 Fix the query to handle more search scenarios. #223 2019-06-18 10:28:19 +00:00
Korina Cordero
63e751528d Fix query for warranty. Display result of query. #223 2019-06-14 10:23:25 +00:00
Korina Cordero
749c3a75c8 Add customer battery search to menu and acl. Add WarrantyController. Add twig file for customer battery search. #223 2019-06-14 08:29:52 +00:00
b6f7d70e13 Add annotations to APIRole and Role controllers #222 2019-06-08 14:52:01 +08:00
Korina Cordero
4ccdb8c5aa Add menu annotations to controllers for ticket, user, vehicle, and vehicle manufacturer. Remove BaseController from APIUserController. #222 2019-06-07 09:49:28 +00:00
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