From 04c00e6c7f89160d94d4e5422bedf9971e593aea Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Fri, 4 Dec 2020 09:05:31 +0100 Subject: [PATCH] Chunks bearbeitet und Bugs) --- adm/templates/adm/adm_agencys.html | 2 + adm/templates/adm/adm_base.html | 10 +++ adm/templates/adm/adm_bills.html | 78 +++++++++++++++++++ adm/urls.py | 1 + adm/views.py | 25 ++++++ .../templates/dasettings/user_usprof.html | 2 +- users/views.py | 8 +- 7 files changed, 121 insertions(+), 5 deletions(-) create mode 100644 adm/templates/adm/adm_bills.html diff --git a/adm/templates/adm/adm_agencys.html b/adm/templates/adm/adm_agencys.html index e13afc1..909541d 100644 --- a/adm/templates/adm/adm_agencys.html +++ b/adm/templates/adm/adm_agencys.html @@ -8,6 +8,7 @@ Agenturname + Registriert am Mitarbeiter Standards @@ -17,6 +18,7 @@ {% getAgencyData ele as agdata %} {{ele.name}} + {{ele.registerdate}} {{agdata.0}} {{agdata.1}} diff --git a/adm/templates/adm/adm_base.html b/adm/templates/adm/adm_base.html index d0c471b..b0de70f 100644 --- a/adm/templates/adm/adm_base.html +++ b/adm/templates/adm/adm_base.html @@ -97,6 +97,16 @@ Agenturen + {% if active_link == 'adm-bills' %} +
  • + {% else %} +
  • + {%endif%} + + + Rechnungen +
    • + {% if active_link == 'adm-users' %}
  • diff --git a/adm/templates/adm/adm_bills.html b/adm/templates/adm/adm_bills.html new file mode 100644 index 0000000..a2c196d --- /dev/null +++ b/adm/templates/adm/adm_bills.html @@ -0,0 +1,78 @@ +{% extends "adm/adm_base.html" %} +{% block content %} +{% load adm_tags %} +{% load mathfilters %} +{% load humanize %} +{% load counter_tag %} +
    +

    Rechungsübersicht

    +
    + + + + + + + + + + + + {% for ele in bills %} + + + + + + + + + {% endfor %} + +
    AgenturRechnungsnummerErstellt amBetragStatus
    {{ele.agency.name}}{{ele.billnumber}}{{ele.billdate}} + {% loadFinalMoney user as fm %} + {{fm|floatformat:2|intcomma}} € + + {% if ele.billstatus == "open" %} {% elif ele.billstatus == "paid" %} {% endif %} +
    +
    + +{% endblock content %} + + \ No newline at end of file diff --git a/adm/urls.py b/adm/urls.py index d439a44..c222535 100644 --- a/adm/urls.py +++ b/adm/urls.py @@ -12,6 +12,7 @@ urlpatterns = [ path('ag/', AdmAgencys.as_view(), name="adm-agencys"), path('us/', AdmUsers.as_view(), name="adm-users"), path('agsingle/', AdmAgencySingle.as_view(), name="adm-agency-single"), + path('ag/bills/', AdmBills.as_view(), name="adm-bills"), path('usersingle/', AdmUserSingle.as_view(), name="adm-user-single"), path('cron/', statisticCronJob, name="adm-cron"), path('getorders/', getCSVRDOrders, name="getorders") diff --git a/adm/views.py b/adm/views.py index 3d3b7cd..1c9d8ba 100644 --- a/adm/views.py +++ b/adm/views.py @@ -78,6 +78,31 @@ class AdmMain(TemplateView): }) return context +''' + +Gesatmübersicht aller Rechnungen + +''' +class AdmBills(TemplateView): + + template_name = "adm/adm_bills.html" + + def dispatch(self, *args, **kwargs): + if(checkForStuffUser(self.request)): + return super().dispatch(*args, **kwargs) + else: + messages.warning(self.request, f'Sie benötigen einen Mitarbeiter-Account, um diese Seiten aufzurufen!') + return redirect("login") + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + + context.update({'active_link' : "adm-bills"}) + context.update({'bills' : AgencyBills.objects.all()}) + return context + + + ''' Gesamtansicht der Agenturen ''' diff --git a/dasettings/templates/dasettings/user_usprof.html b/dasettings/templates/dasettings/user_usprof.html index 6f512b6..ca993b0 100644 --- a/dasettings/templates/dasettings/user_usprof.html +++ b/dasettings/templates/dasettings/user_usprof.html @@ -181,7 +181,7 @@ --> -
    Arbeitszeiten 
    +
    Arbeitszeiten 
    diff --git a/users/views.py b/users/views.py index 680a1b4..13835d3 100644 --- a/users/views.py +++ b/users/views.py @@ -1407,13 +1407,13 @@ def cronactionsbill(request, code): # Alle Rechnungen laden, deren Letzter Tag HEUTE ist und bei ausgewähltem Paymentplan 1 eine neue Rechnung erstellen, Mailverschicke, Nutzeraccouns zählen und neue Rechnung in der Agentur hinterlegen new_bills = AgencyBills.objects.filter(end=today) for bill in new_bills: - if bill.agency.paymentplan == 1: + if bill.agency.paymentstatus == 0 and bill.agency.paymentplan == 1: agency = bill.agency month = today - - next_month = today + relativedelta(months=1) + # 30 Tage weiter, nicht einen Monat! + next_month = today + relativedelta(days=30) # USERCOUNT BERECHNEN usercount = len(User.objects.filter(profile__agency=agency)) @@ -1433,7 +1433,7 @@ def cronactionsbill(request, code): start_date = month start_date_string = month.strftime("%d.%m.%Y") - end_date = month + relativedelta(months=plan) + end_date = month + relativedelta(days=30) end_date_string= end_date.strftime("%d.%m.%Y") voucher_date_today = date.today().strftime("%Y-%m-%d")