rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch '418-resq-comment-out-the-new-dpa-behavior' into 'master'

Browse source 
Resolve "Resq - comment out the new DPA behavior"

Closes #418

See merge request jankstudio/resq!478
This commit is contained in:
Kendrick Chan 2020-05-25 03:35:47 +00:00
commit 5cdd42e000
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Service/CustomerHandler/ResqCustomerHandler.php
View file

@ -172,10 +172,13 @@ class ResqCustomerHandler implements CustomerHandlerInterface
$em = $this->em;
$row = new Customer();
// NOTE: commenting the dpa changes for now
// check if dpa consent is unticked
/*
$is_dpa_checked = $req->request->get('flag_dpa_consent');
if (!$is_dpa_checked)
$error_array['flag_dpa_consent'] = 'DPA consent should be checked.';
*/
// check if email marketing promo is checked
$is_email_promo_checked = $req->request->get('flag_promo_email');
@ -339,10 +342,13 @@ class ResqCustomerHandler implements CustomerHandlerInterface
$nerror_array = [];
$verror_array = [];
// NOTE: commenting out the dpa changes for now
// check if dpa consent is unticked
/*
$is_dpa_checked = $req->request->get('flag_dpa_consent');
if (!$is_dpa_checked)
$error_array['flag_dpa_consent'] = 'DPA consent should be checked.';
*/
// check if email marketing promo is checked
$is_email_promo_checked = $req->request->get('flag_promo_email');

5
templates/customer/form.html.twig
View file

@ -123,11 +123,12 @@
</div>
</div>
<div class="col-lg-4">
{% if is_granted('customer.dpa') %}
<!-- commenting out the dpa access -->
{# {% if is_granted('customer.dpa') %} #}
<input type="checkbox" name="flag_dpa_consent" id="flag-dpa_consent" value="1"{{ obj.isDpaConsent ? ' checked' }} >
<label class="switch-label">With DPA Consent</label>
<div class="form-control-feedback hide" data-field="flag_dpa_consent"></div>
{% endif %}
{# {% endif %} #}
</div>
</div>
<div class="form-group m-form__group row">