Merge pull request #12869 from dereklewis123/CW-892

[civicrm-core.git] / templates / CRM / Contribute / Page / ContributionRecur.tpl

diff --git a/templates/CRM/Contribute/Page/ContributionRecur.tpl b/templates/CRM/Contribute/Page/ContributionRecur.tpl
index 6821532484f404a47f1d040e4e41c9bbe1d4e4c8..8ab1adf20a9573d504f8c01692387d856b8250eb 100644 (file)
--- a/templates/CRM/Contribute/Page/ContributionRecur.tpl
+++ b/templates/CRM/Contribute/Page/ContributionRecur.tpl
@@ -1,6 +1,6 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
@@ -28,6 +28,11 @@
 
 {if $action eq 4} {* when action is view *}
     {if $recur}
+        {if $recur.is_test}
+        <div class="help">
+          <strong>{ts}This is a TEST transaction{/ts}</strong>
+        </div>
+        {/if}
         <h3>{ts}View Recurring Payment{/ts}</h3>
         <div class="crm-block crm-content-block crm-recurcontrib-view-block">
           <table class="crm-info-panel">
@@ -62,30 +67,32 @@
           <div class="crm-submit-buttons"><a class="button cancel crm-form-submit" href="{crmURL p='civicrm/contact/view' q='action=browse&selectedChild=contribute'}">{ts}Done{/ts}</a></div>
         </div>
     {/if}
+
+  <script type="text/javascript">
+    var recurContribID = {$recur.id};
+    var contactID = {$contactId};
+    {literal}
+    CRM.$(function($) {
+      CRM.loadPage(
+        CRM.url(
+          'civicrm/contribute/contributionrecur-payments',
+          {
+            reset: 1,
+            id: recurContribID,
+            cid: contactID
+          },
+          'back'
+        ),
+        {
+          target : '#recurring-contribution-payments',
+          dialog : false
+        }
+      );
+    });
+    {/literal}
+  </script>
+  <div id="recurring-contribution-payments"></div>
 {/if}
 {if $recurRows}
-    {strip}
-    <table class="selector row-highlight">
-        <tr class="columnheader">
-            <th scope="col">{ts}Amount{/ts}</th>
-            <th scope="col">{ts}Frequency{/ts}</th>
-            <th scope="col">{ts}Start Date{/ts}</th>
-            <th scope="col">{ts}Installments{/ts}</th>
-            <th scope="col">{ts}Status{/ts}</th>
-            <th scope="col"></th>
-        </tr>
-
-        {foreach from=$recurRows item=row}
-            {assign var=id value=$row.id}
-            <tr id="contribution_recur-{$row.id}" data-action="cancel" class="crm-entity {cycle values="even-row,odd-row"}{if NOT $row.is_active} disabled{/if}">
-                <td>{$row.amount|crmMoney:$row.currency}{if $row.is_test} ({ts}test{/ts}){/if}</td>
-                <td>{ts}Every{/ts} {$row.frequency_interval} {$row.frequency_unit} </td>
-                <td>{$row.start_date|crmDate}</td>
-                <td>{$row.installments}</td>
-                <td>{$row.contribution_status}</td>
-                <td>{$row.action|replace:'xx':$row.recurId}</td>
-            </tr>
-        {/foreach}
-    </table>
-    {/strip}
+  {include file="CRM/Contribute/Page/ContributionRecurSelector.tpl"}
 {/if}