second branch and commit

Clientes/views.py

@@ -203,8 +203,6 @@ def pageFunc(page,qs,per_page):
 @login_required
 @is_staff_access()
 def timbres_cliente(request, RFC):
-    
-
     if request.user.is_staff:
         lista = Timbres.objects.filter(rfcc=RFC)
     else:
@@ -213,28 +211,15 @@ def timbres_cliente(request, RFC):
     mes = request.GET.get('mes', None)    
     today= datetime.date.today()
     year =today.year
-    if mes is None or mes =='None':        
-        mes='00' #Todos
-        
-    PAC= request.GET.get('PAC',None)
-    # if PAC !="00" or PAC !="None":
-    #     lista = lista.filter(rfcp=str(PAC))
-    # else:
-    #     lista = Timbres.objects.filter(rfcc=str(RFC))
-
-    #print(f'{PAC} filter pro pac',lista.count(), lista)
-    if PAC is not None and PAC !='00':
-        lista = lista.filter(rfcp=PAC)
-
-    
-    
-
-    
     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)      
+    PAC= request.GET.get('PAC',None)
+
+    if PAC is not None and PAC !='00':
+        lista = lista.filter(rfcp=PAC)
 
       
 
@@ -267,6 +252,9 @@ def timbres_cliente(request, RFC):
         #print('start',start, 'end',end)
         lista = lista.filter(created_at__range=[start, end])
     
+    if mes is None or mes =='None' or mes=='':        
+        mes='00' #Todos
+
     if mes != '00':
         dat = datetime.datetime(int(year), int(mes),1)
         if dat.month in(1,3,5,7,8,10,12):
@@ -279,7 +267,7 @@ def timbres_cliente(request, RFC):
         lista = lista.filter(created_at__range=[dat,findate])
 
     conteo = lista.count()
-    print('conteo',conteo)
+    
     lista =pageFunc(page,lista,50)
     
     context ={
@@ -303,7 +291,7 @@ def export_Excel(request):
     month = today.month
     year  = today.year    
     
-    if mes is None or mes =='None':
+    if mes is None or mes =='None' or mes=='':
         mes = month
 
     dat =datetime.datetime(int(year), int(mes),1)
@@ -350,18 +338,21 @@ def export_Excel(request):
     wb.save( response)    
     return response
 
-
 @http_basic_auth()
 def Retrive_Cliente_Email(request):
     if request.method == 'GET':
         clientes = list(Clientes.objects.values('email').filter(RFC=request.GET.get('RFC',None)))
     return JsonResponse({'data':clientes})
 
+@login_required
+@is_staff_access()
 def PACS_Retrive_RFCS(request):    
-    status = 302
     timbres = {}
     if request.method == 'GET':
+        status = 200
         timbres =list(Timbres.objects.values('rfcp').filter(rfcp__isnull=False))        
+    else:
+        status=403
     return JsonResponse({'PACS':timbres},status=status)
 
 #-----------------------------------API VIEWS
@@ -380,7 +371,6 @@ class check_RFC(APIView):
 class add_timbre2(APIView):
     permission_classes = (IsAuthenticated,)
     def get(self,request):        
-        
         uuid= request.GET.get('uuid', None)
         rfcc= request.GET.get('rfcc', None)
         fecha=request.GET.get('fecha', None)

Templates/Clientes/timbres_cliente.html

@@ -1,20 +1,18 @@
-
 {% extends 'base.html' %}
 
-
-
 {% block content %}
 <h1>Timbres <strong>{{RFC}}</strong> </h1>
 <h2>Timbres totales: <strong></strong>{{conteo}}</strong></h2>
-<span class="navbar-text mr-2">
-{% if filters.datepicker%}
-  De fecha: <strong>"{{filters.datepicker}}"</strong>
-{% endif %}
 
-{% if filters.datepickerFin %}
+  <span class="justify-content-sm-end navbar-text mr-2">
-  A fecha: <strong>"{{filters.datepickerFin}}"</strong>
+    {% if filters.datepicker%}
-{% endif %}
+      De fecha: <strong>"{{filters.datepicker}}"</strong>
-</span>
+    {% endif %}
+    
+    {% if filters.datepickerFin %}
+      A fecha: <strong>"{{filters.datepickerFin}}"</strong>
+    {% endif %}
+  </span>
 
 <br><br>
 <table class="table">
@@ -22,13 +20,11 @@
       <tr>
         <th></th>
         <th scope="col"> UUID</th>        
-        
         <th scope="col">
           PAC
           <select id="table_select_PAC" class="form-control form-control-sm my_event_cls">
             <option value="00">Todos</option>
-            <!--option value="01">EDICOM</option>
+            <!--option value="01">EDICOM</option-->            
-            <option value="02">Comercio Dig.</option-->
           </select>
         </th>
         <th scope="col">
@@ -92,23 +88,23 @@
       return res.json()
     })
     .then(data=>{
-      let arr = data['PACS']
-      let pacs = [...new Set(arr.map((arr)=> arr.rfcp) )]
             
-        pacs.forEach((val,index)=>{          
+      let pacs = [...new Set( data['PACS'].map((arr)=> arr.rfcp) )]        
-          let option = document.createElement('option')
+      pacs.forEach((val,index)=>{          
-          option.value=val
+        let option = document.createElement('option')
-          option.text=val
+        option.value=val
-          table_select_PAC.add(option)
+        option.text=val
-          PAC.filter(val=>val.includes('PAC'))
+        table_select_PAC.add(option)
-          .forEach((val,index)=>{            
+        PAC.filter(val=>val.includes('PAC'))
-            table_select_PAC.value = val.split('=')[1]
+        .forEach((val,index)=>{
-          })
+          table_select_PAC.value = val.split('=')[1]
         })
+      })
     })
 }
 </script>
 <!--end functions-->
+
 <script>
       let filters = document.getElementById('id_filters').textContent
       let mes = Object.values(filters.split('&'))
@@ -126,7 +122,6 @@
         table_select_Meses.value= val.split('=')[1]
       })
       
-      
       tipo.filter(val=>val.includes('tipo'))
       .forEach((val,index)=>{
         
@@ -177,7 +172,6 @@
       
 
       table_select_PAC.addEventListener('change',(event)=>{        
-        
         anc.href=''
         anc.href=ref
         anc.click()
@@ -185,9 +179,7 @@
       table_select_Meses.addEventListener('change',(event)=>{
         anc.href=''
         anc.href=ref
-        console.log(ref)        
         anc.click()
-        
       })
 
       table_tipo.addEventListener('click', (event)=>{