iter in conteo_mes_clientes
This commit is contained in:
@@ -4,10 +4,12 @@ from .models import Timbres, saldoModel, Clientes,ErroresTimbres
|
||||
|
||||
class TimbresAdmin(admin.ModelAdmin):
|
||||
list_display=['uuid','rfcc','rfcp','fecha','folio','serie','tipo','modo','created_at']
|
||||
list_filter=['modo','tipo']
|
||||
|
||||
|
||||
class ClientesAdmin(admin.ModelAdmin):
|
||||
list_display= ['RFC','Nombre','Activo','fecha_baja']
|
||||
list_filter =['RFC','Activo']
|
||||
|
||||
admin.site.register(Timbres,TimbresAdmin)
|
||||
admin.site.register(saldoModel)
|
||||
|
||||
@@ -40,7 +40,7 @@ class Clientes(models.Model):
|
||||
fecha_baja = models.DateField(blank=True,null=True)
|
||||
email = models.EmailField(max_length=254, blank=True)
|
||||
conteo_mes = models.IntegerField(blank=True,null=True,default=0)
|
||||
def timbres_X_MES(self, mes):
|
||||
def timbres_X_MES(self, mes=None):
|
||||
today = datetime.date.today()
|
||||
year = today.year
|
||||
if mes==None:
|
||||
@@ -48,10 +48,10 @@ class Clientes(models.Model):
|
||||
dat = datetime.datetime(int(year),int(mes),1)
|
||||
if dat.month in (1,3,5,7,8,10,12):#31
|
||||
findate = dat + datetime.timedelta(days=30)
|
||||
#findate += datetime.timedelta(days=0)
|
||||
|
||||
elif dat.month in (4,6,9,11):#30
|
||||
findate = dat + datetime.timedelta(days=29)
|
||||
#findate += datetime.timedelta(days=0)
|
||||
|
||||
else:#28 or 29
|
||||
findate = dat + datetime.timedelta(days=28)
|
||||
findate += datetime.timedelta(days=1)
|
||||
|
||||
@@ -174,11 +174,20 @@ def index(request):
|
||||
filters.pop('datepicker','')
|
||||
filters.pop('datepickerFin','')
|
||||
filters.pop('mes','')
|
||||
print('filters------',filters)
|
||||
#print('filters------',filters)
|
||||
if rfcc:
|
||||
clientes_list = Clientes.objects.filter(Q(RFC__icontains=search))
|
||||
for i,ii in enumerate(clientes_list):
|
||||
ii.timbres_X_MES(mes=mes)
|
||||
|
||||
# for i,ii in enumerate(clientes_list):
|
||||
# ii.timbres_X_MES(mes=mes)
|
||||
met = iter(clientes_list)
|
||||
while met:
|
||||
try:
|
||||
c = next(met)
|
||||
c.timbres_X_MES(mes=mes)
|
||||
except StopIteration:
|
||||
break
|
||||
|
||||
clientes_list =pageFunc(page,clientes_list,20)
|
||||
|
||||
context = {
|
||||
@@ -346,12 +355,16 @@ def Retrive_Cliente_Email(request):
|
||||
return JsonResponse({'data':clientes})
|
||||
|
||||
@login_required
|
||||
@is_staff_access()
|
||||
#@is_staff_access()
|
||||
def PACS_Retrive_RFCS(request):
|
||||
timbres = {}
|
||||
if request.method == 'GET':
|
||||
RFC= request.GET.get('RFC','')
|
||||
status = 200
|
||||
timbres =list(Timbres.objects.values('rfcp').filter(rfcp__isnull=False))
|
||||
if RFC !='':
|
||||
timbres =list(Timbres.objects.values('rfcp').filter(rfcc__in=[RFC]))
|
||||
else:
|
||||
timbres =list(Timbres.objects.values('rfcp').filter(rfcp__isnull=False))
|
||||
else:
|
||||
status=403
|
||||
return JsonResponse({'PACS':timbres},status=status)
|
||||
|
||||
Reference in New Issue
Block a user