diff --git a/Clientes/views.py b/Clientes/views.py index 4c26957..16ab2ae 100644 --- a/Clientes/views.py +++ b/Clientes/views.py @@ -148,22 +148,11 @@ def index(request): filters.pop('datepickerFin','') print('filters------',filters) if rfcc: - clientes_list = Clientes.objects.filter(Q(RFC__icontains=search)) - + clientes_list = Clientes.objects.filter(Q(RFC__icontains=search)) for i,ii in enumerate(clientes_list): - ii.timbres_X_MES(mes=mes) - - + ii.timbres_X_MES(mes=mes) clientes_list =pageFunc(page,clientes_list,20) - # paginator = Paginator(clientes_list, 5) - - # try: - # lista = paginator.page(page) - # except PageNotAnInteger: - # lista = paginator.page(1) - # except EmptyPage: - # lista = paginator.page(paginator.num_pages) filters.pop('mes','') context = { 'lista':clientes_list, @@ -193,15 +182,23 @@ def timbres_cliente(request, RFC): lista = Timbres.objects.filter(rfcc=RFC) else: lista = Timbres.objects.filter(rfcc=RFC,modo='Normal') + + PAC= request.GET.get('PAC',None) + if PAC=='01': + lista = lista.filter(rfcp='EME000602QR9') + if PAC=='02': + lista = lista.exclude(rfcp='EME000602QR9') search = request.GET.get('search',None) page = request.GET.get('page', 1) datepicker = request.GET.get('datepicker', None) datepickerFin = request.GET.get('datepickerFin', None) tipo = request.GET.get('tipo',None) - + filters = {key:value[0] for (key,value) in dict(request.GET).items() if value !=[""]} filters.pop('page', '') + filters.pop('PAC', '') + if tipo: lista = lista.filter(Q(tipo__icontains=search)) @@ -228,6 +225,7 @@ def timbres_cliente(request, RFC): 'lista':lista, 'conteo':conteo, 'RFC':RFC, + 'PAC':PAC, 'filters':filters } return render(request, 'Clientes/timbres_cliente.html', context) diff --git a/Templates/Clientes/index.html b/Templates/Clientes/index.html index d2cd823..195919b 100644 --- a/Templates/Clientes/index.html +++ b/Templates/Clientes/index.html @@ -24,10 +24,8 @@ Timbres disponibles Comercio Digital: {{saldo}} + + + + + Tipo CFDI @@ -47,42 +54,59 @@ + {% endblock content %} {% block scripts %} {% endblock scripts %} diff --git a/Templates/partials/search_form.html b/Templates/partials/search_form.html index ea354f1..75f45ce 100644 --- a/Templates/partials/search_form.html +++ b/Templates/partials/search_form.html @@ -3,7 +3,7 @@ Fecha: {{fecha|date:"d F Y"}}
- +
@@ -15,8 +15,8 @@