DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Der Wahnsinn hat mich erheilt...

This commit is contained in:
holger.trampe 2020-10-06 21:39:18 +02:00
parent 76c9b658f0
commit 6b94978115
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dasettings/forms.py
View File

@ -47,7 +47,7 @@ class AgencyBillPlan(forms.ModelForm):
class Meta: class Meta:
model = Agency model = Agency
fields = ['name','inhaber','agency_email', 'phone', 'street', 'plz', 'city', 'paymentplan', 'agb', 'contract', 'lexofficeid']
labels = { labels = {
"name" : "Agenturname", "name" : "Agenturname",
"inhaber" : "Inhaber", "inhaber" : "Inhaber",
@ -59,22 +59,22 @@ class AgencyBillPlan(forms.ModelForm):
"agb" : "AGB akzeptieren", "agb" : "AGB akzeptieren",
"contract" : "Auftragsdatenverarbeitung akzeptieren" "contract" : "Auftragsdatenverarbeitung akzeptieren"
} }
fields = ['name','inhaber','agency_email', 'phone', 'street', 'plz', 'city', 'paymentplan', 'agb', 'contract', 'lexofficeid']
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(AgencyBillPlan, self).__init__(*args, **kwargs) super(AgencyBillPlan, self).__init__(*args, **kwargs)
self.fields['paymentplan'] = forms.CharField(initial=1, required=True, widget=forms.HiddenInput()) 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['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['agency_email'] = forms.CharField(required=True, label="E-Mailadresse")
self.fields['phone'] = forms.CharField(required=True) self.fields['phone'] = forms.CharField(required=True, label="Telefon")
self.fields['street'] = forms.CharField(required=True) self.fields['street'] = forms.CharField(required=True, label="Straße und Hausnummer")
self.fields['plz'] = forms.CharField(required=True) self.fields['plz'] = forms.CharField(required=True, label="PLZ")
self.fields['city'] = forms.CharField(required=True) self.fields['city'] = forms.CharField(required=True, label="Stadt")
self.fields['agb'] = forms.BooleanField(required=True, label="AGB's akzeptieren") self.fields['agb'] = forms.BooleanField(required=True, label="AGB's akzeptieren")
self.fields['contract'] = forms.BooleanField(required=True, label="Auftragsdatenverarbeitung akzeptieren") self.fields['contract'] = forms.BooleanField(required=True, label="Auftragsdatenverarbeitung akzeptieren")

3
dasettings/views.py
View File

@ -1576,8 +1576,9 @@ class BillPlanUpdate(UpdateView):
# LexOffice Verbindung # LexOffice Verbindung
def form_valid(self, form): def form_valid(self, form):
# Form einmal speichern, damit die Adressdaten usw. übernommen werden
form.save()
agency = self.request.user.profile.agency agency = self.request.user.profile.agency
month = agency.registerdate month = agency.registerdate
# Wenn die Agentur noch KEINE Lexoffice-ID hat, dann ist der Freimonat noch nicht durch. # Wenn die Agentur noch KEINE Lexoffice-ID hat, dann ist der Freimonat noch nicht durch.

4
recoverdir/templates/recoverdir/rd_areas/rd_area_5.html
View File

@ -1,6 +1,8 @@
<h4>Personal, interne und externe Partner inkl. Funktionen usw. <h4>Personal, interne und externe Partner inkl. Funktionen usw.
<a class="btn btn-primary btn btn-sm mb-3" href="{% url 'rd-a5-addpersonal' %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Online-Account</a> <a class="btn btn-primary btn btn-sm mb-3" href="{% url 'rd-a5-addpersonal' %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Personal</a>
</h4> </h4>
<small>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.</small>
<hr>
<table class="table table-hover" id="a5_personal" > <table class="table table-hover" id="a5_personal" >
<thead> <thead>
<tr> <tr>