vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(email): Email status changes to Read (#6396)

Browse source 
The email recieved template was in unsubscribe email. Hence it
didn't used to function in case the emails were sent from DocTypes
like Issue, wherein the unsubscribe email template is not used.
Moved it to email_footer template.

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
This commit is contained in:
Ameya Shenoy 2018-11-05 10:49:18 +05:30 • committed by Rushabh Mehta
parent 6bbb84f9c3
commit 2ead222090
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/email/queue.py
View file

@ -276,10 +276,7 @@ def get_unsubscribe_message(unsubscribe_message, expose_recipients):
target="_blank">{0}</a>'''.format(_('Unsubscribe'))
unsubscribe_html = _("{0} to stop receiving emails of this type").format(unsubscribe_link)
html = """<div class="email-pixel">
<!--email open check-->
</div>
<div class="email-unsubscribe">
html = """<div class="email-unsubscribe">
<!--cc message-->
<div>
{0}

2
frappe/public/js/frappe/form/footer/timeline_item.html
View file

@ -67,7 +67,7 @@
var indicator_class = "green";
} else if (data.delivery_status === "Sending") {
var indicator_class = "orange";
} else if (in_list("Opened", "Read", data.delivery_status)) {
} else if (in_list(["Opened", "Read"], data.delivery_status)) {
var indicator_class = "blue";
} else {
var indicator_class = "red";

6
frappe/templates/emails/email_footer.html
View file

@ -17,6 +17,10 @@
<!--unsubscribe link here-->
<div class="email-pixel">
<!--email open check-->
</div>
<!-- default_mail_footer -->
{% if default_mail_footer %}
<div class="default-mail-footer">
@ -26,4 +30,4 @@
</div>
{% endif %}
</div>
</div>