From: eileen <eileen@fuzion.co.nz>
Date: Mon, 5 Aug 2013 02:25:31 +0000 (+1200)
Subject: CRM-13155 move recur contribution search pane into subsidiary tpl
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8af85b9a87d4e671f815cd693a5018d88df52b59;p=civicrm-core.git

CRM-13155 move recur contribution search pane into subsidiary tpl
this appears to all work. To get recurring contributions with no contributions you have to manually clear 'test' - but as this is a bit of an edge case it can stay that way for now. I expect that this will become more important with the circle extension - but not today
---

diff --git a/templates/CRM/Contribute/Form/Search/Common.tpl b/templates/CRM/Contribute/Form/Search/Common.tpl
index 1cda924062..5f6efab361 100644
--- a/templates/CRM/Contribute/Form/Search/Common.tpl
+++ b/templates/CRM/Contribute/Form/Search/Common.tpl
@@ -111,41 +111,6 @@
             </span>
         </td>
       </tr>
-      <tr><td>{ts}Recurring Payments Start Date{/ts}</td>
-        <td>
-          {include file="CRM/Core/DateRange.tpl" fieldName="contribution_recur_start_date" from='_low' to='_high'}
-        </td>
-      </tr>
-      <tr>
-        <td>{ts}Recurring Contribution End Date{/ts}</td>
-        <td>
-          {include file="CRM/Core/DateRange.tpl" fieldName="contribution_recur_end_date" from='_low' to='_high'}
-        </td>
-      </tr>
-      <tr>
-        <td>{ts}Recurring Contribution Modified Date{/ts}</td>
-        <td>
-          {include file="CRM/Core/DateRange.tpl" fieldName="contribution_recur_modified_date" from='_low' to='_high'}
-        </td>
-      </tr>
-      <tr>
-        <td>{ts}Next Scheduled Recurring Contribution{/ts}</td>
-        <td>
-          {include file="CRM/Core/DateRange.tpl" fieldName="contribution_recur_next_sched_contribution_date" from='_low' to='_high'}
-        </td>
-      </tr>
-      <tr>
-        <td>{ts}Retry Failed Recurring Contribution On{/ts}</td>
-        <td>
-          {include file="CRM/Core/DateRange.tpl" fieldName="contribution_recur_failure_retry_date" from='_low' to='_high'}
-        </td>
-      </tr>
-      <tr>
-        <td>{ts}Recurring Contribution Cancel Date{/ts}</td>
-        <td>
-          {include file="CRM/Core/DateRange.tpl" fieldName="contribution_recur_cancel_date" from='_low' to='_high'}
-        </td>
-      </tr>
       </tbody>
     </table>
   </td>
@@ -201,6 +166,11 @@
 {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" campaignContext="componentSearch"
 campaignTrClass='' campaignTdClass=''}
 
+<tr>
+  <td colspan="2">
+{include file="CRM/Contribute/Form/Search/ContributionRecur.tpl"}
+</tr>
+
 {if $contributeGroupTree}
 <tr>
   <td colspan="2">
diff --git a/templates/CRM/Contribute/Form/Search/ContributionRecur.tpl b/templates/CRM/Contribute/Form/Search/ContributionRecur.tpl
new file mode 100644
index 0000000000..c9fb1f08cd
--- /dev/null
+++ b/templates/CRM/Contribute/Form/Search/ContributionRecur.tpl
@@ -0,0 +1,72 @@
+{*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2013                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*}
+
+  <div class="crm-accordion-wrapper crm-contactDetails-accordion {if $form.formName eq 'Advanced' AND $cd_edit.collapse_adv_display eq 1}collapsed{/if}" id="{$cd_edit.name}" >
+    <div class="crm-accordion-header">
+        {ts}Recurring Contributions{/ts}
+    </div>
+    <div class="crm-accordion-body">
+    <table class="form-layout-compressed">
+      <tr><td>{ts}Recurring Payments Start Date{/ts}</td>
+        <td>
+          {include file="CRM/Core/DateRange.tpl" fieldName="contribution_recur_start_date" from='_low' to='_high'}
+        </td>
+      </tr>
+      <tr>
+        <td>{ts}Recurring Contribution End Date{/ts}</td>
+        <td>
+          {include file="CRM/Core/DateRange.tpl" fieldName="contribution_recur_end_date" from='_low' to='_high'}
+        </td>
+      </tr>
+      <tr>
+        <td>{ts}Recurring Contribution Modified Date{/ts}</td>
+        <td>
+          {include file="CRM/Core/DateRange.tpl" fieldName="contribution_recur_modified_date" from='_low' to='_high'}
+        </td>
+      </tr>
+      <tr>
+        <td>{ts}Next Scheduled Recurring Contribution{/ts}</td>
+        <td>
+          {include file="CRM/Core/DateRange.tpl" fieldName="contribution_recur_next_sched_contribution_date" from='_low' to='_high'}
+        </td>
+      </tr>
+      <tr>
+        <td>{ts}Retry Failed Recurring Contribution On{/ts}</td>
+        <td>
+          {include file="CRM/Core/DateRange.tpl" fieldName="contribution_recur_failure_retry_date" from='_low' to='_high'}
+        </td>
+      </tr>
+      <tr>
+        <td>{ts}Recurring Contribution Cancel Date{/ts}</td>
+        <td>
+          {include file="CRM/Core/DateRange.tpl" fieldName="contribution_recur_cancel_date" from='_low' to='_high'}
+        </td>
+      </tr>
+     </table>
+    </div><!-- /.crm-accordion-body -->
+  </div><!-- /.crm-accordion-wrapper -->
+
+