Resolve dates issue in timbres
This commit is contained in:
@@ -18,7 +18,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent
|
|||||||
SECRET_KEY = 'django-insecure-5*mm&uf5zq@t6nrs_5z8-_qtyapm^3&yz^wqqkc_a!v(!ulj-^'
|
SECRET_KEY = 'django-insecure-5*mm&uf5zq@t6nrs_5z8-_qtyapm^3&yz^wqqkc_a!v(!ulj-^'
|
||||||
|
|
||||||
# SECURITY WARNING: don't run with debug turned on in production!
|
# SECURITY WARNING: don't run with debug turned on in production!
|
||||||
DEBUG = True
|
DEBUG = False
|
||||||
|
|
||||||
ALLOWED_HOSTS = ['*']
|
ALLOWED_HOSTS = ['*']
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@ INSTALLED_APPS = [
|
|||||||
'django.contrib.sessions',
|
'django.contrib.sessions',
|
||||||
'django.contrib.messages',
|
'django.contrib.messages',
|
||||||
'django.contrib.staticfiles',
|
'django.contrib.staticfiles',
|
||||||
|
|
||||||
'allauth',
|
'allauth',
|
||||||
'allauth.account',
|
'allauth.account',
|
||||||
'allauth.socialaccount',
|
'allauth.socialaccount',
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from .models import Timbres, saldoModel, Clientes
|
from .models import Timbres, saldoModel, Clientes,ErroresTimbres
|
||||||
|
|
||||||
admin.site.register(Timbres)
|
admin.site.register(Timbres)
|
||||||
admin.site.register(saldoModel)
|
admin.site.register(saldoModel)
|
||||||
admin.site.register(Clientes)
|
admin.site.register(Clientes)
|
||||||
|
admin.site.register(ErroresTimbres)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -13,10 +13,10 @@ from django.contrib.auth.mixins import UserPassesTestMixin
|
|||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def index(request):
|
def index(request):
|
||||||
|
|
||||||
clientes_list = Clientes.objects.all()
|
clientes_list = Clientes.objects.all()
|
||||||
|
|
||||||
|
|
||||||
page = request.GET.get('page', 1)
|
page = request.GET.get('page', 1)
|
||||||
|
|
||||||
search = request.GET.get('search',None)
|
search = request.GET.get('search',None)
|
||||||
@@ -34,7 +34,7 @@ def index(request):
|
|||||||
clientes = paginator.page(paginator.num_pages)
|
clientes = paginator.page(paginator.num_pages)
|
||||||
context = {
|
context = {
|
||||||
'clientes':clientes,
|
'clientes':clientes,
|
||||||
|
|
||||||
}
|
}
|
||||||
return render(request,'Clientes/index.html',context)
|
return render(request,'Clientes/index.html',context)
|
||||||
|
|
||||||
@@ -43,7 +43,7 @@ def add_timbre(request):
|
|||||||
uuid= request.GET.get('uuid', None)
|
uuid= request.GET.get('uuid', None)
|
||||||
rfcc= request.GET.get('rfcc', None)
|
rfcc= request.GET.get('rfcc', None)
|
||||||
fecha=request.GET.get('fecha', None)
|
fecha=request.GET.get('fecha', None)
|
||||||
folio=request.GET.get('folio', None)
|
folio=request.GET.get('folio', None)
|
||||||
serie=request.GET.get('serie', None)
|
serie=request.GET.get('serie', None)
|
||||||
tipo=request.GET.get('tipo', None)
|
tipo=request.GET.get('tipo', None)
|
||||||
rfcp=request.GET.get('rfcp', None)
|
rfcp=request.GET.get('rfcp', None)
|
||||||
@@ -55,7 +55,7 @@ def add_timbre(request):
|
|||||||
'serie':serie,
|
'serie':serie,
|
||||||
'tipo':tipo,
|
'tipo':tipo,
|
||||||
'rfcp':rfcp
|
'rfcp':rfcp
|
||||||
}
|
}
|
||||||
try:
|
try:
|
||||||
obj = Timbres.objects.create(**obj)
|
obj = Timbres.objects.create(**obj)
|
||||||
return HttpResponse('ok')
|
return HttpResponse('ok')
|
||||||
@@ -83,29 +83,32 @@ def pageFunc(page,qs,per_page):
|
|||||||
@login_required
|
@login_required
|
||||||
def timbres_cliente(request, RFC):
|
def timbres_cliente(request, RFC):
|
||||||
lista = Timbres.objects.filter(rfcc=RFC)
|
lista = Timbres.objects.filter(rfcc=RFC)
|
||||||
|
|
||||||
search = request.GET.get('search',None)
|
search = request.GET.get('search',None)
|
||||||
page = request.GET.get('page', 1)
|
page = request.GET.get('page', 1)
|
||||||
datepicker = request.GET.get('datepicker', None)
|
datepicker = request.GET.get('datepicker', None)
|
||||||
datepickerFin = request.GET.get('datepickerFin', None)
|
datepickerFin = request.GET.get('datepickerFin', None)
|
||||||
tipo = request.GET.get('tipo',None)
|
tipo = request.GET.get('tipo',None)
|
||||||
|
|
||||||
|
|
||||||
filters = {key:value for (key,value) in dict(request.GET).items() if value !=None}
|
filters = {key:value for (key,value) in dict(request.GET).items() if value !=None}
|
||||||
print('filters',filters)
|
|
||||||
if tipo:
|
if tipo:
|
||||||
lista = lista.filter(Q(tipo__icontains=search))
|
lista = lista.filter(Q(tipo__icontains=search))
|
||||||
|
|
||||||
if datepicker and datepickerFin:
|
if datepicker and datepickerFin:
|
||||||
inicio = [int(i) for i in datepicker.split("/")]
|
inicio = [int(i) for i in datepicker.split("/")]
|
||||||
fin = [int(i) for i in datepickerFin.split("/")]
|
fin = [int(i) for i in datepickerFin.split("/")]
|
||||||
inicio.sort(reverse=True)
|
inicio.sort(reverse=True)
|
||||||
fin.sort(reverse=True)
|
fin.sort(reverse=True)
|
||||||
start = datetime.date(inicio[0],inicio[2],inicio[1])
|
start = datetime.datetime(inicio[0],inicio[2],inicio[1])
|
||||||
end = datetime.date(fin[0],fin[2],fin[1])
|
start += datetime.timedelta(days=0)
|
||||||
end += datetime.timedelta(days=1)
|
end = datetime.datetime(fin[0],fin[2],fin[1])
|
||||||
print(start, end)
|
end += datetime.timedelta(days=1)
|
||||||
|
print('start',start, 'end',end)
|
||||||
|
|
||||||
lista = lista.filter(created_at__range=[start, end])
|
lista = lista.filter(created_at__range=[start, end])
|
||||||
|
|
||||||
conteo = lista.count()
|
conteo = lista.count()
|
||||||
pageFunc(page,lista,1)
|
pageFunc(page,lista,1)
|
||||||
|
|
||||||
@@ -124,8 +127,8 @@ def saldo_funct(request):
|
|||||||
Saldo.save()
|
Saldo.save()
|
||||||
except:
|
except:
|
||||||
Saldo = saldoModel.objects.create(saldo=int(timbres))
|
Saldo = saldoModel.objects.create(saldo=int(timbres))
|
||||||
|
|
||||||
return JsonResponse({'data':Saldo.saldo})
|
return JsonResponse({'data':Saldo.saldo})
|
||||||
|
|
||||||
|
|
||||||
class ClientesUpdateView(UserPassesTestMixin,LoginRequiredMixin,UpdateView):
|
class ClientesUpdateView(UserPassesTestMixin,LoginRequiredMixin,UpdateView):
|
||||||
|
|||||||
Reference in New Issue
Block a user