mirror of
https://framagit.org/la-chariotte/la-chariotte.git
synced 2025-05-04 21:02:01 +02:00
Merge branch 'fix-email-crash' into 'develop'
fix: Allow disabling email so ordering doesn't crash See merge request la-chariotte/la-chariotte!131
This commit is contained in:
commit
e82e0d4e3d
3 changed files with 11 additions and 1 deletions
|
@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
|
||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
|
||||||
since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## UNRELEASED (XXXX-YY-ZZ)
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- `EMAIL_ENABLE` setting (True/False) allows completely disabling of email sending
|
||||||
|
|
||||||
## 1.3.0 (2024-11-02)
|
## 1.3.0 (2024-11-02)
|
||||||
|
|
||||||
This is a small release, with a few features and bugfixes. The code is now
|
This is a small release, with a few features and bugfixes. The code is now
|
||||||
|
|
|
@ -22,4 +22,7 @@ def send_order_confirmation_mail(order):
|
||||||
from_email = settings.DEFAULT_FROM_EMAIL
|
from_email = settings.DEFAULT_FROM_EMAIL
|
||||||
to = order.author.email
|
to = order.author.email
|
||||||
|
|
||||||
mail.send_mail(subject, plain_message, from_email, [to], html_message=html_message)
|
if settings.EMAIL_ENABLE:
|
||||||
|
mail.send_mail(
|
||||||
|
subject, plain_message, from_email, [to], html_message=html_message
|
||||||
|
)
|
||||||
|
|
|
@ -174,6 +174,7 @@ if SENTRY_DSN:
|
||||||
)
|
)
|
||||||
|
|
||||||
# Email settings
|
# Email settings
|
||||||
|
EMAIL_ENABLE = True
|
||||||
EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
|
EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
|
||||||
EMAIL_HOST = os.getenv("EMAIL_HOST")
|
EMAIL_HOST = os.getenv("EMAIL_HOST")
|
||||||
EMAIL_PORT = int(os.getenv("EMAIL_PORT", "587"))
|
EMAIL_PORT = int(os.getenv("EMAIL_PORT", "587"))
|
||||||
|
|
Loading…
Reference in a new issue