From b12ff5d427427950819e0e8883fc15b10bc67e68 Mon Sep 17 00:00:00 2001 From: fjrodriguez Date: Fri, 9 Dec 2022 15:18:47 -0600 Subject: [PATCH] request from ComDig --- Admin/settings.py | 3 --- Clientes/models.py | 3 +-- Clientes/saldo_context_proc.py | 23 +++++++--------- Clientes/views.py | 48 +++------------------------------- Templates/Clientes/index.html | 2 +- 5 files changed, 15 insertions(+), 64 deletions(-) diff --git a/Admin/settings.py b/Admin/settings.py index c7c8e99..3525f70 100644 --- a/Admin/settings.py +++ b/Admin/settings.py @@ -22,7 +22,6 @@ DEBUG = False ALLOWED_HOSTS = ['*'] - # Application definition INSTALLED_APPS = [ @@ -39,8 +38,6 @@ INSTALLED_APPS = [ 'widget_tweaks', 'Admin', 'Clientes', - - ] SITE_ID = 1 MIDDLEWARE = [ diff --git a/Clientes/models.py b/Clientes/models.py index 436377b..d6ef6cf 100644 --- a/Clientes/models.py +++ b/Clientes/models.py @@ -72,6 +72,5 @@ class Clientes(models.Model): year = today.year return Timbres.objects.filter(rfcc=self.RFC, created_at__year=str(year),created_at__month=str(month)).count() class Meta: - ordering = ('-Activo','RFC',) - + ordering = ('-Activo','-conteo_mes','RFC') diff --git a/Clientes/saldo_context_proc.py b/Clientes/saldo_context_proc.py index ae21c20..d1f180f 100644 --- a/Clientes/saldo_context_proc.py +++ b/Clientes/saldo_context_proc.py @@ -3,21 +3,18 @@ from asgiref.sync import sync_to_async from .models import saldoModel import datetime -async def req(): - - results = await sync_to_async(get_saldo, thread_sensitive=True) - def get_saldo(request): - try: - Saldo = saldoModel.objects.first() - except: - pass - if not Saldo : - Saldo = saldoModel.objects.create(saldo=1) - Saldo.save() + # try: + # Saldo = saldoModel.objects.first() + # except: + # pass + # if not Saldo : + # Saldo = saldoModel.objects.create(saldo=1) + # Saldo.save() - #r = requests.get('https://app2.comercio-digital.mx/x3/saldo?usr=SCT050708AD1&pwd=0dcu2SwCv',verify=False) + r = requests.get('https://app2.comercio-digital.mx/x3/saldo?usr=SCT050708AD1&pwd=0dcu2SwCv') + #print('resp:',r.text, dir(r)) return { - 'saldo':Saldo, + 'saldo':r.text, 'fecha': datetime.date.today() } \ No newline at end of file diff --git a/Clientes/views.py b/Clientes/views.py index 3cfa18f..337fc13 100644 --- a/Clientes/views.py +++ b/Clientes/views.py @@ -129,46 +129,6 @@ def send_timbres_Email(request): return redirect('index') - - - - -# def send_timbres_Email(request): -# RFC = request.GET.get('RFC', None) -# mes = request.GET.get('mes', None) -# today = datetime.date.today() - -# if mes is None or mes =='None': -# mes = today.month -# url = request.build_absolute_uri().split('/')[:-2] -# url = '/'.join(url) -# url = os.path.join(url, 'get_timbres_xls') -# print(f'URL:{url}') - -# h = requests.get(f'{url}/?RFC={RFC}&mes={mes}', allow_redirects=True) -# header =h.headers -# content_dispo = h.headers.get('content-disposition') -# fname = re.findall('filename = (.+)',content_dispo) -# fname = fname[0] -# fname = fname.split('.')[0] -# fname = f'{fname}.xls' -# fname = fname.replace('_','') -# print('fname: ',fname) - -# Cli = Clientes.objects.get(RFC=RFC) -# subject = f'Timbres del Mes:{mes} RFC:{RFC}' -# message = 'Envio de timbres por AS_Admin' -# email = Cli.email - -# files = BytesIO(h.content) -# try: -# mail = EmailMessage(subject,message,settings.EMAIL_HOST_USER,[email]) -# mail.attach(filename='timbres.xls',content=files.getbuffer(),mimetype='application/vnd.ms-excel') -# mail.send() -# print('SE armo') -# except: -# print('Error ') -# return redirect('index') @login_required def index(request): @@ -334,7 +294,7 @@ def export_Excel(request): RFC = request.GET.get('RFC', None) mes = request.GET.get('mes',None) - print('AQUIIIIIIIIIIIIIIII') + today = datetime.date.today() month = today.month year = today.year @@ -380,9 +340,7 @@ def export_Excel(request): for q,qq in enumerate(objeto_a_trabajar,start=2): ws['A' + str(q)] = qq.RFC ws['B'+ str(q)] = qq.Nombre - ws['C'+ str(q)] = qq.conteo_mes - - + ws['C'+ str(q)] = qq.conteo_mes nombre_archivo = f"Timbres_{RFC if RFC is not None else 'Clientes_MES'}_{str(mes)}_AÑO_{str(year)}.xlsx" response = HttpResponse(content_type="application/ms-excel") contenido = "attachment; filename = {0}".format(nombre_archivo) @@ -391,7 +349,7 @@ def export_Excel(request): return response - +@sync_to_async(thread_sensitive=False) def check_active_RFC(request): rfc = request.GET.get('RFC', None) cliente = get_object_or_404(Clientes, RFC=rfc) diff --git a/Templates/Clientes/index.html b/Templates/Clientes/index.html index 49b6090..370d2cc 100644 --- a/Templates/Clientes/index.html +++ b/Templates/Clientes/index.html @@ -4,7 +4,7 @@ {% block title %}Timbres{% endblock title %} {% block titlePage %} -Timbres disponibles Comercio Digital: {{saldo.saldo}} +Timbres disponibles Comercio Digital: {{saldo}} {% endblock titlePage %} {% block content %}