From 4072b132879d571c5672ea1da86b1bf8e1d28acf Mon Sep 17 00:00:00 2001
From: Andrew Cormick-Dockery <andrew.cormick-dockery@greens.org.au>
Date: Wed, 31 Aug 2016 02:47:23 +0000
Subject: [PATCH] CRM-16558 - Remove Update Subscription URL link from
 recurring contribution emails when not available

---
 .../contribution_recurring_notify_html.tpl    | 24 +++++++++++--------
 .../contribution_recurring_notify_text.tpl    |  4 ++++
 .../membership_online_receipt_html.tpl        | 12 ++++++----
 .../membership_online_receipt_text.tpl        |  2 ++
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/xml/templates/message_templates/contribution_recurring_notify_html.tpl b/xml/templates/message_templates/contribution_recurring_notify_html.tpl
index f7b6387c81..3ed5eb713e 100644
--- a/xml/templates/message_templates/contribution_recurring_notify_html.tpl
+++ b/xml/templates/message_templates/contribution_recurring_notify_html.tpl
@@ -42,11 +42,13 @@
          {ts 1=$cancelSubscriptionUrl}This membership will be renewed automatically. You can cancel the auto-renewal option by <a href="%1">visiting this web page</a>.{/ts}
         </td>
        </tr>
-       <tr>
-        <td {$labelStyle}>
-         {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href="%1">visiting this web page</a>.{/ts}
-        </td>
-       </tr>
+       {if $updateSubscriptionBillingUrl}
+         <tr>
+          <td {$labelStyle}>
+           {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href="%1">visiting this web page</a>.{/ts}
+          </td>
+         </tr>
+       {/if}
      {else}
       <tr>
        <td>
@@ -60,13 +62,15 @@
          {ts 1=$cancelSubscriptionUrl} You can cancel the recurring contribution option by <a href="%1">visiting this web page</a>.{/ts}
         </td>
       </tr>
+      {if $updateSubscriptionBillingUrl}
+        <tr>
+          <td {$labelStyle}>
+           {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href="%1">visiting this web page</a>.{/ts}
+          </td>
+        </tr>
+      {/if}
       <tr>
         <td {$labelStyle}>
-         {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href="%1">visiting this web page</a>.{/ts}
-        </td>
-       </tr>
-       <tr>
-        <td {$labelStyle}>
    {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments details for this recurring contribution by <a href="%1">visiting this web page</a>.{/ts}
         </td>
        </tr>
diff --git a/xml/templates/message_templates/contribution_recurring_notify_text.tpl b/xml/templates/message_templates/contribution_recurring_notify_text.tpl
index 6146808ce2..46aa380a37 100644
--- a/xml/templates/message_templates/contribution_recurring_notify_text.tpl
+++ b/xml/templates/message_templates/contribution_recurring_notify_text.tpl
@@ -9,8 +9,10 @@
 
 {ts 1=$cancelSubscriptionUrl}This membership will be renewed automatically. You can cancel the auto-renewal option by <a href="%1">visiting this web page</a>.{/ts}
 
+{if $updateSubscriptionBillingUrl}
 {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href="%1">visiting this web page</a>.{/ts}
 
+{/if}
 {else}
 {ts}Thanks for your recurring contribution sign-up.{/ts}
 
@@ -21,8 +23,10 @@
 
 {ts 1=$cancelSubscriptionUrl}You can cancel the recurring contribution option by <a href="%1">visiting this web page</a>.{/ts}
 
+{if $updateSubscriptionBillingUrl}
 {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href="%1">visiting this web page</a>.{/ts}
 
+{/if}
 {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments for this recurring contribution by <a href="%1">visiting this web page</a>.{/ts}
 {/if}
 
diff --git a/xml/templates/message_templates/membership_online_receipt_html.tpl b/xml/templates/message_templates/membership_online_receipt_html.tpl
index fe5052fb90..37328e7c1a 100644
--- a/xml/templates/message_templates/membership_online_receipt_html.tpl
+++ b/xml/templates/message_templates/membership_online_receipt_html.tpl
@@ -322,11 +322,13 @@
          {ts 1=$cancelSubscriptionUrl}This membership will be renewed automatically. You can cancel the auto-renewal option by <a href="%1">visiting this web page</a>.{/ts}
         </td>
        </tr>
-       <tr>
-        <td colspan="2" {$labelStyle}>
-         {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href="%1">visiting this web page</a>.{/ts}
-        </td>
-       </tr>
+       {if $updateSubscriptionBillingUrl}
+         <tr>
+          <td colspan="2" {$labelStyle}>
+           {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href="%1">visiting this web page</a>.{/ts}
+          </td>
+         </tr>
+       {/if}
       {/if}
      {/if}
 
diff --git a/xml/templates/message_templates/membership_online_receipt_text.tpl b/xml/templates/message_templates/membership_online_receipt_text.tpl
index 7fba59ab12..dceb1157eb 100644
--- a/xml/templates/message_templates/membership_online_receipt_text.tpl
+++ b/xml/templates/message_templates/membership_online_receipt_text.tpl
@@ -118,10 +118,12 @@
 {if $is_recur}
 {if $contributeMode eq 'notify' or $contributeMode eq 'directIPN'}
 {ts 1=$cancelSubscriptionUrl}This membership will be renewed automatically. You can cancel the auto-renewal option by visiting this web page: %1.{/ts}
+{if $updateSubscriptionBillingUrl}
 
 {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href="%1">visiting this web page</a>.{/ts}
 {/if}
 {/if}
+{/if}
 
 {if $honor_block_is_active }
 ===========================================================
-- 
2.25.1