From 986bff309d9bc468191b13aa0bd9f3b38fec50a3 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Mon, 10 Jul 2023 13:17:09 +1200 Subject: [PATCH] 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 --- .../Form/Contribution/MainMembershipBlock.tpl | 248 +++++++++--------- 1 file changed, 125 insertions(+), 123 deletions(-) diff --git a/templates/CRM/Contribute/Form/Contribution/MainMembershipBlock.tpl b/templates/CRM/Contribute/Form/Contribution/MainMembershipBlock.tpl index 69b5c0788c..414e004e8e 100644 --- a/templates/CRM/Contribute/Form/Contribution/MainMembershipBlock.tpl +++ b/templates/CRM/Contribute/Form/Contribution/MainMembershipBlock.tpl @@ -8,47 +8,48 @@ +--------------------------------------------------------------------+ *}
+ {if TRUE}
- {if $renewal_mode} - {if $membershipBlock.renewal_title} - {$membershipBlock.renewal_title} - {/if} - {if $membershipBlock.renewal_text} -
- {$membershipBlock.renewal_text} -
- {/if} - {else} - {if $membershipBlock.new_title} - {$membershipBlock.new_title} - {/if} - {if $membershipBlock.new_text} -
- {$membershipBlock.new_text} -
+ {if $renewal_mode} + {if $membershipBlock.renewal_title} + {$membershipBlock.renewal_title} + {/if} + {if $membershipBlock.renewal_text} +
+ {$membershipBlock.renewal_text} +
+ {/if} + {else} + {if $membershipBlock.new_title} + {$membershipBlock.new_title} + {/if} + {if $membershipBlock.new_text} +
+ {$membershipBlock.new_text} +
+ {/if} {/if} - {/if} - {if !empty($membershipTypes)} - {foreach from=$membershipTypes item=row} - {if array_key_exists( 'current_membership', $row )} -
- {* 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 %2 membership expired on %1.{/ts}
- {else} - {ts 1=$row.current_membership|crmDate 2=$row.name}Your %2 membership expires on %1.{/ts}
+ {if !empty($membershipTypes)} + {foreach from=$membershipTypes item=row} + {if array_key_exists( 'current_membership', $row )} +
+ {* 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 %2 membership expired on %1.{/ts}
+ {else} + {ts 1=$row.current_membership|crmDate 2=$row.name}Your %2 membership expires on %1.{/ts}
+ {/if} + {else} + {ts 1=$row.name}Your %1 membership does not expire (you do not need to renew that membership).{/ts}
+ {/if} +
{/if} - {else} - {ts 1=$row.name}Your %1 membership does not expire (you do not need to renew that membership).{/ts}
- {/if} -
- {/if} - {/foreach} - {/if} + {/foreach} + {/if} - {include file="CRM/Price/Form/PriceSet.tpl" extends="Membership"} + {include file="CRM/Price/Form/PriceSet.tpl" extends="Membership"}
{literal} @@ -72,104 +73,105 @@ }); {/literal} -{elseif $membershipBlock and $lineItem and $priceSetID AND !$is_quick_config} - {assign var="totalAmount" value=$amount} -
- {ts}Membership Fee{/ts} -
-
- {include file="CRM/Price/Page/LineItem.tpl" context="Membership"} -
-{elseif $membershipBlock AND !$is_quick_config} -
-
- {if $renewal_mode } - {if $membershipBlock.renewal_title} - {$membershipBlock.renewal_title} - {/if} - {if $membershipBlock.renewal_text} -
-

{$membershipBlock.renewal_text}

-
- {/if} + {elseif $membershipBlock and $lineItem and $priceSetID AND !$is_quick_config} + {assign var="totalAmount" value=$amount} +
+ {ts}Membership Fee{/ts} +
+
+ {include file="CRM/Price/Page/LineItem.tpl" context="Membership"} +
+ {elseif $membershipBlock AND !$is_quick_config} +
+
+ {if $renewal_mode } + {if $membershipBlock.renewal_title} + {$membershipBlock.renewal_title} + {/if} + {if $membershipBlock.renewal_text} +
+

{$membershipBlock.renewal_text}

+
+ {/if} - {else} - {if $membershipBlock.new_title} - {$membershipBlock.new_title} - {/if} - {if $membershipBlock.new_text} -
-

{$membershipBlock.new_text}

-
- {/if} - {/if} -
-
+ {else} + {if $membershipBlock.new_title} + {$membershipBlock.new_title} + {/if} + {if $membershipBlock.new_text} +
+

{$membershipBlock.new_text}

+
+ {/if} + {/if} +
+
+ {/if}{* membership block end here *}
{if $membershipBlock AND $is_quick_config} - {strip} - - {foreach from=$membershipTypes item=row} - - {if $showRadio } - {* unreachable - show radio is never true *} - {assign var="pid" value=$row.id} - - {else} - - {/if} - + + + + {/if} + {if $showRadio}{* unreachable *} + {if $showRadioNoThanks } {* Provide no-thanks option when Membership signup is not required - per membership block configuration. *} + + + + + {/if} + {/if} +
{$form.selectMembership.$pid.html}  + {strip} + + {foreach from=$membershipTypes item=row} + + {if $showRadio } + {* unreachable - show radio is never true *} + {assign var="pid" value=$row.id} + + {else} + + {/if} + + {$row.description}   + - - + + - {/foreach} - {if $form.auto_renew} - - - - - {/if} - {if $showRadio}{* unreachable *} - {if $showRadioNoThanks } {* Provide no-thanks option when Membership signup is not required - per membership block configuration. *} - - - - - {/if} - {/if} -
{$form.selectMembership.$pid.html}  {$row.name}   {if ($membershipBlock.display_min_fee) AND $row.minimum_fee GT 0 } - {if $is_separate_payment OR ! $form.amount.label} - – {$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} + – {$row.minimum_fee|crmMoney} + {else} + {ts 1=$row.minimum_fee|crmMoney}(contribute at least %1 to be eligible for this membership){/ts} + {/if} {/if}
- {$row.description}   - 		- {* 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"} -
{ts 1=$row.current_membership|crmDate 2=$row.name}Your %2 membership expired on %1.{/ts} - {else} -
{ts 1=$row.current_membership|crmDate 2=$row.name}Your %2 membership expires on %1.{/ts} - {/if} - {else} - {ts 1=$row.name}Your %1 membership does not expire (you do not need to renew that membership).{/ts}
- {/if} - {else} -   - {/if} -
+ {* 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"} +
{ts 1=$row.current_membership|crmDate 2=$row.name}Your %2 membership expired on %1.{/ts} + {else} +
{ts 1=$row.current_membership|crmDate 2=$row.name}Your %2 membership expires on %1.{/ts} + {/if} + {else} + {ts 1=$row.name}Your %1 membership does not expire (you do not need to renew that membership).{/ts}
+ {/if} + {else} +   + {/if} +
{$form.auto_renew.html} - {$form.auto_renew.label} -
{$form.selectMembership.no_thanks.html}{ts}No thank you{/ts}
- {/strip} + {/foreach} + {if $form.auto_renew} +
{$form.auto_renew.html} + {$form.auto_renew.label} +
{$form.selectMembership.no_thanks.html}{ts}No thank you{/ts}
+ {/strip} {/if} {if $membershipBlock} -- 2.25.1