request from ComDig
This commit is contained in:
@@ -22,7 +22,6 @@ DEBUG = False
|
|||||||
|
|
||||||
ALLOWED_HOSTS = ['*']
|
ALLOWED_HOSTS = ['*']
|
||||||
|
|
||||||
|
|
||||||
# Application definition
|
# Application definition
|
||||||
|
|
||||||
INSTALLED_APPS = [
|
INSTALLED_APPS = [
|
||||||
@@ -39,8 +38,6 @@ INSTALLED_APPS = [
|
|||||||
'widget_tweaks',
|
'widget_tweaks',
|
||||||
'Admin',
|
'Admin',
|
||||||
'Clientes',
|
'Clientes',
|
||||||
|
|
||||||
|
|
||||||
]
|
]
|
||||||
SITE_ID = 1
|
SITE_ID = 1
|
||||||
MIDDLEWARE = [
|
MIDDLEWARE = [
|
||||||
|
|||||||
@@ -72,6 +72,5 @@ class Clientes(models.Model):
|
|||||||
year = today.year
|
year = today.year
|
||||||
return Timbres.objects.filter(rfcc=self.RFC, created_at__year=str(year),created_at__month=str(month)).count()
|
return Timbres.objects.filter(rfcc=self.RFC, created_at__year=str(year),created_at__month=str(month)).count()
|
||||||
class Meta:
|
class Meta:
|
||||||
ordering = ('-Activo','RFC',)
|
ordering = ('-Activo','-conteo_mes','RFC')
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -3,21 +3,18 @@ from asgiref.sync import sync_to_async
|
|||||||
from .models import saldoModel
|
from .models import saldoModel
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
async def req():
|
|
||||||
|
|
||||||
results = await sync_to_async(get_saldo, thread_sensitive=True)
|
|
||||||
|
|
||||||
def get_saldo(request):
|
def get_saldo(request):
|
||||||
try:
|
# try:
|
||||||
Saldo = saldoModel.objects.first()
|
# Saldo = saldoModel.objects.first()
|
||||||
except:
|
# except:
|
||||||
pass
|
# pass
|
||||||
if not Saldo :
|
# if not Saldo :
|
||||||
Saldo = saldoModel.objects.create(saldo=1)
|
# Saldo = saldoModel.objects.create(saldo=1)
|
||||||
Saldo.save()
|
# 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 {
|
return {
|
||||||
'saldo':Saldo,
|
'saldo':r.text,
|
||||||
'fecha': datetime.date.today()
|
'fecha': datetime.date.today()
|
||||||
}
|
}
|
||||||
@@ -129,46 +129,6 @@ def send_timbres_Email(request):
|
|||||||
|
|
||||||
return redirect('index')
|
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
|
@login_required
|
||||||
def index(request):
|
def index(request):
|
||||||
|
|
||||||
@@ -334,7 +294,7 @@ def export_Excel(request):
|
|||||||
|
|
||||||
RFC = request.GET.get('RFC', None)
|
RFC = request.GET.get('RFC', None)
|
||||||
mes = request.GET.get('mes',None)
|
mes = request.GET.get('mes',None)
|
||||||
print('AQUIIIIIIIIIIIIIIII')
|
|
||||||
today = datetime.date.today()
|
today = datetime.date.today()
|
||||||
month = today.month
|
month = today.month
|
||||||
year = today.year
|
year = today.year
|
||||||
@@ -380,9 +340,7 @@ def export_Excel(request):
|
|||||||
for q,qq in enumerate(objeto_a_trabajar,start=2):
|
for q,qq in enumerate(objeto_a_trabajar,start=2):
|
||||||
ws['A' + str(q)] = qq.RFC
|
ws['A' + str(q)] = qq.RFC
|
||||||
ws['B'+ str(q)] = qq.Nombre
|
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"
|
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")
|
response = HttpResponse(content_type="application/ms-excel")
|
||||||
contenido = "attachment; filename = {0}".format(nombre_archivo)
|
contenido = "attachment; filename = {0}".format(nombre_archivo)
|
||||||
@@ -391,7 +349,7 @@ def export_Excel(request):
|
|||||||
|
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
@sync_to_async(thread_sensitive=False)
|
||||||
def check_active_RFC(request):
|
def check_active_RFC(request):
|
||||||
rfc = request.GET.get('RFC', None)
|
rfc = request.GET.get('RFC', None)
|
||||||
cliente = get_object_or_404(Clientes, RFC=rfc)
|
cliente = get_object_or_404(Clientes, RFC=rfc)
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
{% block title %}Timbres{% endblock title %}
|
{% block title %}Timbres{% endblock title %}
|
||||||
|
|
||||||
{% block titlePage %}
|
{% block titlePage %}
|
||||||
Timbres disponibles Comercio Digital: {{saldo.saldo}}
|
Timbres disponibles Comercio Digital: {{saldo}}
|
||||||
{% endblock titlePage %}
|
{% endblock titlePage %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|||||||
Reference in New Issue
Block a user