From 2ead22209004bb1882bd0cd3f67993dcea7192ca Mon Sep 17 00:00:00 2001
From: Ameya Shenoy <shenoy.ameya@gmail.com>
Date: Mon, 5 Nov 2018 10:49:18 +0530
Subject: [PATCH] fix(email): Email status changes to Read (#6396)

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>
---
 frappe/email/queue.py                                  | 5 +----
 frappe/public/js/frappe/form/footer/timeline_item.html | 2 +-
 frappe/templates/emails/email_footer.html              | 6 +++++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/frappe/email/queue.py b/frappe/email/queue.py
index 9fbf01eb60..c06a7fb79b 100755
--- a/frappe/email/queue.py
+++ b/frappe/email/queue.py
@@ -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}
diff --git a/frappe/public/js/frappe/form/footer/timeline_item.html b/frappe/public/js/frappe/form/footer/timeline_item.html
index c25fb696b4..92f039b4e4 100755
--- a/frappe/public/js/frappe/form/footer/timeline_item.html
+++ b/frappe/public/js/frappe/form/footer/timeline_item.html
@@ -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";
diff --git a/frappe/templates/emails/email_footer.html b/frappe/templates/emails/email_footer.html
index 5352d817d5..4ad6cb23b5 100644
--- a/frappe/templates/emails/email_footer.html
+++ b/frappe/templates/emails/email_footer.html
@@ -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>
\ No newline at end of file
+</div>