diff --git a/Clientes/custom_decorators.py b/Clientes/custom_decorators.py index 3387c19..b37afe6 100644 --- a/Clientes/custom_decorators.py +++ b/Clientes/custom_decorators.py @@ -11,8 +11,6 @@ def Custom_is_staff_function(user): if user.is_staff: return True return False - - def is_staff_access(view_to_return="index"): def decorator(view): @wraps(view) diff --git a/Clientes/views.py b/Clientes/views.py index bbe0565..87bbb65 100644 --- a/Clientes/views.py +++ b/Clientes/views.py @@ -24,6 +24,7 @@ from .forms import ClienteForm,EmailForm from rest_framework.views import APIView from rest_framework.response import Response from rest_framework.permissions import IsAuthenticated +from rest_framework import status #EXCEL from openpyxl import Workbook @@ -318,7 +319,7 @@ def export_Excel(request): mes = month dat =datetime.datetime(int(year), int(mes),1) - + if dat.month in(1,3,5,7,8,10,12): findate = dat +datetime.timedelta(days=30) elif dat.month in (4,6,9,11): @@ -326,7 +327,7 @@ def export_Excel(request): else: findate = dat+datetime.timedelta(days=28) findate +=datetime.timedelta(days=1) - + if mes is not None and RFC is not None: objeto_a_trabajar = Timbres.objects.filter(rfcc=RFC, created_at__range=[dat,findate]) else: @@ -336,7 +337,7 @@ def export_Excel(request): wb = Workbook() ws = wb.active - + if RFC is not None: #Encabezado ws['A1']='RFC_EXPEDIDO' @@ -387,7 +388,7 @@ def PACS_Retrive_RFCS(request): #-----------------------------------API VIEWS #-------------------------------------------- -from rest_framework import status + class check_RFC(APIView): permission_classes = (IsAuthenticated,) def get(self,request): @@ -395,11 +396,14 @@ class check_RFC(APIView): try: cliente, created = Clientes.objects.get_or_create(RFC=rfc) serializer = ClienteSerializer(cliente) + + if created: + cliente.Activo=True + cliente.save() + if not serializer.is_valid: return Response(serializer.errors,status=400) - if created: - cliente.Activo=True - cliente.save() + return Response(serializer.data) except Exception as E: return Response({'Error':f'check_RFC:{E} RFC:{rfc}','isError':True}) @@ -415,15 +419,8 @@ class add_timbre2(APIView): tipo=request.GET.get('tipo', None) rfcp=request.GET.get('rfcp', None) modo=request.GET.get('modo', None) - obj={ - 'uuid':uuid, - 'rfcc':rfcc, - 'fecha':fecha, - 'folio':folio, - 'serie':serie, - 'tipo':tipo, - 'rfcp':rfcp, - 'modo':modo + obj={'uuid':uuid,'rfcc':rfcc,'fecha':fecha,'folio':folio, + 'serie':serie,'tipo':tipo,'rfcp':rfcp,'modo':modo } try: obj = Timbres.objects.create(**obj) diff --git a/Templates/Clientes/index.html b/Templates/Clientes/index.html index 11dc739..c6d4e40 100644 --- a/Templates/Clientes/index.html +++ b/Templates/Clientes/index.html @@ -23,9 +23,13 @@ Timbres disponibles Comercio Digital: {{saldo}} - - Filtrado: Mes:{{mes}}, Año:{{year}}, PAC: - + + + + Filtrado: Mes:{{mes}}, Año:{{year}}, PAC: + + + @@ -39,8 +43,7 @@ Timbres disponibles Comercio Digital: {{saldo}} - + -
- -
- - -
- - -
-
- - - {{emailForm.adjunto}} -
-
- - -
- - - - -
- - -
- - - - - - -