Commit 5a55a6c6 authored by Robin Trioux's avatar Robin Trioux
Browse files

E-ticket link is sent in the email

parent 65c3483c
Pipeline #2087 failed with stage
in 42 minutes and 8 seconds
...@@ -490,7 +490,7 @@ class Selling(models.Model): ...@@ -490,7 +490,7 @@ class Selling(models.Model):
event = self.product.eticket.event_title or _("Unknown event") event = self.product.eticket.event_title or _("Unknown event")
subject = _("Eticket bought for the event %(event)s") % {"event": event} subject = _("Eticket bought for the event %(event)s") % {"event": event}
message_html = _( message_html = _(
"You bought an eticket for the event %(event)s.\nYou can download it on this page %(url)s." "You bought an eticket for the event %(event)s.\nYou can download it directly from this link %(eticket)s.\nYou can also retreive all your e-tickets on your account page %(url)s."
) % { ) % {
"event": event, "event": event,
"url": "".join( "url": "".join(
...@@ -502,10 +502,15 @@ class Selling(models.Model): ...@@ -502,10 +502,15 @@ class Selling(models.Model):
"</a>", "</a>",
) )
), ),
"eticket": "<a href=\"" + self.get_eticket_full_url() + "\">" + self.get_eticket_full_url() + "</a>"
} }
message_txt = _( message_txt = _(
"You bought an eticket for the event %(event)s.\nYou can download it on this page %(url)s." "You bought an eticket for the event %(event)s.\nYou can download it directly from this link %(eticket)s.\nYou can also retreive all your e-tickets on your account page %(url)s."
) % {"event": event, "url": self.customer.get_full_url()} ) % {
"event": event,
"url": self.customer.get_full_url(),
"eticket": "<a href=\"" + self.get_eticket_full_url() + "\">" + self.get_eticket_full_url() + "</a>"
}
self.customer.user.email_user(subject, message_txt, html_message=message_html) self.customer.user.email_user(subject, message_txt, html_message=message_html)
def save(self, allow_negative=False, *args, **kwargs): def save(self, allow_negative=False, *args, **kwargs):
...@@ -568,11 +573,6 @@ class Selling(models.Model): ...@@ -568,11 +573,6 @@ class Selling(models.Model):
start=sub.subscription_start, start=sub.subscription_start,
) )
sub.save() sub.save()
try:
if self.product.eticket:
self.send_mail_customer()
except:
pass
if self.customer.user.preferences.notify_on_click: if self.customer.user.preferences.notify_on_click:
Notification( Notification(
user=self.customer.user, user=self.customer.user,
...@@ -588,6 +588,20 @@ class Selling(models.Model): ...@@ -588,6 +588,20 @@ class Selling(models.Model):
type="SELLING", type="SELLING",
).save() ).save()
super(Selling, self).save(*args, **kwargs) super(Selling, self).save(*args, **kwargs)
try:
# The product has no id until it's saved
if self.product.eticket:
self.send_mail_customer()
except:
pass
def get_eticket_full_url(self):
eticket_url = reverse("counter:eticket_pdf", kwargs={"selling_id": self.id})
return "".join(
[
"https://", settings.SITH_URL, eticket_url
]
)
class Permanency(models.Model): class Permanency(models.Model):
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment