diff --git a/CRM/Member/Page/Tab.php b/CRM/Member/Page/Tab.php index 17c778bb21f9..00b72cb389eb 100644 --- a/CRM/Member/Page/Tab.php +++ b/CRM/Member/Page/Tab.php @@ -59,9 +59,7 @@ public function browse() { $membership = array(); $dao = new CRM_Member_DAO_Membership(); $dao->contact_id = $this->_contactId; - $dao->is_test = 0; $dao->whereAdd($addWhere); - //$dao->orderBy('name'); $dao->find(); //CRM--4418, check for view, edit, delete diff --git a/templates/CRM/Contribute/Form/ContributionView.tpl b/templates/CRM/Contribute/Form/ContributionView.tpl index f6c2799e0501..bc281ac35e41 100644 --- a/templates/CRM/Contribute/Form/ContributionView.tpl +++ b/templates/CRM/Contribute/Form/ContributionView.tpl @@ -68,6 +68,11 @@
{ts}From{/ts} | {$displayName} | diff --git a/templates/CRM/Contribute/Page/ContributionRecur.tpl b/templates/CRM/Contribute/Page/ContributionRecur.tpl index 767e62bff20c..6f8371aee9fa 100644 --- a/templates/CRM/Contribute/Page/ContributionRecur.tpl +++ b/templates/CRM/Contribute/Page/ContributionRecur.tpl @@ -28,6 +28,11 @@ {if $action eq 4} {* when action is view *} {if $recur} + {if $recur.is_test} +
{ts}Member{/ts} | {$displayName} | |||
{ts}Member{/ts} | {$displayName} | |||
{ts}By Relationship{/ts} | {$relationship} {$owner_display_name} |
- {$row.membership_type}
+ {$row.membership_type}{if $row.is_test} ({ts}test{/ts}){/if}
{if $row.owner_membership_id} ({ts}by relationship{/ts}){/if} |
{$row.join_date|truncate:10:''|crmDate} | diff --git a/templates/CRM/Member/Page/Tab.tpl b/templates/CRM/Member/Page/Tab.tpl index 0323190bd959..1007b64947a1 100644 --- a/templates/CRM/Member/Page/Tab.tpl +++ b/templates/CRM/Member/Page/Tab.tpl @@ -86,7 +86,7 @@ {foreach from=$activeMembers item=activeMember}|
- {$activeMember.membership_type}
+ {$activeMember.membership_type}{if $activeMember.is_test} ({ts}test{/ts}){/if}
{if $activeMember.owner_membership_id} ({ts}by relationship{/ts}){/if} |
{$activeMember.join_date|crmDate} | @@ -135,9 +135,10 @@ {foreach from=$inActiveMembers item=inActiveMember}|||
{$inActiveMember.membership_type}
- {if $inActiveMember.owner_membership_id} ({ts}by relationship{/ts}){/if} - |
+
+ {$inActiveMember.membership_type}{if $inActiveMember.is_test} ({ts}test{/ts}){/if}
+ {if $inActiveMember.owner_membership_id} ({ts}by relationship{/ts}){/if} + |
{$inActiveMember.join_date|crmDate} | {$inActiveMember.start_date|crmDate} | {$inActiveMember.end_date|crmDate} |