Commit graph

716 commits

Author SHA1 Message Date
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