Adjust order detail template to break out tax-exclusive costs

This is useful in the US where taxes are treated separately from other
charges.

oscar/templates/oscar/dashboard/orders/order_detail.html

@@ -1,3 +1,4 @@
+
 {% extends 'dashboard/layout.html' %}
 {% load url from future %}
 {% load i18n %}
@@ -99,7 +100,8 @@
                                     <th>{% trans "Supplier" %}</th>
                                     <th>{% trans "Supplier SKU" %}</th>
                                     <th>{% trans "Est. delivery date" %}</th>
-                                    <th>{% trans "Price (before discounts)" %}</th>
+                                    <th>{% trans "Price excl tax (before discounts)" %}</th>
+                                    <th>{% trans "Price inc tax (before discounts)" %}</th>
                                     <th>{% trans "Actions" %}</th>
                                 </tr>
                             </thead>
@@ -129,6 +131,7 @@
                                         </td>
                                         <td>{{ line.partner_sku }}</td>
                                         <td>{{ line.est_dispatch_date|default:"-" }}</td>
+                                        <td style="text-align: right">{{ line.line_price_before_discounts_excl_tax|currency:order.currency }}</td>
                                         <td style="text-align: right">{{ line.line_price_before_discounts_incl_tax|currency:order.currency }}</td>
                                         <td>
                                             <a href="{% url 'dashboard:order-line-detail' number=order.number line_id=line.id %}" class="btn btn-info">{% trans "View" %}</a>
@@ -139,6 +142,7 @@
                                 <tr>
                                     <td colspan="7"></td>
                                     <th>{% trans "Discount" %}</th>
+                                    <td style="text-align: right">{{ order.total_discount_excl_tax|currency:order.currency }}</td>
                                     <td style="text-align: right">{{ order.total_discount_incl_tax|currency:order.currency }}</td>
                                     <td></td>
                                 </tr>
@@ -147,6 +151,7 @@
                                         <tr>
                                             <td colspan="7"></td>
                                             <th>{% trans "Basket total (excl. discounts)" %}</th>
+                                            <td style="text-align: right">{{ order.basket_total_before_discounts_excl_tax|currency:order.currency }}</td>
                                             <td style="text-align: right">{{ order.basket_total_before_discounts_incl_tax|currency:order.currency }}</td>
                                             <td></td>
                                         </tr>
@@ -157,6 +162,7 @@
                                                     <span class="label label-success">{% trans "Discount" %}</span>
                                                     {{ discount.offer_name }}
                                                 </td>
+                                                <td style="text-align: right"></td>
                                                 <td style="text-align: right">- {{ discount.amount|currency:order.currency }}</td>
                                                 <td></td>
                                             </tr>
@@ -164,6 +170,7 @@
                                         <tr>
                                             <td colspan="7"></td>
                                             <th>{% trans "Basket total (inc. discounts)" %}</th>
+                                            <th style="text-align: right">{{ order.basket_total_excl_tax|currency:order.currency }}</th>
                                             <th style="text-align: right">{{ order.basket_total_incl_tax|currency:order.currency }}</th>
                                             <td></td>
                                         </tr>
@@ -171,6 +178,7 @@
                                         <tr>
                                             <td colspan="7"></td>
                                             <th>{% trans "Basket total" %}</th>
+                                            <th style="text-align: right">{{ order.basket_total_excl_tax|currency:order.currency }}</th>
                                             <th style="text-align: right">{{ order.basket_total_incl_tax|currency:order.currency }}</th>
                                             <td></td>
                                         </tr>
@@ -181,6 +189,7 @@
                                     <tr>
                                         <td colspan="7"></td>
                                         <td>{% trans "Shipping total (excl. discounts)" %}</td>
+                                        <td style="text-align: right">{{ order.shipping_before_discounts_excl_tax|currency:order.currency }}</td>
                                         <td style="text-align: right">{{ order.shipping_before_discounts_incl_tax|currency:order.currency }}</td>
                                         <td></td>
                                     </tr>
@@ -191,6 +200,7 @@
                                                 <span class="label label-success">{% trans "Discount" %}</span>
                                                 {{ discount.offer_name }}
                                             </td>
+                                            <td></td>
                                             <td style="text-align: right">- {{ discount.amount|currency:order.currency }}</td>
                                             <td></td>
                                         </tr>
@@ -198,6 +208,7 @@
                                     <tr>
                                         <td colspan="7"></td>
                                         <th>{% trans "Shipping total (inc. discounts)" %}</th>
+                                        <th style="text-align: right">{{ order.shipping_excl_tax|currency:order.currency }}</th>
                                         <th style="text-align: right">{{ order.shipping_incl_tax|currency:order.currency }}</th>
                                         <td></td>
                                     </tr>
@@ -205,6 +216,7 @@
                                     <tr>
                                         <td colspan="7"></td>
                                         <th>{% trans "Shipping total" %}</th>
+                                        <th style="text-align: right">{{ order.shipping_excl_tax|currency:order.currency }}</th>
                                         <th style="text-align: right">{{ order.shipping_incl_tax|currency:order.currency }}</th>
                                         <td></td>
                                     </tr>
@@ -213,6 +225,7 @@
                                 <tr>
                                     <td colspan="7"></td>
                                     <th>{% trans "Order total" %}</th>
+                                    <th style="text-align: right">{{ order.total_excl_tax|currency:order.currency }}</th>
                                     <th style="text-align: right">{{ order.total_incl_tax|currency:order.currency }}</th>
                                     <td></td>
                                 </tr>