From b7a0ac332326576ce1fb72b19ee7f6754a1fc5fe Mon Sep 17 00:00:00 2001
From: Daniel Palafox <dp852@hotmail.com>
Date: Tue, 15 Aug 2023 00:14:30 +0700
Subject: [PATCH] fix: Remove duplicated email in claim reminder email

---
 .../org/orcid/core/template/claim_reminder_email.ftl       | 6 +++++-
 .../org/orcid/core/template/claim_reminder_email_html.ftl  | 7 ++++++-
 .../org/orcid/core/template/new_claim_reminder_email.ftl   | 6 +++++-
 .../orcid/core/template/new_claim_reminder_email_html.ftl  | 7 ++++++-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/orcid-core/src/main/resources/org/orcid/core/template/claim_reminder_email.ftl b/orcid-core/src/main/resources/org/orcid/core/template/claim_reminder_email.ftl
index 68192613c91..ff5172aedda 100644
--- a/orcid-core/src/main/resources/org/orcid/core/template/claim_reminder_email.ftl
+++ b/orcid-core/src/main/resources/org/orcid/core/template/claim_reminder_email.ftl
@@ -23,4 +23,8 @@ ${verificationUrl}?lang=${locale}
 ${baseUri}/home?lang=${locale}
 
 <@emailMacros.msg "email.api_record_creation.you_have_received.1" />${baseUri}/home?lang=${locale}S<@emailMacros.msg "email.api_record_creation.you_have_received.2" />
-<#include "email_footer.ftl"/>
+<@emailMacros.msg "email.common.email.preferences" /> (${baseUri}/account)
+<@emailMacros.msg "email.common.privacy_policy" /> (${baseUri}/privacy-policy)
+<@emailMacros.msg "email.common.address1" />
+
+<@emailMacros.msg "email.common.address2" />
diff --git a/orcid-core/src/main/resources/org/orcid/core/template/claim_reminder_email_html.ftl b/orcid-core/src/main/resources/org/orcid/core/template/claim_reminder_email_html.ftl
index 4e916de0d0a..9c586c61e5a 100644
--- a/orcid-core/src/main/resources/org/orcid/core/template/claim_reminder_email_html.ftl
+++ b/orcid-core/src/main/resources/org/orcid/core/template/claim_reminder_email_html.ftl
@@ -46,7 +46,12 @@
 				<@emailMacros.msg "email.common.you_have_received_this_email" />
 			</p>
 			<p style="font-family: arial,  helvetica, sans-serif;font-size: 15px;color: #494A4C;">
-			   <#include "email_footer_html.ftl"/>
+				<small>
+					<a href="${baseUri}/account" target="_blank" style="color: #2E7F9F;"><@emailMacros.msg "email.common.email.preferences" /></a>
+					| <a href="${baseUri}/privacy-policy" target="_blank" style="color: #2E7F9F;"><@emailMacros.msg "email.common.privacy_policy" /></a>
+					| <@emailMacros.msg "email.common.address1" /><@emailMacros.space />|<@emailMacros.space /><@emailMacros.msg "email.common.address2" />
+					| <a href="${baseUri}" target="_blank" style="color: #2E7F9F;">ORCID.org</a>
+				</small>
 			</p>
 		 </div>
 	 </body>
diff --git a/orcid-core/src/main/resources/org/orcid/core/template/new_claim_reminder_email.ftl b/orcid-core/src/main/resources/org/orcid/core/template/new_claim_reminder_email.ftl
index 19bccf04246..08a169222c3 100644
--- a/orcid-core/src/main/resources/org/orcid/core/template/new_claim_reminder_email.ftl
+++ b/orcid-core/src/main/resources/org/orcid/core/template/new_claim_reminder_email.ftl
@@ -23,4 +23,8 @@ ${verificationUrl}?lang=${locale}
 ${baseUri}/home?lang=${locale}
 
 <@emailMacros.msg "email.api_record_creation.you_have_received.1" />${baseUri}/home?lang=${locale}S<@emailMacros.msg "email.api_record_creation.you_have_received.2" />
-<#include "email_footer.ftl"/>
+<@emailMacros.msg "email.common.email.preferences" /> (${baseUri}/account)
+<@emailMacros.msg "email.common.privacy_policy" /> (${baseUri}/privacy-policy)
+<@emailMacros.msg "email.common.address1" />
+
+<@emailMacros.msg "email.common.address2" />
diff --git a/orcid-core/src/main/resources/org/orcid/core/template/new_claim_reminder_email_html.ftl b/orcid-core/src/main/resources/org/orcid/core/template/new_claim_reminder_email_html.ftl
index b0de2db45d9..87611e3709c 100644
--- a/orcid-core/src/main/resources/org/orcid/core/template/new_claim_reminder_email_html.ftl
+++ b/orcid-core/src/main/resources/org/orcid/core/template/new_claim_reminder_email_html.ftl
@@ -44,7 +44,12 @@
 				<@emailMacros.msg "email.common.you_have_received_this_email" />
 			</p>
 			<p style="font-family: arial,  helvetica, sans-serif;font-size: 15px;color: #494A4C;">
-			   <#include "email_footer_html.ftl"/>
+				<small>
+					<a href="${baseUri}/account" target="_blank" style="color: #2E7F9F;"><@emailMacros.msg "email.common.email.preferences" /></a>
+					| <a href="${baseUri}/privacy-policy" target="_blank" style="color: #2E7F9F;"><@emailMacros.msg "email.common.privacy_policy" /></a>
+					| <@emailMacros.msg "email.common.address1" /><@emailMacros.space />|<@emailMacros.space /><@emailMacros.msg "email.common.address2" />
+					| <a href="${baseUri}" target="_blank" style="color: #2E7F9F;">ORCID.org</a>
+				</small>
 			</p>
 		 </div>
 	 </body>