Agenturlöschen Message hinzugefügt

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)
+	returnvalue = 0
-	return True
+	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
 
 
 

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')

users/templates/users/base.html

@@ -970,3 +970,57 @@ $("#chatButton").click(function(){
 
 
 </script>
+<!-- Billstatus -->
+<!-- Billarea -->
+{% getAgencyBillStatus request.user.profile.agency as billstatus %}
+{% if billstatus == 3 %}
+<div class="modal fade" tabindex="-1" role="dialog" data-backdrop="static" id="noaccess">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">Testphase abgelaufen</h5>
+      </div>
+      <div class="modal-body">
+        Der Testzeitraum Ihrer Digitalen Agentur ist abgelaufen. Sollten Sie die Agentur erneut eröffnen wollen, wenden Sie sich bitte an den Support per E-Mail support@digitale-agentur.com!
+      </div>
+      <div class="modal-footer">
+      </div>
+    </div>
+  </div>
+</div>
+
+<script type="text/javascript">
+
+  $(document).ready(function(){
+    $("#noaccess").modal("toggle");
+  });
+
+  $(document).keydown(function(e) {
+    console.log(e.keyCode);
+    if (e.keyCode == 27) {
+      window.location = window.location;
+    } 
+});
+
+
+</script>
+{% endif %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

users/templates/users/dashboard.html

@@ -1,4 +1,5 @@
 {% extends "users/base.html" %}
+{% load counter_tag %}
 {% block content %}
 <div class="content-section col-12">
   <h3>Willkommen, {{request.user.first_name}} {{request.user.last_name}}!</h3>
@@ -197,4 +198,6 @@ $(document).ready(function(){
   </div>
 </div>
 <!-- YOUTUBE PART ENDE -->
+
+
 {% endblock content %}