diff --git a/Clientes/urls.py b/Clientes/urls.py index ee27723..2fb75f5 100644 --- a/Clientes/urls.py +++ b/Clientes/urls.py @@ -3,7 +3,8 @@ from .views import ( index,add_timbre, timbres_cliente, saldo_funct, - ClientesUpdateView, + ClientesUpdateView, + ClientesCreateView, export_Excel, send_timbres_Email, check_active_RFC, @@ -14,7 +15,8 @@ urlpatterns = [ path('add_timbre/', add_timbre, name='add_timbre'), path('timbres_cliente//', timbres_cliente, name='timbres_cliente'), path('get_saldo/', saldo_funct, name='saldo_funct'), - path('cliente/update//',ClientesUpdateView.as_view(),name='update_cliente'), + path('cliente/update//',ClientesUpdateView.as_view(),name='update_cliente'), + path('cliente/add/', ClientesCreateView.as_view(), name='add_cliente'), path('get_timbres_xls/', export_Excel, name='export_Excel'), path('send_timbres_cliente/',send_timbres_Email, name='send_timbres_Email'), path('getActivoRFC/', check_active_RFC, name='check_active_RFC'), diff --git a/Clientes/views.py b/Clientes/views.py index a75c28e..3cfa18f 100644 --- a/Clientes/views.py +++ b/Clientes/views.py @@ -8,7 +8,7 @@ from .models import Clientes,Timbres,saldoModel,ErroresTimbres from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.db.models import Q import datetime -from django.views.generic.edit import UpdateView +from django.views.generic.edit import CreateView,UpdateView from .forms import ClienteForm,EmailForm from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.mixins import UserPassesTestMixin @@ -51,7 +51,8 @@ def send_timbres_Email(request): Cli = Clientes.objects.get(RFC=RFC) subject = f'Timbres del Mes:{mes} RFC:{RFC}' if req=='GET' else ( form.cleaned_data["subject"] if 'subject' in form.cleaned_data.keys() else '' ) message = 'Envio de timbres por AS_Admin' if req=='GET' else ( form.cleaned_data["message"] if 'message' in form.cleaned_data.keys() else '' ) - email = form.cleaned_data["email"] if 'email' in form.cleaned_data.keys() else '' + if req=='POST': + email = form.cleaned_data["email"] if 'email' in form.cleaned_data.keys() else '' emails = [Cli.email] if req=='GET' else [ Cli.email, email ] if len(emails) ==0 : @@ -318,6 +319,15 @@ class ClientesUpdateView(UserPassesTestMixin,LoginRequiredMixin,UpdateView): return self.request.user.groups.filter(name= 'admin_soft') +class ClientesCreateView(UserPassesTestMixin,LoginRequiredMixin,CreateView): + model = Clientes + form_class = ClienteForm + success_url='/' + template_name='Clientes/edit_cliente.html' + def test_func(self): + #self.request.user.groups.all() + return self.request.user.groups.filter(name= 'admin_soft') + #@login_required @sync_to_async(thread_sensitive=False) def export_Excel(request): diff --git a/Templates/Clientes/index.html b/Templates/Clientes/index.html index 8d90d69..49b6090 100644 --- a/Templates/Clientes/index.html +++ b/Templates/Clientes/index.html @@ -8,7 +8,6 @@ Timbres disponibles Comercio Digital: {{saldo.saldo}} {% endblock titlePage %} {% block content %} - diff --git a/Templates/base.html b/Templates/base.html index d4566fc..8950fea 100644 --- a/Templates/base.html +++ b/Templates/base.html @@ -23,7 +23,10 @@ {% include 'sidebar.html' %}

{% block titlePage %}{% endblock titlePage %}

{% include 'partials/messages.html' %} - {% block content %}{% endblock content %} + + {% block content %} + + {% endblock content %} {% include 'paginator.html' %} diff --git a/Templates/sidebar.html b/Templates/sidebar.html index 444b7c2..033794d 100644 --- a/Templates/sidebar.html +++ b/Templates/sidebar.html @@ -6,8 +6,19 @@