From d13bd0adb6e296efc106010f691c28489bb3e2a3 Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Fri, 15 Feb 2019 18:10:13 +0100 Subject: [PATCH 1/3] set version to 1.0.1-dev --- caromserver/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caromserver/settings.py b/caromserver/settings.py index ad3ce5b..8a7b5e6 100644 --- a/caromserver/settings.py +++ b/caromserver/settings.py @@ -163,7 +163,7 @@ EMAIL_PORT = 25 URL_LOCATION_PROCESSOR = 'http://127.0.0.1:8000/billard/process_locationdata' PRODUCT_INFO = 'CAROM-DEV' -PRODUCT_VERSION = 'v 1.0.0' +PRODUCT_VERSION = 'v 1.0.1-dev' INTERNAL_IPS = ['127.0.0.1'] From acc58c0a2bd48eeb789a0d3952929927073c8f7c Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Thu, 28 Feb 2019 13:52:39 +0100 Subject: [PATCH 2/3] #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: From 769b80f81286a111db2b01a8542dc2000c8ea0cf Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Thu, 28 Feb 2019 14:03:54 +0100 Subject: [PATCH 3/3] Set Version to 1.0.1 --- caromserver/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caromserver/settings.py b/caromserver/settings.py index 8a7b5e6..18d993a 100644 --- a/caromserver/settings.py +++ b/caromserver/settings.py @@ -163,7 +163,7 @@ EMAIL_PORT = 25 URL_LOCATION_PROCESSOR = 'http://127.0.0.1:8000/billard/process_locationdata' PRODUCT_INFO = 'CAROM-DEV' -PRODUCT_VERSION = 'v 1.0.1-dev' +PRODUCT_VERSION = 'v 1.0.1' INTERNAL_IPS = ['127.0.0.1']