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

Fix issues found during merging and testing. #570

Browse source
This commit is contained in:
Korina Cordero 2021-05-27 07:14:18 +00:00
parent 5b5e3f1e4f
commit 64f3248b59
3 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -548,6 +548,7 @@ class ResqCustomerHandler implements CustomerHandlerInterface
'flag_promo_email' => $customer->isPromoEmail(), 'flag_promo_email' => $customer->isPromoEmail(),
'flag_research_sms' => $customer->isResearchSms(), 'flag_research_sms' => $customer->isResearchSms(),
'flag_research_email' => $customer->isResearchEmail(), 'flag_research_email' => $customer->isResearchEmail(),
'customer_tags' => $customer->getCustomerTags(),
], ],
'vehicle' => [ 'vehicle' => [
'id' => $vehicle->getID(), 'id' => $vehicle->getID(),

5
src/Service/InvoiceGenerator/ResqInvoiceGenerator.php
View file

@ -416,12 +416,9 @@ class ResqInvoiceGenerator implements InvoiceGeneratorInterface
protected function processDiscount(&$total, InvoiceCriteria $criteria, Invoice $invoice, $cust_tag_info) protected function processDiscount(&$total, InvoiceCriteria $criteria, Invoice $invoice, $cust_tag_info)
{ {
$promos = $criteria->getPromos();
if (count($promos) < 1)
return;
if (empty($cust_tag_info)) if (empty($cust_tag_info))
{ {
error_log('empty cust tag'); //error_log('empty cust tag');
$promos = $criteria->getPromos(); $promos = $criteria->getPromos();
if (count($promos) < 1) if (count($promos) < 1)
return; return;

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

@ -101,20 +101,7 @@
<span></span> <span></span>
</label> </label>
</span> </span>
<div class="form-control-feedback hide" data-field="flag_active"></div> <div class="form-control-feedback hide" data-field="flag_csat"></div>
</div>
<div class="col-lg-4">
<div class="col-lg-12 form-group-inner">
<div class="m-checkbox-list">
{% for customer_tag in customer_tags %}
<label class="m-checkbox">
<input type="checkbox" name="customer_tags[]" value="{{ customer_tag.getID() }}"{{ customer_tag.getID() in obj.getCustomerTags() ? ' checked' : '' }}>
{{ customer_tag.getName() }}
<span></span>
</label>
{% endfor %}
</div>
</div>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<div class="col-lg-12 form-group-inner"> <div class="col-lg-12 form-group-inner">
@ -173,6 +160,19 @@
</span> </span>
<div class="form-control-feedback hide" data-field="flag_active"></div> <div class="form-control-feedback hide" data-field="flag_active"></div>
</div> </div>
<div class="col-lg-4">
<div class="col-lg-12 form-group-inner">
<div class="m-checkbox-list">
{% for customer_tag in customer_tags %}
<label class="m-checkbox">
<input type="checkbox" name="customer_tags[]" value="{{ customer_tag.getID() }}"{{ customer_tag.getID() in obj.getCustomerTags() ? ' checked' : '' }}>
{{ customer_tag.getName() }}
<span></span>
</label>
{% endfor %}
</div>
</div>
</div>
</div> </div>
</div> </div>