Cleaned up report templates

oscar/apps/offer/reports.py

@@ -1,4 +1,5 @@
 import csv
+from decimal import Decimal as D
 
 from django.db.models import get_model
 
@@ -7,6 +8,7 @@ ReportGenerator = get_class('dashboard.reports.reports', 'ReportGenerator')
 ReportCSVFormatter = get_class('dashboard.reports.reports', 'ReportCSVFormatter')
 ReportHTMLFormatter = get_class('dashboard.reports.reports', 'ReportHTMLFormatter')
 ConditionalOffer = get_model('offer', 'ConditionalOffer')
+OrderDiscount = get_model('order', 'OrderDiscount')
 
 
 class OfferReportCSVFormatter(ReportCSVFormatter):
@@ -28,9 +30,7 @@ class OfferReportHTMLFormatter(ReportHTMLFormatter):
     filename_template = 'dashboard/reports/partials/offer_report.html'
 
 
-
 class OfferReportGenerator(ReportGenerator):
-
     code = 'conditional-offers'
     description = 'Offer performance'
 
@@ -40,5 +40,21 @@ class OfferReportGenerator(ReportGenerator):
     }
 
     def generate(self):
-        offers = ConditionalOffer._default_manager.all()
-        return self.formatter.generate_response(offers)
+        discounts = OrderDiscount._default_manager.filter(
+            order__date_placed__gte=self.start_date,
+            order__date_placed__lt=self.end_date
+        )
+        offer_discounts = {}
+        for discount in discounts:
+            if discount.offer_id not in offer_discounts:
+                try:
+                    offer = ConditionalOffer._default_manager.get(id=discount.offer_id)
+                except ConditionalOffer.DoesNotExist:
+                    continue
+                offer_discounts[discount.offer_id] = {
+                    'offer': offer,
+                    'total_discount': D('0.00')
+                }
+            offer_discounts[discount.offer_id]['total_discount'] += discount.amount
+
+        return self.formatter.generate_response(offer_discounts.values())

oscar/templates/dashboard/reports/partials/offer_report.html

@@ -2,19 +2,23 @@
 {% load currency_filters %}
 
 {% block report %}
-<table class="table table-striped table-bordered">
-    <tr>
-        <th>Offer</th>
-        <th>Total discount</th>
-    </tr>
-    {% for offer in objects %}
-    <tr>
-        <td>{{ offer }}</td>
-        <td>{{ offer.total_discount }}</td>
-    </tr>
-    {% endfor %}
-</table>
+{% if objects %}
+	<table class="table table-striped table-bordered">
+		<tr>
+			<th>Offer</th>
+			<th>Total discount</th>
+		</tr>
+		{% for offer_discount in objects %}
+		<tr>
+			<td>{{ offer_discount.offer.name }}</td>
+			<td>{{ offer_discount.total_discount|currency }}</td>
+		</tr>
+		{% endfor %}
+	</table>
     {% if page_obj %}
         {% include "catalogue/partials/pagination.html" %}
     {% endif %}
+{% else %}
+	<p>No results found.</p>
+{% endif %}
 {% endblock %}

oscar/templates/dashboard/reports/partials/open_basket_report.html

@@ -4,10 +4,8 @@
 {% block report %}
 <table class="table table-striped table-bordered">
     <tr>
-        <th>User ID</th>
-        <th>Name</th>
         <th>Email</th>
-        <th>Basket status</th>
+        <th>Name</th>
         <th>Num lines</th>
         <th>Num items</th>
         <th>Value</th>
@@ -16,10 +14,8 @@
     </tr>
     {% for basket in objects %}
     <tr>
-        <td>{{ basket.owner_id }}</td>
-        <td>{{ basket.owner.get_full_name }}</td>
         <td>{{ basket.owner.email }}</td>
-        <td>{{ basket.status }}</td>
+        <td>{{ basket.owner.get_full_name|default:"-" }}</td>
         <td>{{ basket.num_lines }}</td>
         <td>{{ basket.num_items }}</td>
         <td>{{ basket.total_incl_tax|currency }}</td>

oscar/templates/dashboard/reports/partials/order_report.html

@@ -2,27 +2,31 @@
 {% load currency_filters %}
 
 {% block report %}
-<table class="table table-striped table-bordered">
-    <tr>
-        <th>Order number</th>
-        <th>User</th>
-        <th>Total incl. tax</th>
-        <th>Date placed</th>
-        <th></th>
-    </tr>
-    {% for order in objects %}
-    <tr>
-        <td>{{ order.number }}</td>
-        <td>{{ order.user }}</td>
-        <td>{{ order.total_incl_tax|currency }}</td>
-        <td>{{ order.date_placed }}</td>
-        <td>
-            <a class="btn btn-info" href="{% url dashboard:order-detail order.number %}">View</a>
-        </td>
-    </tr>
-    {% endfor %}
-</table>
+{% if objects %}
+	<table class="table table-striped table-bordered">
+		<tr>
+			<th>Order number</th>
+			<th>User</th>
+			<th>Total incl. tax</th>
+			<th>Date placed</th>
+			<th></th>
+		</tr>
+		{% for order in objects %}
+		<tr>
+			<td>{{ order.number }}</td>
+			<td>{{ order.user }}</td>
+			<td>{{ order.total_incl_tax|currency }}</td>
+			<td>{{ order.date_placed }}</td>
+			<td>
+				<a class="btn btn-info" href="{% url dashboard:order-detail order.number %}">View</a>
+			</td>
+		</tr>
+		{% endfor %}
+	</table>
     {% if page_obj %}
         {% include "catalogue/partials/pagination.html" %}
     {% endif %}
+{% else %}
+	<p>No results found.</p>
+{% endif %}
 {% endblock %}

oscar/templates/dashboard/reports/partials/submitted_basket_report.html

@@ -4,9 +4,8 @@
 {% block report %}
 <table class="table table-striped table-bordered">
     <tr>
-        <th>User ID</th>
-        <th>User</th>
-        <th>Basket status</th>
+        <th>Email</th>
+        <th>Name</th>
         <th>Num lines</th>
         <th>Num items</th>
         <th>Value</th>
@@ -15,9 +14,8 @@
     </tr>
     {% for basket in objects %}
     <tr>
-        <td>{{ basket.owner_id|default:"-" }}</td>
-        <td>{{ basket.owner }}</td>
-        <td>{{ basket.status }}</td>
+        <td>{{ basket.owner.email }}</td>
+        <td>{{ basket.owner.get_full_name|default:"-" }}</td>
         <td>{{ basket.num_lines }}</td>
         <td>{{ basket.num_items }}</td>
         <td>{{ basket.total_incl_tax|currency }}</td>

oscar/templates/dashboard/reports/partials/voucher_report.html

@@ -14,7 +14,7 @@
         <td>{{ voucher.code }}</td>
         <td>{{ voucher.num_basket_additions }}</td>
         <td>{{ voucher.num_orders }}</td>
-        <td>{{ voucher.total_discount }}</td>
+        <td>{{ voucher.total_discount|currency }}</td>
     </tr>
     {% endfor %}
 </table>