diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..c945451 Binary files /dev/null and b/.DS_Store differ diff --git a/areas/__pycache__/__init__.cpython-38.pyc b/areas/__pycache__/__init__.cpython-38.pyc index 68d63ec..b704cf4 100644 Binary files a/areas/__pycache__/__init__.cpython-38.pyc and b/areas/__pycache__/__init__.cpython-38.pyc differ diff --git a/cloud/migrations/__pycache__/__init__.cpython-38.pyc b/cloud/migrations/__pycache__/__init__.cpython-38.pyc index 751a18e..1188a24 100644 Binary files a/cloud/migrations/__pycache__/__init__.cpython-38.pyc and b/cloud/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/dasettings/__pycache__/__init__.cpython-38.pyc b/dasettings/__pycache__/__init__.cpython-38.pyc index 551679f..3e52170 100644 Binary files a/dasettings/__pycache__/__init__.cpython-38.pyc and b/dasettings/__pycache__/__init__.cpython-38.pyc differ diff --git a/dasettings/forms.py b/dasettings/forms.py index cac4780..b85775c 100644 --- a/dasettings/forms.py +++ b/dasettings/forms.py @@ -34,6 +34,53 @@ class UsersSelfChangeForm(forms.ModelForm): model = User fields = ['email'] +class AgencyBillMail(forms.ModelForm): + class Meta: + model = Agency + fields = ['payment_address'] + + labels = { + 'payment_address' : 'E-Mail für Rechnungen' + } + +class AgencyBillPlan(forms.ModelForm): + + class Meta: + model = Agency + + labels = { + "name" : "Agenturname", + "inhaber" : "Inhaber", + "street" : "Straße und Hausnummer", + "plz" : "PLZ", + "city" : "Stadt", + "agency_email" : "E-Mail", + "phone" : "Telefon", + "agb" : "AGB akzeptieren", + "contract" : "Auftragsdatenverarbeitung akzeptieren" + + } + fields = ['name','inhaber','agency_email', 'phone', 'street', 'plz', 'city', 'paymentplan', 'agb', 'contract'] + + def __init__(self, *args, **kwargs): + super(AgencyBillPlan, self).__init__(*args, **kwargs) + self.fields['paymentplan'] = forms.CharField(initial=6, required=True, widget=forms.HiddenInput()) + self.fields['name'] = forms.CharField(required=True) + + self.fields['inhaber'] = forms.CharField(required=True) + + self.fields['agency_email'] = forms.CharField(required=True) + self.fields['phone'] = forms.CharField(required=True) + self.fields['street'] = forms.CharField(required=True) + self.fields['plz'] = forms.CharField(required=True) + self.fields['city'] = forms.CharField(required=True) + + self.fields['agb'] = forms.BooleanField(required=True, label="AGB's akzeptieren") + self.fields['contract'] = forms.BooleanField(required=True, label="Auftragsdatenverarbeitung akzeptieren") + + + + # Form für die Benachrichtigungseinstellungen ''' class UsersNotificationForm(forms.ModelForm): diff --git a/dasettings/migrations/__pycache__/__init__.cpython-38.pyc b/dasettings/migrations/__pycache__/__init__.cpython-38.pyc index 992ddbf..59c1984 100644 Binary files a/dasettings/migrations/__pycache__/__init__.cpython-38.pyc and b/dasettings/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/dasettings/templates/dasettings/calc_content.html b/dasettings/templates/dasettings/calc_content.html index a375eaa..37bb399 100644 --- a/dasettings/templates/dasettings/calc_content.html +++ b/dasettings/templates/dasettings/calc_content.html @@ -1,3 +1,81 @@ {% load mathfilters %} {% load humanize %} -
Vielen Dank für die Unterstützung während der Pilotphase! Für diesen Zeitraum ist die Nutzung kostenfrei.
\ No newline at end of file +{% load counter_tag %} +{% if request.user.profile.agency.paymentstatus == 1 %} +Ihre Agentur darf die Plattform kostenlos nutzen. Vielen Dank für Ihre Unterstützung!
+{% else %} + +Ihr monatlicher Nutzungsbeitrag setzt sich wie folgt zusammen:
+| Grundbetrag (inkl. 3 Nutzer) | 21,00 € | +
| Zusätzliche Nutzer (3,00 € pro Nutzer) | {{usercount}} | +
| Gesetzliche MwSt. (19%) | {{mwst|floatformat:2|intcomma}} € | +
| + | |
| Monatlicher Bruttobetrag | {{fm|floatformat:2|intcomma}} € | +