From a33db3ba6c37f264eed35dd3d24394a53d7150ec Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Sun, 6 Dec 2020 10:28:36 +0100 Subject: [PATCH] =?UTF-8?q?Hinweise=20f=C3=BCr=20Testzeitraum=20und=20Rech?= =?UTF-8?q?nungscheck?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/counter_tag.cpython-38.pyc | Bin 19828 -> 20023 bytes standards/templatetags/counter_tag.py | 21 ++++- users/templates/users/base.html | 87 ++++++++++++++++++ 3 files changed, 104 insertions(+), 4 deletions(-) diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index 6272edd6763deec4ac31a426dd0cca38f8ad0f5e..1854a62b3951cbfa0474623bb1e6b234de46f366 100644 GIT binary patch delta 7916 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 C%rLP4 delta 7741 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 diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py index a68710b..18db81d 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -1,6 +1,6 @@ from django import template from django.contrib.auth.models import Group, User -from users.models import AgencyGroup, Agency, AgencyNetwork, AgencyNetworkPreperation, UserTime, UserYearAbsenceInfo +from users.models import AgencyGroup, Agency, AgencyNetwork, AgencyNetworkPreperation, UserTime, UserYearAbsenceInfo, AgencyBills from standards.models import Standards, StandardCommentRate, StandardComments from timemanagement.models import Workday, FreeDays, Absence from message.models import Message @@ -858,22 +858,35 @@ def getAgencyBillStatus(agency): returnvalue = 20 else: today = date.today() + bills = AgencyBills.objects.filter(agency=agency) + + activeBill = False + + for bill in bills: + if bill.end <= today and bill.billstatus == "paid": + activeBill = True + + + + # 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: + 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: + elif agency.paymentplan == 1 and activeBill == True: returnvalue = 10 + elif agency.paymentplan == 1 and activeBill == False: + returnvalue = 11 #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/templates/users/base.html b/users/templates/users/base.html index a6e5bc1..be4a2a0 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -997,6 +997,93 @@ $(document).ready(function(){ }); }); +{% elif billstatus == 2 %} + + +{% elif billstatus == 1 %} + + +{% elif billstatus == 11%} + {% if request.user|usergperm:"agencyinfo" %} + + + {% endif %} {% endif %}