From 841e8168e09ed6480022e888bbd6686b6353b0ff Mon Sep 17 00:00:00 2001 From: Celestino Rey Date: Fri, 17 May 2024 12:23:00 +0200 Subject: [PATCH] =?UTF-8?q?Quito=20la=20variable=20para=20enviar=20correos?= =?UTF-8?q?=20o=20no.=20Siempre=20se=20env=C3=ADan.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Padel/.env.dev | 1 - Padel/.env.prod | 1 - Padel/buildConCompose.sh | 2 +- Padel/buildConComposeProd.sh | 2 +- Padel/servicios/padel/__init__.py | 3 --- Padel/servicios/padel/reservas.py | 11 +++-------- 6 files changed, 5 insertions(+), 15 deletions(-) diff --git a/Padel/.env.dev b/Padel/.env.dev index c94dd11..b9a61b5 100644 --- a/Padel/.env.dev +++ b/Padel/.env.dev @@ -12,4 +12,3 @@ MAIL_PASSWORD = 'xUp7bax8knAVwi' MAIL_USE_TLS = 'False' MAIL_USE_SSL = 'True' -ENVIA_MAIL = 'True' \ No newline at end of file diff --git a/Padel/.env.prod b/Padel/.env.prod index c94dd11..b9a61b5 100644 --- a/Padel/.env.prod +++ b/Padel/.env.prod @@ -12,4 +12,3 @@ MAIL_PASSWORD = 'xUp7bax8knAVwi' MAIL_USE_TLS = 'False' MAIL_USE_SSL = 'True' -ENVIA_MAIL = 'True' \ No newline at end of file diff --git a/Padel/buildConCompose.sh b/Padel/buildConCompose.sh index 0cb3c15..be0e24b 100644 --- a/Padel/buildConCompose.sh +++ b/Padel/buildConCompose.sh @@ -1,3 +1,3 @@ -docker-compose down -v +docker-compose down docker rmi padel_padel docker-compose up -d --build \ No newline at end of file diff --git a/Padel/buildConComposeProd.sh b/Padel/buildConComposeProd.sh index ef3ca8f..84ab48d 100644 --- a/Padel/buildConComposeProd.sh +++ b/Padel/buildConComposeProd.sh @@ -1,3 +1,3 @@ -docker-compose -f docker-compose.prod.yml down -v +docker-compose -f docker-compose.prod.yml down docker rmi padel_padel docker-compose -f docker-compose.prod.yml up -d --build \ No newline at end of file diff --git a/Padel/servicios/padel/__init__.py b/Padel/servicios/padel/__init__.py index 98fbf81..fbb3d9d 100644 --- a/Padel/servicios/padel/__init__.py +++ b/Padel/servicios/padel/__init__.py @@ -48,9 +48,6 @@ def create_app(): print(f"Using Database: {app.config.get('DATABASE')}") print("MAIL_USERNAME: ", os.getenv("MAIL_USERNAME")) - my_env = os.getenv("ENVIA_MAIL", 'False').lower() in ('true', '1', 't') - - print(f"Enviar emails: ", my_env) return app diff --git a/Padel/servicios/padel/reservas.py b/Padel/servicios/padel/reservas.py index f79afa3..495ee00 100644 --- a/Padel/servicios/padel/reservas.py +++ b/Padel/servicios/padel/reservas.py @@ -78,14 +78,9 @@ def actualizar_reserva(id): ) db.commit() - enviar_correos = os.getenv("ENVIA_MAIL", 'False').lower() in ('true', '1', 't') - - print(f"Sending emails: ", enviar_correos) - - if enviar_correos == True: - msg = Message('Reserva de pista de padel confirmada', sender='celestino_rey@ymail.com', recipients=[current_user.email]) - msg.body = "Hola, " + current_user.name + " te confirmo que has reservado la pista de Devesa Park" - mail.send(msg) + msg = Message('Reserva de pista de padel confirmada', sender='celestino_rey@ymail.com', recipients=[current_user.email]) + msg.body = "Hola, " + current_user.name + " te confirmo que has reservado la pista de Devesa Park" + mail.send(msg) return redirect(url_for('reservas.misreservas'))