Improve order history templates

Smooth out a few creases and ensure displayed messages make sense.

oscar/templates/oscar/customer/order/order_detail.html

@@ -34,7 +34,7 @@
                                 </p>
                                 {% iffeature "reviews" %}
                                     {% if product|is_review_permitted:user %}
-                                        <a class="btn" href="{% url 'catalogue:reviews-add' product_slug=product.slug product_pk=product.id %}">{% trans 'Write a review' %}</a>
+                                        <a class="btn" href="{% url 'catalogue:reviews-add' product_slug=product.slug product_pk=product.id %}#addreview">{% trans 'Write a review' %}</a>
                                     {% endif %}
                                 {% endiffeature %}
                             {% else %}
@@ -152,20 +152,18 @@
 
     <table class="table table-striped table-bordered">
         <tr>
-            <th>{% trans 'Address:' %}</th>
-            <th>{% trans 'Contact Number:' %}</th>
-            <th>{% trans 'Shipping Notes:' %}</th>
+            <th>{% trans 'Address' %}</th>
+            <th>{% trans 'Contact Number' %}</th>
+            <th>{% trans 'Shipping Notes' %}</th>
         </tr>
         <tr>
             <td>
-                <p>
                     {% for field in order.shipping_address.active_address_fields %}
                         {{ field }}<br/>
                     {% endfor %}
-                </p>
             </td>
-            <td><p>{{ order.shipping_address.phone_number }}</p></td>
-            <td><p>{{ order.shipping_address.notes|linebreaks }}</p></td>
+            <td>{{ order.shipping_address.phone_number|default:"-" }}</td>
+            <td>{{ order.shipping_address.notes|linebreaks }}</td>
         </tr>
     </table>
 {% endblock tabcontent %}

oscar/templates/oscar/customer/order/order_list.html

@@ -52,7 +52,11 @@
         </table>
         {% include "partials/pagination.html" %}
     {% else %}
-        <p>{% trans "You haven't placed any orders." %}</p>
+        {% if form.is_bound %}
+            <p>{% trans "No orders match your search." %}</p>
+        {% else %}
+            <p>{% trans "You haven't placed any orders." %}</p>
+        {% endif %}
     {% endif %}
 
 {% endblock tabcontent %}