From 6b949781159a3a67366b4d704c3b93c907b45b2c Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Tue, 6 Oct 2020 21:39:18 +0200 Subject: [PATCH] Der Wahnsinn hat mich erheilt... --- dasettings/forms.py | 18 +++++++++--------- dasettings/views.py | 3 ++- .../recoverdir/rd_areas/rd_area_5.html | 4 +++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dasettings/forms.py b/dasettings/forms.py index 96ce513..6eb2620 100644 --- a/dasettings/forms.py +++ b/dasettings/forms.py @@ -47,7 +47,7 @@ class AgencyBillPlan(forms.ModelForm): class Meta: model = Agency - + fields = ['name','inhaber','agency_email', 'phone', 'street', 'plz', 'city', 'paymentplan', 'agb', 'contract', 'lexofficeid'] labels = { "name" : "Agenturname", "inhaber" : "Inhaber", @@ -59,22 +59,22 @@ class AgencyBillPlan(forms.ModelForm): "agb" : "AGB akzeptieren", "contract" : "Auftragsdatenverarbeitung akzeptieren" } - fields = ['name','inhaber','agency_email', 'phone', 'street', 'plz', 'city', 'paymentplan', 'agb', 'contract', 'lexofficeid'] + def __init__(self, *args, **kwargs): super(AgencyBillPlan, self).__init__(*args, **kwargs) self.fields['paymentplan'] = forms.CharField(initial=1, required=True, widget=forms.HiddenInput()) self.fields['lexofficeid'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) - self.fields['name'] = forms.CharField(required=True) + self.fields['name'] = forms.CharField(required=True, label="Agenturname") - self.fields['inhaber'] = forms.CharField(required=True) + self.fields['inhaber'] = forms.CharField(required=True, label="Inhaber") - 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['agency_email'] = forms.CharField(required=True, label="E-Mailadresse") + self.fields['phone'] = forms.CharField(required=True, label="Telefon") + self.fields['street'] = forms.CharField(required=True, label="Straße und Hausnummer") + self.fields['plz'] = forms.CharField(required=True, label="PLZ") + self.fields['city'] = forms.CharField(required=True, label="Stadt") self.fields['agb'] = forms.BooleanField(required=True, label="AGB's akzeptieren") self.fields['contract'] = forms.BooleanField(required=True, label="Auftragsdatenverarbeitung akzeptieren") diff --git a/dasettings/views.py b/dasettings/views.py index 136bae0..7dc7c6c 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -1576,8 +1576,9 @@ class BillPlanUpdate(UpdateView): # LexOffice Verbindung def form_valid(self, form): + # Form einmal speichern, damit die Adressdaten usw. übernommen werden + form.save() agency = self.request.user.profile.agency - month = agency.registerdate # Wenn die Agentur noch KEINE Lexoffice-ID hat, dann ist der Freimonat noch nicht durch. diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_5.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_5.html index 6f295d8..77f32bb 100644 --- a/recoverdir/templates/recoverdir/rd_areas/rd_area_5.html +++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_5.html @@ -1,6 +1,8 @@

Personal, interne und externe Partner inkl. Funktionen usw. - Online-Account + Personal

+Beim externen Aufrufen der Notfallhilfe werden alle aktuell angelegten Mitarbeiter inkl. Kontaktdaten angezeigt. Erstellen Sie daher hier Mitarbeiter, die nicht in der digitalen Agentur angelegt sind. +