Add signature and email address to display. Separate the before and after images. #432

This commit is contained in:
Korina Cordero 2020-06-29 09:00:42 +00:00
parent 7aed20019c
commit 9717effb0a
2 changed files with 44 additions and 20 deletions

View file

@ -1492,6 +1492,11 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$params['odometer'] = $odometer;
// get customer email used in JO
$email = $obj->getMeta('customer_email');
$params['email'] = $email;
// get images if any
$jo_extra = $obj->getJOExtra();
$pic_array = [];
@ -1507,6 +1512,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$b_other_images = $jo_extra->getBeforeOtherImages();
$a_other_images = $jo_extra->getAfterOtherImages();
$cust_signature = $jo_extra->getCustomerSignature();
if ($b_speed_img != null)
$pic_array['before_speed_img'] = $b_speed_img;
if ($a_speed_img != null)
@ -1528,6 +1535,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
{
$pic_array['a_other_images'][] = $a_img;
}
$params['signature'] = $cust_signature;
}
$params['jo_pictures'] = $pic_array;

View file

@ -503,12 +503,20 @@
<div class="form-group m-form__group row">
<div class="col-lg-3">
<label data-field="odometer">Odometer Reading</label>
<input type="text" name="odometer" id="odometer" class="form-control m-input other_info_field" value="{{ odometer }}" data-vehicle-field="1" disabled>
<input type="text" name="odometer" id="odometer" class="form-control m-input other_info_field" value="{{ odometer }}" disabled>
</div>
<div class="col-lg-3">
<label data-field="email">Email Address</label>
<input type="text" name="email" id="email" class="form-control m-input other_info_field" value="{{ email }}" disabled>
</div>
<div class="col-lg-3">
<label> Customer Signature </label>
<div class="portrait-box" style="background-image: url('{{ '/uploads/jo_extra/' ~ signature }}');" ></div>
</div>
</div>
<div class="form-group m-form__group row">
<div class="col-lg-12">
<label> Pictures </label>
<label> Pictures Before Service</label>
</div>
{% for key, picture in jo_pictures %}
{% if key == 'before_speed_img' %}
@ -517,36 +525,18 @@
<div class="portrait-box" style="background-image: url('{{ '/uploads/jo_extra/' ~ picture }}');" ></div>
</div>
{% endif %}
{% if key == 'after_speed_img' %}
<div class="col-lg-2">
<label> Speedometer after Service </label>
<div class="portrait-box" style="background-image: url('{{ '/uploads/jo_extra/' ~ picture }}');" ></div>
</div>
{% endif %}
{% if key == 'before_plate_img' %}
<div class="col-lg-2">
<label> Plate Number before Service </label>
<div class="portrait-box" style="background-image: url('{{ '/uploads/jo_extra/' ~ picture }}');" ></div>
</div>
{% endif %}
{% if key == 'after_plate_img' %}
<div class="col-lg-2">
<label> Plate Number after Service </label>
<div class="portrait-box" style="background-image: url('{{ '/uploads/jo_extra/' ~ picture }}');" ></div>
</div>
{% endif %}
{% if key == 'before_batt_img' %}
<div class="col-lg-2">
<label> Battery before Service </label>
<div class="portrait-box" style="background-image: url('{{ '/uploads/jo_extra/' ~ picture }}');" ></div>
</div>
{% endif %}
{% if key == 'after_batt_img' %}
<div class="col-lg-2">
<label> Battery after Service </label>
<div class="portrait-box" style="background-image: url('{{ '/uploads/jo_extra/' ~ picture }}');" ></div>
</div>
{% endif %}
{% endfor %}
</div>
<div class="form-group m-form__group row">
@ -563,6 +553,31 @@
{% endif %}
{% endfor %}
</div>
<div class="form-group m-form__group row">
<div class="col-lg-12">
<label> Pictures After Service</label>
</div>
{% for key, picture in jo_pictures %}
{% if key == 'after_speed_img' %}
<div class="col-lg-2">
<label> Speedometer after Service </label>
<div class="portrait-box" style="background-image: url('{{ '/uploads/jo_extra/' ~ picture }}');" ></div>
</div>
{% endif %}
{% if key == 'after_plate_img' %}
<div class="col-lg-2">
<label> Plate Number after Service </label>
<div class="portrait-box" style="background-image: url('{{ '/uploads/jo_extra/' ~ picture }}');" ></div>
</div>
{% endif %}
{% if key == 'after_batt_img' %}
<div class="col-lg-2">
<label> Battery after Service </label>
<div class="portrait-box" style="background-image: url('{{ '/uploads/jo_extra/' ~ picture }}');" ></div>
</div>
{% endif %}
{% endfor %}
</div>
<div class="form-group m-form__group row">
<div class="col-lg-12">
<label> Other Images after Service</label>