Skip to content

E
ecommerce
Commit 926be273 by Clinton Blackburn
Options

Displaying average paid order cost on dashboard 

Given that most of our orders are free orders, the current "average order cost" value is mostly useless. This commit adds an additional row to the table—average paid order cost—that will be more useful.

XCOM-558
parent eaad4a0c
Showing with 222 additions and 0 deletions
ecommerce/extensions/dashboard/app.py
......@@ -4,6 +4,7 @@ from oscar.core.loading import get_class
class DashboardApplication(app.DashboardApplication):
index_view = get_class('dashboard.views', 'ExtendedIndexView')
refunds_app = get_class('dashboard.refunds.app', 'application')
def get_urls(self):
......
ecommerce/extensions/dashboard/tests.py
from django.core.urlresolvers import reverse
from django.test import TestCase
from oscar.test.factories import OrderFactory, UserFactory
class DashboardViewTestMixin(object):
def assert_message_equals(self, response, msg, level): # pylint: disable=unused-argument
""" Verify the latest message matches the expected value. """
......@@ -8,3 +13,19 @@ class DashboardViewTestMixin(object):
message = messages[0]
self.assertEqual(message.level, level)
self.assertEqual(message.message, msg)
class ExtendedIndexViewTests(TestCase):
def test_average_paid_order_costs(self):
""" Verify the stats contain average_paid_order_costs. """
password = 'password'
user = UserFactory(is_staff=True, password=password)
self.client.login(username=user.username, password=password)
response = self.client.get(reverse('dashboard:index'))
actual = response.context['average_paid_order_costs']
self.assertEqual(actual, 0)
order = OrderFactory()
actual = response.context['average_paid_order_costs']
self.assertEqual(actual, order.total_incl_tax)
ecommerce/extensions/dashboard/views.py 0 → 100644
from oscar.apps.dashboard.views import * # pylint: disable=wildcard-import, unused-wildcard-import
class ExtendedIndexView(IndexView):
def get_stats(self):
stats = super(ExtendedIndexView, self).get_stats()
datetime_24hrs_ago = now() - timedelta(hours=24)
orders = Order.objects.filter()
paid_orders_last_day = orders.filter(date_placed__gt=datetime_24hrs_ago, total_incl_tax__gt=0)
stats['average_paid_order_costs'] = paid_orders_last_day.aggregate(
Avg('total_incl_tax')
)['total_incl_tax__avg'] or D('0.00')
return stats
ecommerce/templates/oscar/dashboard/index.html 0 → 100644
{% extends 'dashboard/layout.html' %}
{% load currency_filters %}
{% load i18n %}
{% block body_class %}{{ block.super }} orders home{% endblock %}
{% block extrahead %}
{{ block.super }}
<meta http-equiv="refresh" content="300">
{% endblock %}
{% block breadcrumbs %}
{% endblock %}
{% block headertext %}
{% trans "Dashboard" %}
{% endblock %}
{% block dashboard_content %}
<div class="table-header">
<i class="icon-signal icon-large"></i>{% trans "Your Store Statistics" %}
</div>
<div class="content-block">
<div class="row">
<aside class="col-md-3 order-graph-details">
<label><span><i class="icon-shopping-cart"></i>{{ total_orders_last_day }}</span>{% trans "Total Orders" %}</label>
<label><span><i class="icon-hand-right"></i>{{ total_customers_last_day }}</span>{% trans "New Customers" %}</label>
<label><span><i class="icon-group"></i>{{ total_customers }}</span>{% trans "Total Customers" %}</label>
<label><span><i class="icon-briefcase"></i>{{ total_products }}</span>{% trans "Total Products" %}</label>
</aside>
<div class="col-md-9">
<div id="order_graph">
<div class="bar-caption"><h1>{% trans "Latest Orders (last 24 hours)" %}</h1></div>
<div class="bar-y-axis">
<ul>
{% for y_value in hourly_report_dict.y_range %}
<li><span>{{ y_value|currency }}</span></li>
{% endfor %}
</ul>
</div>
<dl class="bar-chart">
{% for item in hourly_report_dict.order_total_hourly %}
<dd class="bar-layer">
<em>{{ item.end_time|time }}</em>
<span style="height: {{ item.percentage }}%;" >
<p{% if item.percentage == 0 %} style="display: none;"{% endif %}>{{ item.total_incl_tax|currency }}</p>
</span>
</dd>
{% endfor %}
</dl>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<table class="table table-striped table-bordered table-hover">
<caption><i class="icon-shopping-cart icon-large"></i>{% trans "Orders - Last 24 Hours" %}</caption>
</tr>
<tr>
<th class="col-md-10">{% trans "Total orders" %}</th>
<td class="col-md-2" >{{ total_orders_last_day }}</td>
</tr>
<tr>
<th class="col-md-10">{% trans "Total lines" %}</th>
<td class="col-md-2" >{{ total_lines_last_day }}</td>
</tr>
<tr>
<th class="col-md-10">{% trans "Total revenue" %}</th>
<td class="col-md-2" >{{ total_revenue_last_day|currency }}</td>
</tr>
<tr>
<th class="col-md-10">{% trans "Average order costs" %}</th>
<td class="col-md-2" >{{ average_order_costs|currency }}</td>
</tr>
<tr>
<th class="col-md-10">{% trans "Average (paid) order costs" %}</th>
<td class="col-md-2" >{{ average_paid_order_costs|currency }}</td>
</tr>
</table>
</div>
<div class="col-md-4">
<table class="table table-striped table-bordered table-hover">
<caption>
<a href="{% url 'dashboard:order-list' %}" class="btn btn-default pull-right">
<i class="icon-shopping-cart"></i> {% trans "Manage" %}
</a>
<i class="icon-shopping-cart icon-large"></i>{% trans "Orders - All Time" %}
</caption>
<tr>
<th class="col-md-10">{% trans "Total orders" %}</th>
<td class="col-md-2" >{{ total_orders }}</td>
</tr>
<tr>
<th class="col-md-10">{% trans "Total lines" %}</th>
<td class="col-md-2" >{{ total_lines }}</td>
</tr>
<tr>
<th class="col-md-10">{% trans "Total revenue" %}</th>
<td class="col-md-2" >{{ total_revenue|currency }}</td>
</tr>
<tr>
<th class="col-md-10">{% trans "Total <em>open</em> baskets" %}</th>
<td class="col-md-2" >{{ total_open_baskets }}</td>
</tr>
</table>
</div>
<div class="col-md-4">
<table class="table table-striped table-bordered table-hover">
<caption><i class="icon-group icon-large"></i>{% trans "Customers" %}</caption>
<tr>
<th class="col-md-10">{% trans "Total customers" %}</th>
<td class="col-md-2" >{{ total_customers }}</td>
</tr>
<tr>
<th class="col-md-10">{% trans "New customers" %}</th>
<td class="col-md-2" >{{ total_customers_last_day }}</td>
</tr>
<tr>
<th class="col-md-10">{% trans "Total <em>open</em> baskets" %}</th>
<td class="col-md-2" >{{ total_open_baskets_last_day }}</td>
</tr>
</table>
</div>
</div>
<div class="row">
<div class="col-md-6">
<table class="table table-striped table-bordered table-hover">
<caption>
<div class="btn-toolbar pull-right">
<div class="btn-group">
<a href="{% url 'dashboard:catalogue-product-list' %}" class="btn btn-default">
<i class="icon-sitemap"></i> {% trans "Manage" %}
</a>
</div>
<div class="btn-group">
<a href="{% url 'dashboard:stock-alert-list' %}" class="btn btn-default">
<i class="icon-sitemap"></i> {% trans "View Stock Alerts" %}
</a>
</div>
</div>
<i class="icon-sitemap icon-large"></i>{% trans "Catalogue and stock" %}
</caption>
<tr>
<th class="col-md-10">{% trans "Total products" %}</th>
<td class="col-md-2" >{{ total_products }}</td>
</tr>
<tr>
<th class="col-md-10">{% trans "<em>Open</em> stock alerts" %}</th>
<td class="col-md-2" >{{ total_open_stock_alerts }}</td>
</tr>
<tr>
<th class="col-md-10">{% trans "<em>Closed</em> stock alerts" %}</th>
<td class="col-md-2" >{{ total_closed_stock_alerts }}</td>
</tr>
</table>
</div>
<div class="col-md-6">
<table class="table table-striped table-bordered table-hover">
<caption><i class="icon-gift icon-large"></i>{% trans "Offers, vouchers and promotions" %}</caption>
<tr>
<th class="col-md-10">{% trans "Active <em>Site</em> Offers" %}</th>
<td class="col-md-2" >{{ total_site_offers }}</td>
</tr>
<tr>
<th class="col-md-10">{% trans "Active <em>Vouchers</em>" %}</th>
<td class="col-md-2" >{{ total_vouchers }}</td>
</tr>
<th class="col-md-10">{% trans "Promotions" %}</th>
<td class="col-md-2" >{{ total_promotions }}</td>
</tr>
</table>
</div>
</div>
{% endblock %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment