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

1236 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Kendrick Chan
71350c2e20 Merge branch '273-popapp-comparison-report-private-or-commercial' into 'master' 
Add warranty class to popapp comparison report #273

Closes #273

See merge request jankstudio/resq!319
 2019-11-15 01:17:20 +00:00
Kendrick Chan
a55d093dce Add warranty class to popapp comparison report #273 2019-11-15 09:16:30 +08:00
Kendrick Chan
2c606b7a13 Merge branch '271-fix-geofence-issue' into 'master' 
Resolve "Fix geofence issue"

Closes #271

See merge request jankstudio/resq!318
 2019-10-23 06:05:11 +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
Kendrick Chan
d205ee0346 Merge branch '268-error-when-creating-new-customer-with-a-customer-vehicle' into 'master' 
Resolve "Error when creating new customer with a customer vehicle"

Closes #268

See merge request jankstudio/resq!315
 2019-09-18 04:17:35 +00:00
Korina Cordero
a8cf329f09 Fix for error when adding a customer with vehicle. #268 2019-09-18 04:12:17 +00:00
Kendrick Chan
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
Kendrick Chan
5b820397cd Merge branch '267-report-of-crm-customers-with-resq-app' into 'master' 
Add plate number to report. #267

Closes #267

See merge request jankstudio/resq!312
 2019-09-17 05:30:12 +00:00
Korina Cordero
74cc496b49 Add plate number to report. #267 2019-09-17 05:29:04 +00:00
Kendrick Chan
5b8bcd852f Merge branch '267-report-of-crm-customers-with-resq-app' into 'master' 
Resolve "Report of crm customers with resq app"

Closes #267

See merge request jankstudio/resq!311
 2019-09-17 04:04:02 +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
d2cb66d358 Add translation file for resq. #265 2019-09-16 07:13:24 +00:00
Korina Cordero
df369a1919 Add translations for new battery size. #265 2019-09-13 06:31:25 +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
da0fde37ef Add translations for text with the battery brand. #265 2019-09-13 05:53:42 +00:00
Korina Cordero
de95af5054 Add translations for the title for the login page and app. #265 2019-09-13 03:56:40 +00:00
Korina Cordero
1b6ac066eb Add translations for icons, logo, and footer. #265 2019-09-13 03:22:25 +00:00
Korina Cordero
fc1989c3d0 Change the logo to the login page. #265 2019-09-12 08:44:25 +00:00
Korina Cordero
c3feef4644 Add translation package to project. #265 2019-09-11 06:49:01 +00:00
Kendrick Chan
d8aa28d751 Merge branch '263-capi-command-to-return-privacy-policy-contents' into 'master' 
Resolve "CAPI command to return privacy policy contents"

Closes #263

See merge request jankstudio/resq!310
 2019-09-06 07:24:38 +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
Kendrick Chan
47e098be1c Merge branch '262-fix-privacy-policy-bug' into 'master' 
Increase rows for policy content to 50. #262

Closes #262

See merge request jankstudio/resq!309
 2019-09-06 00:53:25 +00:00
Korina Cordero
18376f5a58 Increase rows for policy content to 50. #262 2019-09-05 09:42:51 +00:00
Kendrick Chan
b1ab6e5df2 Merge branch '260-privacy-policy-ui' into 'master' 
Resolve "Privacy policy UI"

Closes #260

See merge request jankstudio/resq!307
 2019-08-30 03:56:22 +00:00
Korina Cordero
237dd7aa93 Added Assert\Not Blank() for the name of policy. #260 2019-08-30 03:12:58 +00:00
Korina Cordero
a71b1a36fd Merge branch '261-no-access-when-setting-privacy-policy' into 'master' 
Resolve "No access when setting privacy policy"

Closes #261

See merge request jankstudio/resq!306
 2019-08-30 02:13:34 +00:00
Korina Cordero
e0294062ca Add access rights for setting privacy policy. Add privacy policy field to Warranty, along with setter and getter. #261 2019-08-30 02:12:01 +00:00
Kendrick Chan
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
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
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
Kendrick Chan
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
Kendrick Chan
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