From ecfc2324e81d1915279013ba6f37c23864f09852 Mon Sep 17 00:00:00 2001 From: Matthew Wire Date: Tue, 28 Apr 2020 00:02:59 +0100 Subject: [PATCH] Simplify templates for listing recurring contributions --- .../CRM/Contribute/Page/ContributionRecur.tpl | 143 +++++++++--------- templates/CRM/Contribute/Page/Tab.tpl | 4 +- .../Member/Page/RecurringContributions.tpl | 2 +- 3 files changed, 71 insertions(+), 78 deletions(-) diff --git a/templates/CRM/Contribute/Page/ContributionRecur.tpl b/templates/CRM/Contribute/Page/ContributionRecur.tpl index f57c33199ba3..1c8b4dca28b9 100644 --- a/templates/CRM/Contribute/Page/ContributionRecur.tpl +++ b/templates/CRM/Contribute/Page/ContributionRecur.tpl @@ -8,80 +8,73 @@ +--------------------------------------------------------------------+ *} -{include file="CRM/common/enableDisableApi.tpl"} +{if $recur} + {if $recur.is_test} +
+ {ts}This is a TEST transaction{/ts} +
+ {/if} +
+ + + + + + + + + + + + {if $recur.modified_date}{/if} + {if $recur.cancel_date}{/if} + {if $recur.cancel_reason}{/if} + {if $recur.end_date}{/if} + {if $recur.processor_id}{/if} + + {if $recur.invoice_id}{/if} + + {if $recur.contribution_status_id neq 3}{/if} + + {if $recur.invoice_id}{/if} + + + {if $recur.payment_processor}{/if} + {if $recur.financial_type}{/if} + {if $recur.campaign}{/if} + {if $recur.membership_id} + + + + {/if} + {include file="CRM/Custom/Page/CustomDataView.tpl"} -{if $action eq 4} {* when action is view *} - {if $recur} - {if $recur.is_test} -
- {ts}This is a TEST transaction{/ts} -
- {/if} -
-
{ts}From{/ts}{$displayName}
{ts}Amount{/ts}{$recur.amount|crmMoney:$recur.currency}{if $is_test} ({ts}test{/ts}){/if}
{ts}Frequency{/ts}every {$recur.frequency_interval} {$recur.frequency_unit}
{ts}Installments{/ts}{$recur.installments}
{ts}Status{/ts}{$recur.contribution_status}
{ts}Start Date{/ts}{$recur.start_date|crmDate}
{ts}Created Date{/ts}{$recur.create_date|crmDate}
{ts}Modified Date{/ts}{$recur.modified_date|crmDate}
{ts}Cancelled Date{/ts}{$recur.cancel_date|crmDate}
{ts}Cancel Reason{/ts}{$recur.cancel_reason}
{ts}End Date{/ts}{$recur.end_date|crmDate}
{ts}Processor ID{/ts}{$recur.processor_id}
{ts}Transaction ID{/ts}{$recur.trxn_id}
{ts}Invoice ID{/ts}{$recur.invoice_id}
{ts}Cycle Day{/ts}{$recur.cycle_day}
{ts}Next Contribution{/ts}{$recur.next_sched_contribution_date|crmDate}
{ts}Failure Count{/ts}{$recur.failure_count}
{ts}Failure Retry Date{/ts}{$recur.next_sched_contribution_date|crmDate}
{ts}Auto Renew?{/ts}{if $recur.auto_renew}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}
{ts}Send receipt for each contribution?{/ts}{if $recur.is_email_receipt}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}
{ts}Payment Processor{/ts}{$recur.payment_processor}
{ts}Financial Type{/ts}{$recur.financial_type}
{ts}Campaign{/ts}{$recur.campaign}
{ts}Membership{/ts}{$recur.membership_name}
- - - - - - - - - - - {if $recur.modified_date}{/if} - {if $recur.cancel_date}{/if} - {if $recur.cancel_reason}{/if} - {if $recur.end_date}{/if} - {if $recur.processor_id}{/if} - - {if $recur.invoice_id}{/if} - - {if $recur.contribution_status_id neq 3}{/if} - - {if $recur.invoice_id}{/if} - - - {if $recur.payment_processor}{/if} - {if $recur.financial_type}{/if} - {if $recur.campaign}{/if} - {if $recur.membership_id} - - - - {/if} - {include file="CRM/Custom/Page/CustomDataView.tpl"} - -
{ts}From{/ts}{$displayName}
{ts}Amount{/ts}{$recur.amount|crmMoney:$recur.currency}{if $is_test} ({ts}test{/ts}){/if}
{ts}Frequency{/ts}every {$recur.frequency_interval} {$recur.frequency_unit}
{ts}Installments{/ts}{$recur.installments}
{ts}Status{/ts}{$recur.contribution_status}
{ts}Start Date{/ts}{$recur.start_date|crmDate}
{ts}Created Date{/ts}{$recur.create_date|crmDate}
{ts}Modified Date{/ts}{$recur.modified_date|crmDate}
{ts}Cancelled Date{/ts}{$recur.cancel_date|crmDate}
{ts}Cancel Reason{/ts}{$recur.cancel_reason}
{ts}End Date{/ts}{$recur.end_date|crmDate}
{ts}Processor ID{/ts}{$recur.processor_id}
{ts}Transaction ID{/ts}{$recur.trxn_id}
{ts}Invoice ID{/ts}{$recur.invoice_id}
{ts}Cycle Day{/ts}{$recur.cycle_day}
{ts}Next Contribution{/ts}{$recur.next_sched_contribution_date|crmDate}
{ts}Failure Count{/ts}{$recur.failure_count}
{ts}Failure Retry Date{/ts}{$recur.next_sched_contribution_date|crmDate}
{ts}Auto Renew?{/ts}{if $recur.auto_renew}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}
{ts}Send receipt for each contribution?{/ts}{if $recur.is_email_receipt}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}
{ts}Payment Processor{/ts}{$recur.payment_processor}
{ts}Financial Type{/ts}{$recur.financial_type}
{ts}Campaign{/ts}{$recur.campaign}
{ts}Membership{/ts}{$recur.membership_name}
-
{ts}Done{/ts}
-
- {/if} - - -
-{/if} -{if $recurRows} - {include file="CRM/Contribute/Page/ContributionRecurSelector.tpl"} + +
{ts}Done{/ts}
+ {/if} + + +
diff --git a/templates/CRM/Contribute/Page/Tab.tpl b/templates/CRM/Contribute/Page/Tab.tpl index f154d5d1bff9..cd19bee412c6 100644 --- a/templates/CRM/Contribute/Page/Tab.tpl +++ b/templates/CRM/Contribute/Page/Tab.tpl @@ -79,11 +79,11 @@ {if $recur}

{ts}Active Recurring Contributions{/ts}

- {include file="CRM/Contribute/Page/ContributionRecur.tpl" recurRows=$activeRecurRows} + {include file="CRM/Contribute/Page/ContributionRecurSelector.tpl" recurRows=$activeRecurRows}

{ts}Inactive Recurring Contributions{/ts}

- {include file="CRM/Contribute/Page/ContributionRecur.tpl" recurRows=$inactiveRecurRows} + {include file="CRM/Contribute/Page/ContributionRecurSelector.tpl" recurRows=$inactiveRecurRows}
{/if} diff --git a/templates/CRM/Member/Page/RecurringContributions.tpl b/templates/CRM/Member/Page/RecurringContributions.tpl index 4d11e7aa1766..326eee90e3d5 100644 --- a/templates/CRM/Member/Page/RecurringContributions.tpl +++ b/templates/CRM/Member/Page/RecurringContributions.tpl @@ -2,5 +2,5 @@

- {include file="CRM/Contribute/Page/ContributionRecur.tpl" action=16} + {include file="CRM/Contribute/Page/ContributionRecurSelector.tpl" action=16} {/if}