From c908a21433395aade3d3d2085cd1099787a58afe Mon Sep 17 00:00:00 2001
From: Phuoc CAO
Date: Mon, 15 May 2023 17:48:37 +0200
Subject: [PATCH] fixed admin email in production.ini
---
mondumas/views/devis.py | 2 +-
mondumas/views/utils.py | 4 ++--
production.ini | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mondumas/views/devis.py b/mondumas/views/devis.py
index 9fe9458..5a2bb4b 100644
--- a/mondumas/views/devis.py
+++ b/mondumas/views/devis.py
@@ -191,7 +191,7 @@ def devis_web(request):
os.remove(dest)
# on est en developpement ou en production
- if request.registry.settings["mondumas.admin_email"] == "sasdumas@entreprise-dumas.com":
+ if request.registry.settings["mondumas.admin_email"].find('@entreprise-dumas.com') > 0:
origin = 'https://gestion.entreprise-dumas.com/devis_preview/%s' % nodevis
pdfkit.from_url(origin, dest, options=options)
else:
diff --git a/mondumas/views/utils.py b/mondumas/views/utils.py
index aca88ad..3f0684c 100644
--- a/mondumas/views/utils.py
+++ b/mondumas/views/utils.py
@@ -128,7 +128,7 @@ def email_rappels(request, objet, corps, destinataire, societe):
if soc:
expediteur = soc.email_from
else:
- expediteur = "peinture@entreprise-dumas.com"
+ expediteur = "peinture-dumas@entreprise-dumas.com"
# envoyer le rappel
error = send_mail(request, expediteur, destinataire, "[Ent. Dumas] " + objet, corps)
@@ -148,7 +148,7 @@ def email_rapport(request):
corps += "
=============================================
"
expediteur = request.registry.settings['mondumas.admin_email']
- destinataire = ["phuoc@caotek.fr","peinture@entreprise-dumas.com"]
+ destinataire = ["phuoc@caotek.fr","peinture-dumas@entreprise-dumas.com"]
send_mail(request, expediteur, destinataire, "[DEV_NUIT] Rapport des traitements de nuit", corps)
return
diff --git a/production.ini b/production.ini
index 04f6292..f05beb9 100644
--- a/production.ini
+++ b/production.ini
@@ -20,7 +20,7 @@ pyramid.includes =
sqlalchemy.url = mysql://phuoc:phuoc!@192.168.0.31/bddevfac?charset=utf8
sqlalchemy.pool_recycle = 3600
-mondumas.admin_email = sasdumas@entreprise-dumas.com
+mondumas.admin_email = peinture-dumas@entreprise-dumas.com
mondumas.devfac_url = mondumas:static/DEVFAC/DOCS_ATTACHES/
mondumas.devfac_dir = /DEVFAC14/DOCS_ATTACHES