Commit graph

1300 commits

Author SHA1 Message Date
4f95933742 Merge branch '256-privacy-policy-for-warranty' into 'master'
Resolve "Privacy policy for warranty"

Closes #256

See merge request jankstudio/resq!304
2019-08-30 01:53:34 +00:00
Korina Cordero
4bc99df261 Merge branch 'master' into '256-privacy-policy-for-warranty'
# Conflicts:
#   src/Entity/PrivacyPolicy.php
2019-08-28 03:12:37 +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
b7c5bad80b Merge branch '256-privacy-policy-for-warranty' of gitlab.com:jankstudio/resq into 256-privacy-policy-for-warranty 2019-08-28 02:27:21 +00:00
Korina Cordero
918f95e425 Modify the association between Warranty and PrivacyPolicy to ManyToOne. Add getters and setters for warranty in PrivacyPolicy. #256 2019-08-28 02:15:26 +00:00
c204fccc81 Merge branch 'revert-8d19f6e9' into 'master'
Revert "Merge branch '256-privacy-policy-for-warranty' into 'master'"

See merge request jankstudio/resq!303
2019-08-28 02:10:36 +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
8d19f6e9b9 Merge branch '256-privacy-policy-for-warranty' into 'master'
Resolve "Privacy policy for warranty"

Closes #256

See merge request jankstudio/resq!302
2019-08-28 01:38:14 +00:00
Korina Cordero
b8504c3701 Modify the assocation between PrivacyPolicy and Warranty to ManyToOne. #256 2019-08-28 00:32:48 +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
6398c58b32 Add privacy policy field to warranty. Add getter and setter and method to check for privacy policy in Warranty. #256 2019-08-27 06:10:36 +00:00
Korina Cordero
a93801d933 Merge branch '251-edit-warranty-via-api' into 'master'
Resolve "Edit warranty via api"

Closes #251

See merge request jankstudio/resq!296
2019-08-27 04:41:31 +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
1fdc574a9e Remove the Please fill up two fields text from the warranty search template. #253 2019-08-27 04:09:19 +00:00
041a7cf29b Merge branch '255-retrieve-only-one-customer-vehicle' into 'master'
Resolve "Retrieve only one customer vehicle"

Closes #255

See merge request jankstudio/resq!301
2019-08-23 02:44:05 +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
15f2764ae8 Merge branch '252-add-columns-to-popapp-report' into 'master'
Resolve "Add columns to popapp report"

Closes #252

See merge request jankstudio/resq!299
2019-08-19 05:28:51 +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
f114554361 Merge branch '252-add-columns-to-popapp-report' into 'master'
Resolve "Add columns to popapp report"

Closes #252

See merge request jankstudio/resq!297
2019-08-17 01:39:00 +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
4d0c0345fb Merge branch '249-add-export-to-csv-button-for-popapp-report' into 'master'
Resolve "Add export to csv button for popapp report"

Closes #249

See merge request jankstudio/resq!294
2019-08-16 02:27:09 +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
74e1e329a7 Merge branch '248-generate-popapp-report' into 'master'
Resolve "Generate popapp report"

Closes #248

See merge request jankstudio/resq!293
2019-08-09 08:02:02 +00:00
Korina Cordero
c11393b69e Add Activation Status column to report. #248 2019-08-09 08:01:23 +00:00
Korina Cordero
ec17cd4c77 Modify 'Has Mobile?' to 'Has Mobile App?'. #248 2019-08-09 07:46:37 +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
10d9800bda Add static class to check if plate number is valid. #248 2019-08-09 07:40:32 +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
Korina Cordero
c695a1f9b2 Add popapp comparison report link to Reports. Add route and access to report. #248 2019-08-08 04:17:58 +00:00
01a1fe4a9a Merge branch 'revert-4d06e17f' into 'master'
Revert "Merge branch '247-warranty-data-fixes-for-android' into 'master'"

See merge request jankstudio/resq!292
2019-08-07 17:21:02 +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
4d06e17fc7 Merge branch '247-warranty-data-fixes-for-android' into 'master'
Add null checks and set to '' for json data #247

Closes #247

See merge request jankstudio/resq!291
2019-08-07 14:38:02 +00:00
e3bca2c07d Add null checks and set to '' for json data #247 2019-08-07 22:37:08 +08:00
Korina Cordero
c78473ed6e Merge branch '246-fix-otp-generator' into 'master'
Resolve "Fix otp generator"

Closes #246

See merge request jankstudio/resq!290
2019-08-07 08:24:50 +00: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
de0272222d Merge branch '245-remove-time-element-from-purchase-date' into 'master'
Resolve "Remove time element from purchase date"

Closes #245

See merge request jankstudio/resq!289
2019-08-07 05:57:18 +00: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