fix conflict
This commit is contained in:
@@ -9,7 +9,8 @@ from django.core.mail import EmailMultiAlternatives
|
||||
from django.utils.html import format_html
|
||||
from backend.core.utils import generate_first_page_image
|
||||
from email.mime.image import MIMEImage
|
||||
|
||||
from django.conf import settings
|
||||
site_domain = settings.SITE_DOMAIN
|
||||
|
||||
def send_confirmation_email(email):
|
||||
confirmation, created = EmailConfirmation.objects.get_or_create(email=email)
|
||||
@@ -19,7 +20,7 @@ def send_confirmation_email(email):
|
||||
confirmation.created_at = now()
|
||||
confirmation.save()
|
||||
|
||||
confirmation_link = f"http://127.0.0.1:8000{reverse('confirm_email', args=[confirmation.uuid])}"
|
||||
confirmation_link = f"{site_domain}{reverse('confirm_email', args=[confirmation.uuid])}"
|
||||
|
||||
send_mail(
|
||||
subject="Confirm your e-mail address",
|
||||
@@ -32,7 +33,7 @@ def send_payment_email(email):
|
||||
organization = Organization.objects.get(email=email)
|
||||
document = Document.objects.get(organization=organization)
|
||||
|
||||
payment_link = f"http://127.0.0.1:8000{reverse('core:payment_page')}?email={email}"
|
||||
payment_link = f"{site_domain}{reverse('core:payment_page')}?email={email}"
|
||||
|
||||
send_mail(
|
||||
subject="Complete your payment",
|
||||
|
||||
Reference in New Issue
Block a user