From acc58c0a2bd48eeb789a0d3952929927073c8f7c Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Thu, 28 Feb 2019 13:52:39 +0100 Subject: [PATCH] #1 Fix calculation daily sum --- billard/templatetags/display_daily_sale.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/billard/templatetags/display_daily_sale.py b/billard/templatetags/display_daily_sale.py index 0cae624..10fe099 100644 --- a/billard/templatetags/display_daily_sale.py +++ b/billard/templatetags/display_daily_sale.py @@ -1,4 +1,4 @@ -from datetime import datetime, timedelta +from datetime import datetime, timedelta, date from django import template from django.db.models import Sum @@ -10,8 +10,14 @@ register = template.Library() @register.filter(is_safe=True) def display_daily_sale(location): - start_date = datetime.now().replace(hour=5, minute=0, second=0, microsecond=0) - end_date = start_date + timedelta(days=1) + date = datetime.now().replace(hour=6, minute=0, second=0, microsecond=0) + now = datetime.now() + if now < date: + start_date = date - timedelta(days=1) + end_date = date + else: + start_date = date + end_date = date + timedelta(days=1) prize__sum = Accounting.objects.filter(desk__client__location=location, time_to__range=(start_date, end_date)).aggregate(Sum('prize')) if prize__sum['prize__sum'] is None: