Fix recent breakage on membershipBlock.tpl

This was a recent commit of mine that I was working on at the airport.
I meant to come back to it landside but it got merged before I did,
with the result that we merged it in a broken state.

This fixes

diff --git a/templates/CRM/Contribute/Form/Contribution/MainMembershipBlock.tpl b/templates/CRM/Contribute/Form/Contribution/MainMembershipBlock.tpl
index 69b5c0788cbd6f27f71aff30135f6a2eddc853b2..414e004e8e0df28c9df6ba3c046a27c1c1fd34d7 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution/MainMembershipBlock.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/MainMembershipBlock.tpl
@@ -8,47 +8,48 @@
  +--------------------------------------------------------------------+
 *}
 <div id="membership" class="crm-group membership-group">
+    {if TRUE}
       <div id="priceset">
         <fieldset>
-          {if $renewal_mode}
-            {if $membershipBlock.renewal_title}
-              <legend>{$membershipBlock.renewal_title}</legend>
-            {/if}
-            {if $membershipBlock.renewal_text}
-              <div id="membership-intro" class="crm-section membership_renewal_intro-section">
-                {$membershipBlock.renewal_text}
-              </div>
-            {/if}
-          {else}
-            {if $membershipBlock.new_title}
-              <legend>{$membershipBlock.new_title}</legend>
-            {/if}
-            {if $membershipBlock.new_text}
-              <div id="membership-intro" class="crm-section membership_new_intro-section">
-                {$membershipBlock.new_text}
-              </div>
+            {if $renewal_mode}
+                {if $membershipBlock.renewal_title}
+                  <legend>{$membershipBlock.renewal_title}</legend>
+                {/if}
+                {if $membershipBlock.renewal_text}
+                  <div id="membership-intro" class="crm-section membership_renewal_intro-section">
+                      {$membershipBlock.renewal_text}
+                  </div>
+                {/if}
+            {else}
+                {if $membershipBlock.new_title}
+                  <legend>{$membershipBlock.new_title}</legend>
+                {/if}
+                {if $membershipBlock.new_text}
+                  <div id="membership-intro" class="crm-section membership_new_intro-section">
+                      {$membershipBlock.new_text}
+                  </div>
+                {/if}
             {/if}
-          {/if}
-          {if !empty($membershipTypes)}
-            {foreach from=$membershipTypes item=row}
-              {if array_key_exists( 'current_membership', $row )}
-                <div class='help'>
-                  {* Lifetime memberships have no end-date so current_membership array key exists but is NULL *}
-                  {if $row.current_membership}
-                    {if $row.current_membership|crmDate:"%Y%m%d" LT $smarty.now|crmDate:"%Y%m%d"}
-                      {ts 1=$row.current_membership|crmDate 2=$row.name}Your <strong>%2</strong> membership expired on %1.{/ts}<br />
-                    {else}
-                      {ts 1=$row.current_membership|crmDate 2=$row.name}Your <strong>%2</strong> membership expires on %1.{/ts}<br />
+            {if !empty($membershipTypes)}
+                {foreach from=$membershipTypes item=row}
+                    {if array_key_exists( 'current_membership', $row )}
+                      <div class='help'>
+                          {* Lifetime memberships have no end-date so current_membership array key exists but is NULL *}
+                          {if $row.current_membership}
+                              {if $row.current_membership|crmDate:"%Y%m%d" LT $smarty.now|crmDate:"%Y%m%d"}
+                                  {ts 1=$row.current_membership|crmDate 2=$row.name}Your <strong>%2</strong> membership expired on %1.{/ts}<br />
+                              {else}
+                                  {ts 1=$row.current_membership|crmDate 2=$row.name}Your <strong>%2</strong> membership expires on %1.{/ts}<br />
+                              {/if}
+                          {else}
+                              {ts 1=$row.name}Your <strong>%1</strong> membership does not expire (you do not need to renew that membership).{/ts}<br />
+                          {/if}
+                      </div>
                     {/if}
-                  {else}
-                    {ts 1=$row.name}Your <strong>%1</strong> membership does not expire (you do not need to renew that membership).{/ts}<br />
-                  {/if}
-                </div>
-              {/if}
-            {/foreach}
-          {/if}
+                {/foreach}
+            {/if}
 
-          {include file="CRM/Price/Form/PriceSet.tpl" extends="Membership"}
+            {include file="CRM/Price/Form/PriceSet.tpl" extends="Membership"}
         </fieldset>
       </div>
     {literal}
@@ -72,104 +73,105 @@
         });
       </script>
     {/literal}
-{elseif $membershipBlock and $lineItem and $priceSetID AND !$is_quick_config}
-  {assign var="totalAmount" value=$amount}
-  <div class="header-dark">
-    {ts}Membership Fee{/ts}
-  </div>
-  <div class="display-block">
-    {include file="CRM/Price/Page/LineItem.tpl" context="Membership"}
-  </div>
-{elseif $membershipBlock AND !$is_quick_config}
-  <div id="membership" class="crm-group membership-group">
-    <fieldset>
-      {if $renewal_mode }
-        {if $membershipBlock.renewal_title}
-          <legend>{$membershipBlock.renewal_title}</legend>
-        {/if}
-        {if $membershipBlock.renewal_text}
-          <div id="membership-intro" class="crm-section membership_renewal_intro-section">
-            <p>{$membershipBlock.renewal_text}</p>
-          </div>
-        {/if}
+    {elseif $membershipBlock and $lineItem and $priceSetID AND !$is_quick_config}
+        {assign var="totalAmount" value=$amount}
+      <div class="header-dark">
+          {ts}Membership Fee{/ts}
+      </div>
+      <div class="display-block">
+          {include file="CRM/Price/Page/LineItem.tpl" context="Membership"}
+      </div>
+    {elseif $membershipBlock AND !$is_quick_config}
+      <div id="membership" class="crm-group membership-group">
+        <fieldset>
+            {if $renewal_mode }
+                {if $membershipBlock.renewal_title}
+                  <legend>{$membershipBlock.renewal_title}</legend>
+                {/if}
+                {if $membershipBlock.renewal_text}
+                  <div id="membership-intro" class="crm-section membership_renewal_intro-section">
+                    <p>{$membershipBlock.renewal_text}</p>
+                  </div>
+                {/if}
 
-      {else}
-        {if $membershipBlock.new_title}
-          <legend>{$membershipBlock.new_title}</legend>
-        {/if}
-        {if $membershipBlock.new_text}
-          <div id="membership-intro" class="crm-section membership_new_intro-section">
-            <p>{$membershipBlock.new_text}</p>
-          </div>
-        {/if}
-      {/if}
-    </fieldset>
-  </div>
+            {else}
+                {if $membershipBlock.new_title}
+                  <legend>{$membershipBlock.new_title}</legend>
+                {/if}
+                {if $membershipBlock.new_text}
+                  <div id="membership-intro" class="crm-section membership_new_intro-section">
+                    <p>{$membershipBlock.new_text}</p>
+                  </div>
+                {/if}
+            {/if}
 
+        </fieldset>
+      </div>
 
+    {/if}{* membership block end here *}
 </div>
 {if $membershipBlock AND $is_quick_config}
-  {strip}
-    <table id="membership-listings">
-      {foreach from=$membershipTypes item=row}
-        <tr class="odd-row" valign="top">
-          {if $showRadio }
-            {* unreachable - show radio is never true *}
-            {assign var="pid" value=$row.id}
-            <td style="width: 1em;">{$form.selectMembership.$pid.html}</td>
-          {else}
-            <td>&nbsp;</td>
-          {/if}
-          <td style="width: auto;">
+    {strip}
+      <table id="membership-listings">
+          {foreach from=$membershipTypes item=row}
+            <tr class="odd-row" valign="top">
+                {if $showRadio }
+                    {* unreachable - show radio is never true *}
+                    {assign var="pid" value=$row.id}
+                  <td style="width: 1em;">{$form.selectMembership.$pid.html}</td>
+                {else}
+                  <td>&nbsp;</td>
+                {/if}
+              <td style="width: auto;">
                 <span class="bold">{$row.name} &nbsp;
                 {if ($membershipBlock.display_min_fee) AND $row.minimum_fee GT 0 }
-                  {if $is_separate_payment OR ! $form.amount.label}
-                    &ndash; {$row.minimum_fee|crmMoney}
-                  {else}
-                    {ts 1=$row.minimum_fee|crmMoney}(contribute at least %1 to be eligible for this membership){/ts}
-                  {/if}
+                    {if $is_separate_payment OR ! $form.amount.label}
+                      &ndash; {$row.minimum_fee|crmMoney}
+                    {else}
+                        {ts 1=$row.minimum_fee|crmMoney}(contribute at least %1 to be eligible for this membership){/ts}
+                    {/if}
                 {/if}
                 </span><br />
-            {$row.description} &nbsp;
-          </td>
+                  {$row.description} &nbsp;
+              </td>
 
-          <td style="width: auto;">
-            {* Check if there is an existing membership of this type (current_membership NOT empty) and if the end-date is prior to today. *}
-            {if array_key_exists( 'current_membership', $row )}
-              {if $row.current_membership}
-                {if $row.current_membership|crmDate:"%Y%m%d" LT $smarty.now|crmDate:"%Y%m%d"}
-                  <br /><em>{ts 1=$row.current_membership|crmDate 2=$row.name}Your <strong>%2</strong> membership expired on %1.{/ts}</em>
-                {else}
-                  <br /><em>{ts 1=$row.current_membership|crmDate 2=$row.name}Your <strong>%2</strong> membership expires on %1.{/ts}</em>
-                {/if}
-              {else}
-                {ts 1=$row.name}Your <strong>%1</strong> membership does not expire (you do not need to renew that membership).{/ts}<br />
-              {/if}
-            {else}
-              &nbsp;
-            {/if}
-          </td>
-        </tr>
+              <td style="width: auto;">
+                  {* Check if there is an existing membership of this type (current_membership NOT empty) and if the end-date is prior to today. *}
+                  {if array_key_exists( 'current_membership', $row)}
+                      {if $row.current_membership}
+                          {if $row.current_membership|crmDate:"%Y%m%d" LT $smarty.now|crmDate:"%Y%m%d"}
+                            <br /><em>{ts 1=$row.current_membership|crmDate 2=$row.name}Your <strong>%2</strong> membership expired on %1.{/ts}</em>
+                          {else}
+                            <br /><em>{ts 1=$row.current_membership|crmDate 2=$row.name}Your <strong>%2</strong> membership expires on %1.{/ts}</em>
+                          {/if}
+                      {else}
+                          {ts 1=$row.name}Your <strong>%1</strong> membership does not expire (you do not need to renew that membership).{/ts}<br />
+                      {/if}
+                  {else}
+                    &nbsp;
+                  {/if}
+              </td>
+            </tr>
 
-      {/foreach}
-      {if $form.auto_renew}
-        <tr id="allow_auto_renew">
-          <td style="width: auto;">{$form.auto_renew.html}</td>
-          <td style="width: auto;">
-            {$form.auto_renew.label}
-          </td>
-        </tr>
-      {/if}
-      {if $showRadio}{* unreachable *}
-        {if $showRadioNoThanks } {* Provide no-thanks option when Membership signup is not required - per membership block configuration. *}
-          <tr class="odd-row">
-            <td>{$form.selectMembership.no_thanks.html}</td>
-            <td colspan="2"><strong>{ts}No thank you{/ts}</strong></td>
-          </tr>
-        {/if}
-      {/if}
-    </table>
-  {/strip}
+          {/foreach}
+          {if $form.auto_renew}
+            <tr id="allow_auto_renew">
+              <td style="width: auto;">{$form.auto_renew.html}</td>
+              <td style="width: auto;">
+                  {$form.auto_renew.label}
+              </td>
+            </tr>
+          {/if}
+          {if $showRadio}{* unreachable *}
+              {if $showRadioNoThanks } {* Provide no-thanks option when Membership signup is not required - per membership block configuration. *}
+                <tr class="odd-row">
+                  <td>{$form.selectMembership.no_thanks.html}</td>
+                  <td colspan="2"><strong>{ts}No thank you{/ts}</strong></td>
+                </tr>
+              {/if}
+          {/if}
+      </table>
+    {/strip}
 {/if}
 
 {if $membershipBlock}