aboutsummaryrefslogtreecommitdiffstats
path: root/servo
diff options
context:
space:
mode:
Diffstat (limited to 'servo')
-rwxr-xr-xservo/templates/orders/print_confirmation.html65
1 files changed, 47 insertions, 18 deletions
diff --git a/servo/templates/orders/print_confirmation.html b/servo/templates/orders/print_confirmation.html
index 7584ec9..b82cc70 100755
--- a/servo/templates/orders/print_confirmation.html
+++ b/servo/templates/orders/print_confirmation.html
@@ -21,20 +21,22 @@
<div class="span4">
{% block location_info %}
{% endblock location_info %}
- {% trans "Email Address" %}: {{ location.email }}<br/>
+ {% trans "Email" %}: {{ location.email }}<br/>
{% trans "Phone" %}: {{ location.phone }}<br/><br/>
- {% trans "Repair Number" %}: {{ order.code }}<br/>
- <img src="{% url 'barcodes-view' order.code %}" alt="{{ order.code }}"/>
</div>
</div>
{% endwith %}
+<div class="row">
+ <div class="span12 text-center"><h3>{% block title %}{% trans "Work Authorization" %}{% endblock title %}</h3></div>
+</div>
<div class="row" style="margin-top:2em;margin-bottom:1em">
<div class="span6">
- {% trans "Date" %}: {% now "SHORT_DATE_FORMAT" %}
+ {% trans "Date" %}: {{ order.created_at|date:"SHORT_DATE_FORMAT" }}
+ </div>
+ <div class="span6">
+ <img src="{% url 'barcodes-view' order.code %}" alt="{{ order.code }}"/><br/>
+ {% trans "Repair ID" %}: {{ order.code }}
</div>
-</div>
-<div class="row">
- <div class="span12 text-center"><h3>{% block title %}{% trans "Work Confirmation" %} {{ order.code }}{% endblock title %}</h3></div>
</div>
<div class="row">
<div class="span12">
@@ -48,16 +50,16 @@
<tbody>
<tr>
<td>
- {% block customer_details %}
+ {% block customer_details %}
<strong>{{ order.customer.fullname }}</strong><br/>
- {% trans "Daytime Phone" %}: {{ order.customer.phone|default:"-" }}<br/>
- {% trans "Email Address" %}: {{ order.customer.email|default:"-" }}
+ {% trans "Phone" %}: {{ order.customer.phone|default:"-" }}<br/>
+ {% trans "Email" %}: {{ order.customer.email|default:"-" }}
{% if order.customer.street_address %}
<br/>
{% trans "Address" %}: {{ order.customer.street_address }}<br/>
{{ order.customer.zip_code }} {{ order.customer.city }}
{% endif %}
- {% endblock customer_details %}
+ {% endblock customer_details %}
</td>
<td>
{% for device in order.get_devices %}
@@ -86,10 +88,32 @@
<div class="span12">
{% block work_description %}
{% if order.reported_notes.count > 0 %}
- <h4>{% trans "Work Description" %}</h4>
- {% for n in order.reported_notes %}
- {{ n.body|markdown }}
- {% endfor %}
+ <h4>{% trans "Problem Description" %}</h4>
+ <hr/>
+ <p>
+ {%trans "Customer Reported Issue" %}:
+ {% for n in data.issues %}
+ {{ n.body }}
+ {% endfor %}
+ </p>
+ <p>
+ {%trans "Technician Verified Issue" %}:
+ {% for n in data.verified_issues %}
+ {{ n.body }}
+ {% endfor %}
+ </p>
+ <p>
+ {%trans "Customer Notes" %}:
+ {% for n in data.customer_notes %}
+ {{ n.body }}
+ {% endfor %}
+ </p>
+ <p>
+ {%trans "Technician Notes" %}:
+ {% for n in order.reported_notes %}
+ {{ n.body }}
+ {% endfor %}
+ </p>
{% endif %}
{% endblock work_description %}
</div>
@@ -98,7 +122,7 @@
<div class="span12">
{% block parts_and_services %}
{% if order.has_products %}
- <h4>{% trans "Products and Services" %}</h4>
+ <h4>{% trans "Parts and Services" %}</h4>
<table class="table">
<thead>
<tr>
@@ -148,7 +172,7 @@
<div class="row">
<div class="span12">
{% block customer_pickup %}
- <h4>{% trans "Customer Pickup" %}</h4>
+ <h4>{% trans "Customer Drop-off" %}</h4>
<table class="table">
<tbody>
<tr>
@@ -171,7 +195,7 @@
<tr>
<td style="width:40%">{{ order.created_by.get_full_name }}</td>
<td style="width:40%">&nbsp;</td>
- <td style="width:20%">{{ order.created_at|date:"SHORT_DATE_FORMAT" }}</td>
+ <td style="width:20%">{% now "SHORT_DATE_FORMAT" %}</td>
</tr>
<tr>
<td>{% trans "Name" %}</td>
@@ -185,6 +209,11 @@
</div>
<div class="row">
<div class="span12">
+ <h4>{% trans "Additional Notes" %}</h4>
+ </div>
+</div>
+<div class="row">
+ <div class="span12">
<hr/>
{% block tos %}{{ conf.terms_of_service|markdown }}{% endblock tos %}
{% block footer %}{% endblock footer %}