From 28fe4eaf44e095ac19f1027d1116d37e47b2fa04 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Sun, 6 Dec 2020 12:11:51 +0100
Subject: [PATCH] Rechnungen weiter checken

---
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 19995 -> 19964 bytes
 standards/templatetags/counter_tag.py         |  19 ++++++++++++------
 users/templates/users/base.html               |   8 ++++----
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index 0490dbac4e031be7c5a651254447ea5a59ada05c..57dfc97422c64c7a011d7d37b0e8e34b0f8542dc 100644
GIT binary patch
delta 4457
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
R@_=%nih)w<`RnWw@qaQh^9cX|

delta 4561
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

diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index 0ea3d68..dc3d68d 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -35,11 +35,11 @@ def incvar():
 @register.filter(name="has_group_byname")
 def has_group_byname(user, groupname):
 	in_group = False
-	if(user.profile.agency.module_recoverdir):
-		agroup = AgencyGroup.objects.filter(agency=user.profile.agency, agencygroupname=groupname)[0]
-		for g in user.groups.all():
-			if g.name == agroup.group.name:
-				in_group = True
+	#if(user.profile.agency.module_recoverdir):
+	agroup = AgencyGroup.objects.filter(agency=user.profile.agency, agencygroupname=groupname)[0]
+	for g in user.groups.all():
+		if g.name == agroup.group.name:
+			in_group = True
 
 	return in_group
 
@@ -866,6 +866,13 @@ def getAgencyBillStatus(agency):
 		for bill in bills:
 			if bill.end >= today:
 				activeBill = True
+				# TASK: Unbezahlte Rechnungen prüfen?
+				# Check, ob die aktuelle Rechnung innerhalb von zwei Wochen bezahlt ist
+				#billend = bill.start.relativedelta(days=14)
+				#if billend <= today and bill.billstatus == "open":
+				#	activeBill = False
+
+
 			
 		# Tage, die zwischen Registrierung und heute liegen
 		daysbetween = (today - regdate).days
@@ -882,7 +889,7 @@ def getAgencyBillStatus(agency):
 			returnvalue = 10
 		elif agency.paymentplan == 1 and activeBill == False:
 			returnvalue = 11
-		
+
 	return returnvalue
 
 
diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index 805bea7..e6db06c 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -973,7 +973,7 @@ $("#chatButton").click(function(){
 <!-- Billstatus -->
 <!-- Billarea -->
 {% getAgencyBillStatus request.user.profile.agency as billstatus %}
-{% if billstatus == 3 %}
+{% if billstatus == 3 and request.user|has_group_byname:"Administratoren" %}
 <!-- All close -->
 <div class="modal fade show" tabindex="-1" role="dialog" data-backdrop="static" id="noaccess">
   <div class="modal-dialog" role="document">
@@ -997,7 +997,7 @@ $(document).ready(function(){
     });
 });
 </script>
-{% elif billstatus == 2 %}
+{% elif billstatus == 2 and request.user|has_group_byname:"Administratoren" %}
 <div class="modal fade" tabindex="-1" role="dialog" data-backdrop="static" id="noaccess">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
@@ -1028,7 +1028,7 @@ $(document).ready(function(){
     
 });
 </script>
-{% elif billstatus == 1 %}
+{% elif billstatus == 1 and request.user|has_group_byname:"Administratoren" %}
 <div class="modal fade show" tabindex="-1" role="dialog" data-backdrop="static" id="noaccess">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
@@ -1055,7 +1055,7 @@ $(document).ready(function(){
     }
 });
 </script>
-{% elif billstatus == 11%}
+{% elif billstatus == 11  and request.user|has_group_byname:"Administratoren" %}
   <div class="modal fade show" tabindex="-1" role="dialog" data-backdrop="static" id="noaccess">
     <div class="modal-dialog" role="document">
       <div class="modal-content">