From 56cfb9cb180bc91691dc321f9bf58170e8a1dc62 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Fri, 4 Dec 2020 21:01:13 +0100 Subject: [PATCH] =?UTF-8?q?Agenturl=C3=B6schen=20Message=20hinzugef=C3=BCg?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/counter_tag.cpython-38.pyc | Bin 19509 -> 19828 bytes standards/templatetags/counter_tag.py | 28 ++++++++- users/signals.py | 6 -- users/templates/users/base.html | 54 ++++++++++++++++++ users/templates/users/dashboard.html | 3 + 5 files changed, 83 insertions(+), 8 deletions(-) diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index 41c5513f3dde2131fe7634274d77f653af88de12..6272edd6763deec4ac31a426dd0cca38f8ad0f5e 100644 GIT binary patch delta 3181 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 F=}!Yz(nbIP diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py index e9c00e9..a68710b 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -845,12 +845,36 @@ def getHistoryClassOfObject(value): 2 - Keine Rechnung, keinen Plan, Freiraum um mehr als 14 Tage überschritten 3 - Keine Rechnung, keinen Plan, Freiraum um mehr als 30 Tage überschritten - AGENTUR SPERREN! 10 - Plan erstellt! + 20 - KOSTENLOS ''' @register.simple_tag def getAgencyBillStatus(agency): - print(agency) - return True + returnvalue = 0 + regdate = agency.registerdate + + # Agentur normal, prüfen, was bezahlt werden muss + if agency.paymentstatus == 1: + returnvalue = 20 + else: + today = date.today() + # Tage, die zwischen Registrierung und heute liegen + daysbetween = (today - regdate).days + if agency.paymentplan == 0 and daysbetween <= 30: + returnvalue = 0 + elif agency.paymentplan == 0 and daysbetween > 30 and daysbetween < 45: + returnvalue = 1 + elif agency.paymentplan == 0 and daysbetween > 45 and daysbetween <= 60: + returnvalue = 2 + elif agency.paymentplan == 0 and daysbetween > 60: + returnvalue = 3 + elif agency.paymentplan == 1: + returnvalue = 10 + #paymentplan = models.IntegerField(default=0, null=True, blank=True) + + #payment_address = models.EmailField(default=None, blank=True, null=True) + + return returnvalue diff --git a/users/signals.py b/users/signals.py index 4b5b1f2..c293063 100644 --- a/users/signals.py +++ b/users/signals.py @@ -33,12 +33,6 @@ from channels_presence.signals import presence_changed from organizer.models import * from chat.models import ChatMessage -@receiver(signal=request_started) -def requestStart(**kwargs): - pass - # TASK: Hier AuditLog implementieren - - def loadingFreeDays(plz, year): # Getting land file_path = os.path.join(settings.STATIC_ROOT, 'users/extra/plz_short.csv') diff --git a/users/templates/users/base.html b/users/templates/users/base.html index 1d27881..dd2a11b 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -970,3 +970,57 @@ $("#chatButton").click(function(){ + + +{% getAgencyBillStatus request.user.profile.agency as billstatus %} +{% if billstatus == 3 %} + + + +{% endif %} + + + + + + + + + + + + + + + + + + + diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html index e3ce0a6..8afbc75 100644 --- a/users/templates/users/dashboard.html +++ b/users/templates/users/dashboard.html @@ -1,4 +1,5 @@ {% extends "users/base.html" %} +{% load counter_tag %} {% block content %}

Willkommen, {{request.user.first_name}} {{request.user.last_name}}!

@@ -197,4 +198,6 @@ $(document).ready(function(){
+ + {% endblock content %}