carom/carom-server
6
1
Fork 0
Code Issues Pull Requests Releases 2 Activity

Merge branch 'release/1.0.1'

Browse Source
This commit is contained in:
Robert Einsle 2019-02-28 14:04:22 +01:00
commit 4dfdc644ea
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
billard/templatetags/display_daily_sale.py
View File

@ -1,4 +1,4 @@
from datetime import datetime, timedelta from datetime import datetime, timedelta, date
from django import template from django import template
from django.db.models import Sum from django.db.models import Sum
@ -10,8 +10,14 @@ register = template.Library()
@register.filter(is_safe=True) @register.filter(is_safe=True)
def display_daily_sale(location): def display_daily_sale(location):
start_date = datetime.now().replace(hour=5, minute=0, second=0, microsecond=0) date = datetime.now().replace(hour=6, minute=0, second=0, microsecond=0)
end_date = start_date + timedelta(days=1) 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, prize__sum = Accounting.objects.filter(desk__client__location=location,
time_to__range=(start_date, end_date)).aggregate(Sum('prize')) time_to__range=(start_date, end_date)).aggregate(Sum('prize'))
if prize__sum['prize__sum'] is None: if prize__sum['prize__sum'] is None:

2
caromserver/settings.py
View File

@ -163,7 +163,7 @@ EMAIL_PORT = 25
URL_LOCATION_PROCESSOR = 'http://127.0.0.1:8000/billard/process_locationdata' URL_LOCATION_PROCESSOR = 'http://127.0.0.1:8000/billard/process_locationdata'
PRODUCT_INFO = 'CAROM-DEV' PRODUCT_INFO = 'CAROM-DEV'
PRODUCT_VERSION = 'v 1.0.0' PRODUCT_VERSION = 'v 1.0.1'
INTERNAL_IPS = ['127.0.0.1'] INTERNAL_IPS = ['127.0.0.1']