From ed28afa9861cc094ddde3337d702e031395fa41f Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Sun, 22 Jul 2018 08:02:27 +1000 Subject: [PATCH] (NFC) Convert files to use linux line endings not windows --- .../Page/ContributionRecurPayments.php | 442 +++++++++--------- .../CRM/Admin/Form/Preferences/Display.hlp | 92 ++-- .../CRM/Contribute/Form/Task/Invoice.hlp | 106 ++--- .../Page/ContributionRecurPayments.tpl | 84 ++-- .../Form/ManageEvent/ConfirmRepeatMode.tpl | 222 ++++----- .../Member/Page/RecurringContributions.tpl | 12 +- 6 files changed, 479 insertions(+), 479 deletions(-) diff --git a/CRM/Contribute/Page/ContributionRecurPayments.php b/CRM/Contribute/Page/ContributionRecurPayments.php index 746e2ecf77..0410bdca3b 100644 --- a/CRM/Contribute/Page/ContributionRecurPayments.php +++ b/CRM/Contribute/Page/ContributionRecurPayments.php @@ -1,221 +1,221 @@ -id = CRM_Utils_Request::retrieve('id', 'Positive', $this, TRUE); - $this->contactId = CRM_Utils_Request::retrieve('cid', 'Positive', $this, TRUE); - - $this->loadRelatedContributions(); - - return parent::run(); - } - - /** - * Loads contributions associated to the current recurring contribution being - * viewed. - */ - private function loadRelatedContributions() { - $relatedContributions = array(); - - $relatedContributionsResult = civicrm_api3('Contribution', 'get', array( - 'sequential' => 1, - 'contribution_recur_id' => $this->id, - 'contact_id' => $this->contactId, - 'options' => array('limit' => 0), - )); - - foreach ($relatedContributionsResult['values'] as $contribution) { - $this->insertAmountExpandingPaymentsControl($contribution); - $this->fixDateFormats($contribution); - $this->insertStatusLabels($contribution); - $this->insertContributionActions($contribution); - - $relatedContributions[] = $contribution; - } - - if (count($relatedContributions) > 0) { - $this->assign('contributionsCount', count($relatedContributions)); - $this->assign('relatedContributions', json_encode($relatedContributions)); - } - } - - /** - * Inserts a string into the array with the html used to show the expanding - * payments control, which loads when user clicks on the amount. - * - * @param array $contribution - * Reference to the array holding the contribution's data and where the - * control will be inserted into - */ - private function insertAmountExpandingPaymentsControl(&$contribution) { - $amount = CRM_Utils_Money::format($contribution['total_amount'], $contribution['currency']); - - $expandPaymentsUrl = CRM_Utils_System::url('civicrm/payment', - array( - 'view' => 'transaction', - 'component' => 'contribution', - 'action' => 'browse', - 'cid' => $this->contactId, - 'id' => $contribution['contribution_id'], - 'selector' => 1, - ), - FALSE, NULL, TRUE - ); - - $contribution['amount_control'] = ' - -   ' . $amount . ' - - '; - } - - /** - * Fixes date fields present in the given contribution. - * - * @param array $contribution - * Reference to the array holding the contribution's data - */ - private function fixDateFormats(&$contribution) { - $config = CRM_Core_Config::singleton(); - - $contribution['formatted_receive_date'] = CRM_Utils_Date::customFormat($contribution['receive_date'], $config->dateformatDatetime); - $contribution['formatted_thankyou_date'] = CRM_Utils_Date::customFormat($contribution['thankyou_date'], $config->dateformatDatetime); - } - - /** - * Inserts a contribution_status_label key into the array, with the value - * showing the current status plus observations on the current status. - * - * @param array $contribution - * Reference to the array holding the contribution's data and where the new - * position will be inserted - */ - private function insertStatusLabels(&$contribution) { - $contribution['contribution_status_label'] = $contribution['contribution_status']; - - if ($contribution['is_pay_later'] && CRM_Utils_Array::value('contribution_status', $contribution) == 'Pending') { - $contribution['contribution_status_label'] .= ' (' . ts('Pay Later') . ')'; - } - elseif (CRM_Utils_Array::value('contribution_status', $contribution) == 'Pending') { - $contribution['contribution_status_label'] .= ' (' . ts('Incomplete Transaction') . ')'; - } - } - - /** - * Inserts into the given array a string with the 'action' key, holding the - * html to be used to show available actions for the contribution. - * - * @param $contribution - * Reference to the array holding the contribution's data. It is also the - * array where the new 'action' key will be inserted. - */ - private function insertContributionActions(&$contribution) { - $contribution['action'] = CRM_Core_Action::formLink( - $this->buildContributionLinks($contribution), - $this->getContributionPermissionsMask(), - array( - 'id' => $contribution['contribution_id'], - 'cid' => $contribution['contact_id'], - 'cxt' => 'contribution', - ), - ts('more'), - FALSE, - 'contribution.selector.row', - 'Contribution', - $contribution['contribution_id'] - ); - } - - /** - * Builds list of links for authorized actions that can be done on given - * contribution. - * - * @param array $contribution - * - * @return array - */ - private function buildContributionLinks($contribution) { - $links = CRM_Contribute_Selector_Search::links($contribution['contribution_id'], - CRM_Utils_Request::retrieve('action', 'String'), - NULL, - NULL - ); - - $isPayLater = FALSE; - if ($contribution['is_pay_later'] && CRM_Utils_Array::value('contribution_status', $contribution) == 'Pending') { - $isPayLater = TRUE; - - $links[CRM_Core_Action::ADD] = array( - 'name' => ts('Pay with Credit Card'), - 'url' => 'civicrm/contact/view/contribution', - 'qs' => 'reset=1&action=update&id=%%id%%&cid=%%cid%%&context=%%cxt%%&mode=live', - 'title' => ts('Pay with Credit Card'), - ); - } - - if (in_array($contribution['contribution_status'], array('Partially paid', 'Pending refund')) || $isPayLater) { - $buttonName = ts('Record Payment'); - - if ($contribution['contribution_status'] == 'Pending refund') { - $buttonName = ts('Record Refund'); - } - elseif (CRM_Core_Config::isEnabledBackOfficeCreditCardPayments()) { - $links[CRM_Core_Action::BASIC] = array( - 'name' => ts('Submit Credit Card payment'), - 'url' => 'civicrm/payment/add', - 'qs' => 'reset=1&id=%%id%%&cid=%%cid%%&action=add&component=contribution&mode=live', - 'title' => ts('Submit Credit Card payment'), - ); - } - $links[CRM_Core_Action::ADD] = array( - 'name' => $buttonName, - 'url' => 'civicrm/payment', - 'qs' => 'reset=1&id=%%id%%&cid=%%cid%%&action=add&component=contribution', - 'title' => $buttonName, - ); - } - - return $links; - } - - /** - * Builds a mask with allowed contribution related permissions. - * - * @return int - */ - private function getContributionPermissionsMask() { - $permissions = array(CRM_Core_Permission::VIEW); - if (CRM_Core_Permission::check('edit contributions')) { - $permissions[] = CRM_Core_Permission::EDIT; - } - if (CRM_Core_Permission::check('delete in CiviContribute')) { - $permissions[] = CRM_Core_Permission::DELETE; - } - - return CRM_Core_Action::mask($permissions); - } - -} +id = CRM_Utils_Request::retrieve('id', 'Positive', $this, TRUE); + $this->contactId = CRM_Utils_Request::retrieve('cid', 'Positive', $this, TRUE); + + $this->loadRelatedContributions(); + + return parent::run(); + } + + /** + * Loads contributions associated to the current recurring contribution being + * viewed. + */ + private function loadRelatedContributions() { + $relatedContributions = array(); + + $relatedContributionsResult = civicrm_api3('Contribution', 'get', array( + 'sequential' => 1, + 'contribution_recur_id' => $this->id, + 'contact_id' => $this->contactId, + 'options' => array('limit' => 0), + )); + + foreach ($relatedContributionsResult['values'] as $contribution) { + $this->insertAmountExpandingPaymentsControl($contribution); + $this->fixDateFormats($contribution); + $this->insertStatusLabels($contribution); + $this->insertContributionActions($contribution); + + $relatedContributions[] = $contribution; + } + + if (count($relatedContributions) > 0) { + $this->assign('contributionsCount', count($relatedContributions)); + $this->assign('relatedContributions', json_encode($relatedContributions)); + } + } + + /** + * Inserts a string into the array with the html used to show the expanding + * payments control, which loads when user clicks on the amount. + * + * @param array $contribution + * Reference to the array holding the contribution's data and where the + * control will be inserted into + */ + private function insertAmountExpandingPaymentsControl(&$contribution) { + $amount = CRM_Utils_Money::format($contribution['total_amount'], $contribution['currency']); + + $expandPaymentsUrl = CRM_Utils_System::url('civicrm/payment', + array( + 'view' => 'transaction', + 'component' => 'contribution', + 'action' => 'browse', + 'cid' => $this->contactId, + 'id' => $contribution['contribution_id'], + 'selector' => 1, + ), + FALSE, NULL, TRUE + ); + + $contribution['amount_control'] = ' + +   ' . $amount . ' + + '; + } + + /** + * Fixes date fields present in the given contribution. + * + * @param array $contribution + * Reference to the array holding the contribution's data + */ + private function fixDateFormats(&$contribution) { + $config = CRM_Core_Config::singleton(); + + $contribution['formatted_receive_date'] = CRM_Utils_Date::customFormat($contribution['receive_date'], $config->dateformatDatetime); + $contribution['formatted_thankyou_date'] = CRM_Utils_Date::customFormat($contribution['thankyou_date'], $config->dateformatDatetime); + } + + /** + * Inserts a contribution_status_label key into the array, with the value + * showing the current status plus observations on the current status. + * + * @param array $contribution + * Reference to the array holding the contribution's data and where the new + * position will be inserted + */ + private function insertStatusLabels(&$contribution) { + $contribution['contribution_status_label'] = $contribution['contribution_status']; + + if ($contribution['is_pay_later'] && CRM_Utils_Array::value('contribution_status', $contribution) == 'Pending') { + $contribution['contribution_status_label'] .= ' (' . ts('Pay Later') . ')'; + } + elseif (CRM_Utils_Array::value('contribution_status', $contribution) == 'Pending') { + $contribution['contribution_status_label'] .= ' (' . ts('Incomplete Transaction') . ')'; + } + } + + /** + * Inserts into the given array a string with the 'action' key, holding the + * html to be used to show available actions for the contribution. + * + * @param $contribution + * Reference to the array holding the contribution's data. It is also the + * array where the new 'action' key will be inserted. + */ + private function insertContributionActions(&$contribution) { + $contribution['action'] = CRM_Core_Action::formLink( + $this->buildContributionLinks($contribution), + $this->getContributionPermissionsMask(), + array( + 'id' => $contribution['contribution_id'], + 'cid' => $contribution['contact_id'], + 'cxt' => 'contribution', + ), + ts('more'), + FALSE, + 'contribution.selector.row', + 'Contribution', + $contribution['contribution_id'] + ); + } + + /** + * Builds list of links for authorized actions that can be done on given + * contribution. + * + * @param array $contribution + * + * @return array + */ + private function buildContributionLinks($contribution) { + $links = CRM_Contribute_Selector_Search::links($contribution['contribution_id'], + CRM_Utils_Request::retrieve('action', 'String'), + NULL, + NULL + ); + + $isPayLater = FALSE; + if ($contribution['is_pay_later'] && CRM_Utils_Array::value('contribution_status', $contribution) == 'Pending') { + $isPayLater = TRUE; + + $links[CRM_Core_Action::ADD] = array( + 'name' => ts('Pay with Credit Card'), + 'url' => 'civicrm/contact/view/contribution', + 'qs' => 'reset=1&action=update&id=%%id%%&cid=%%cid%%&context=%%cxt%%&mode=live', + 'title' => ts('Pay with Credit Card'), + ); + } + + if (in_array($contribution['contribution_status'], array('Partially paid', 'Pending refund')) || $isPayLater) { + $buttonName = ts('Record Payment'); + + if ($contribution['contribution_status'] == 'Pending refund') { + $buttonName = ts('Record Refund'); + } + elseif (CRM_Core_Config::isEnabledBackOfficeCreditCardPayments()) { + $links[CRM_Core_Action::BASIC] = array( + 'name' => ts('Submit Credit Card payment'), + 'url' => 'civicrm/payment/add', + 'qs' => 'reset=1&id=%%id%%&cid=%%cid%%&action=add&component=contribution&mode=live', + 'title' => ts('Submit Credit Card payment'), + ); + } + $links[CRM_Core_Action::ADD] = array( + 'name' => $buttonName, + 'url' => 'civicrm/payment', + 'qs' => 'reset=1&id=%%id%%&cid=%%cid%%&action=add&component=contribution', + 'title' => $buttonName, + ); + } + + return $links; + } + + /** + * Builds a mask with allowed contribution related permissions. + * + * @return int + */ + private function getContributionPermissionsMask() { + $permissions = array(CRM_Core_Permission::VIEW); + if (CRM_Core_Permission::check('edit contributions')) { + $permissions[] = CRM_Core_Permission::EDIT; + } + if (CRM_Core_Permission::check('delete in CiviContribute')) { + $permissions[] = CRM_Core_Permission::DELETE; + } + + return CRM_Core_Action::mask($permissions); + } + +} diff --git a/templates/CRM/Admin/Form/Preferences/Display.hlp b/templates/CRM/Admin/Form/Preferences/Display.hlp index 8c8b75a217..ff199d4a42 100644 --- a/templates/CRM/Admin/Form/Preferences/Display.hlp +++ b/templates/CRM/Admin/Form/Preferences/Display.hlp @@ -1,46 +1,46 @@ -{* - +--------------------------------------------------------------------+ - | CiviCRM version 5 | - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2018 | - +--------------------------------------------------------------------+ - | 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 | - +--------------------------------------------------------------------+ -*} -{htxt id="editor_id-title"} - {ts}WYSIWYG Editor{/ts} -{/htxt} -{htxt id="editor_id"} -

- {ts}A "WYSIWYG" (What You See Is What You Get) is a rich-text editor, like a mini word-processor, for editing HTML content in CiviCRM.{/ts} -

- -{/htxt} - -{htxt id="id-invoices_id-title"} - {ts}Invoices / Credit Notes{/ts} -{/htxt} -{htxt id="id-invoices_id"} - {capture assign=invoiceURL}{crmURL p='civicrm/admin/setting/preferences/contribute' q="reset=1"}{/capture} - {ts 1=$invoiceURL}In order to enable logged in users to download invoices and credit notes from the dashboard. Please first enable CiviCRM invoicing functionality Administer > CiviContribute > CiviContribute Component Settings{/ts} -{/htxt} +{* + +--------------------------------------------------------------------+ + | CiviCRM version 5 | + +--------------------------------------------------------------------+ + | Copyright CiviCRM LLC (c) 2004-2018 | + +--------------------------------------------------------------------+ + | 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 | + +--------------------------------------------------------------------+ +*} +{htxt id="editor_id-title"} + {ts}WYSIWYG Editor{/ts} +{/htxt} +{htxt id="editor_id"} +

+ {ts}A "WYSIWYG" (What You See Is What You Get) is a rich-text editor, like a mini word-processor, for editing HTML content in CiviCRM.{/ts} +

+ +{/htxt} + +{htxt id="id-invoices_id-title"} + {ts}Invoices / Credit Notes{/ts} +{/htxt} +{htxt id="id-invoices_id"} + {capture assign=invoiceURL}{crmURL p='civicrm/admin/setting/preferences/contribute' q="reset=1"}{/capture} + {ts 1=$invoiceURL}In order to enable logged in users to download invoices and credit notes from the dashboard. Please first enable CiviCRM invoicing functionality Administer > CiviContribute > CiviContribute Component Settings{/ts} +{/htxt} diff --git a/templates/CRM/Contribute/Form/Task/Invoice.hlp b/templates/CRM/Contribute/Form/Task/Invoice.hlp index ce84247542..63c422d3bb 100644 --- a/templates/CRM/Contribute/Form/Task/Invoice.hlp +++ b/templates/CRM/Contribute/Form/Task/Invoice.hlp @@ -1,53 +1,53 @@ -{* - +--------------------------------------------------------------------+ - | CiviCRM version 5 | - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2018 | - +--------------------------------------------------------------------+ - | 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 | - +--------------------------------------------------------------------+ -*} -{htxt id ="id-from_email-title"} - {ts}From Address{/ts} -{/htxt} -{htxt id="content-intro-title"} - {ts}Message Formats{/ts} -{/htxt} -{htxt id="content-intro"} -

{ts}You can choose to send BOTH an HTML and a plain TEXT version of your mailing, OR you can send a TEXT version only.{/ts}

-

{ts}If you create only an HTML version, CiviMail will automatically create a TEXT version for your recipients who have chosen NOT to receive HTML email.{/ts}

-

{ts}Required Elements{/ts}

-

{ts}CiviMail email messages must include an opt-out link ("Opt out via web page"), and the postal address of your organization. These elements help reduce the chances of your email being categorized as SPAM. They can be included in the main message body OR in a re-usable message footer. Refer to the online documentation for details on how to include required links and contact information as well as sample messages.{/ts} {docURL page="Sample CiviMail Messages" resource="wiki"}

-{/htxt} - -{htxt id="upload-compose-title"} - {ts}Upload or Compose On-screen{/ts} -{/htxt} -{htxt id="upload-compose"} -

{ts}You can use your favorite editor to create content on your local computer and then Upload the files. OR you can Compose content directly on the screen.{/ts}

-

{ts}If you choose to compose on the screen, a basic WYSIWYG (what-you-see-is-what-you-get) editor is provided which you can use create simple HTML messages. However, if you are planning on creating HTML messages with complex layouts, it is best to use an HTML editor on your local computer. Then locate and upload the saved file(s) by clicking the Browse button.{/ts}

-{/htxt} - -{htxt id="id-message-text-title"} - {ts}Text Message{/ts} -{/htxt} -{htxt id="id-message-text"} -

{ts}You can send your email as a simple text-only message, as an HTML formatted message, or both. Text-only messages are sufficient for most email communication, and some recipients may prefer not to receive HTML formatted messages.{/ts}

-

{ts}HTML messages have more visual impact, allow you to include images, and may be more readable if you are including links to website pages. However, different email programs may interpret HTML formats differently, so use this option cautiously unless you have a template format that has been tested with different web and desktop email programs.{/ts}

-{/htxt} +{* + +--------------------------------------------------------------------+ + | CiviCRM version 5 | + +--------------------------------------------------------------------+ + | Copyright CiviCRM LLC (c) 2004-2018 | + +--------------------------------------------------------------------+ + | 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 | + +--------------------------------------------------------------------+ +*} +{htxt id ="id-from_email-title"} + {ts}From Address{/ts} +{/htxt} +{htxt id="content-intro-title"} + {ts}Message Formats{/ts} +{/htxt} +{htxt id="content-intro"} +

{ts}You can choose to send BOTH an HTML and a plain TEXT version of your mailing, OR you can send a TEXT version only.{/ts}

+

{ts}If you create only an HTML version, CiviMail will automatically create a TEXT version for your recipients who have chosen NOT to receive HTML email.{/ts}

+

{ts}Required Elements{/ts}

+

{ts}CiviMail email messages must include an opt-out link ("Opt out via web page"), and the postal address of your organization. These elements help reduce the chances of your email being categorized as SPAM. They can be included in the main message body OR in a re-usable message footer. Refer to the online documentation for details on how to include required links and contact information as well as sample messages.{/ts} {docURL page="Sample CiviMail Messages" resource="wiki"}

+{/htxt} + +{htxt id="upload-compose-title"} + {ts}Upload or Compose On-screen{/ts} +{/htxt} +{htxt id="upload-compose"} +

{ts}You can use your favorite editor to create content on your local computer and then Upload the files. OR you can Compose content directly on the screen.{/ts}

+

{ts}If you choose to compose on the screen, a basic WYSIWYG (what-you-see-is-what-you-get) editor is provided which you can use create simple HTML messages. However, if you are planning on creating HTML messages with complex layouts, it is best to use an HTML editor on your local computer. Then locate and upload the saved file(s) by clicking the Browse button.{/ts}

+{/htxt} + +{htxt id="id-message-text-title"} + {ts}Text Message{/ts} +{/htxt} +{htxt id="id-message-text"} +

{ts}You can send your email as a simple text-only message, as an HTML formatted message, or both. Text-only messages are sufficient for most email communication, and some recipients may prefer not to receive HTML formatted messages.{/ts}

+

{ts}HTML messages have more visual impact, allow you to include images, and may be more readable if you are including links to website pages. However, different email programs may interpret HTML formats differently, so use this option cautiously unless you have a template format that has been tested with different web and desktop email programs.{/ts}

+{/htxt} diff --git a/templates/CRM/Contribute/Page/ContributionRecurPayments.tpl b/templates/CRM/Contribute/Page/ContributionRecurPayments.tpl index 566a466a42..b7751dbbbc 100644 --- a/templates/CRM/Contribute/Page/ContributionRecurPayments.tpl +++ b/templates/CRM/Contribute/Page/ContributionRecurPayments.tpl @@ -1,42 +1,42 @@ -{if $contributionsCount > 0} -
-
{ts}Related Contributions{/ts}
-
- - - - - - - - - - - - -
{ts}Amount{/ts}{ts}Type{/ts}{ts}Source{/ts}{ts}Recieved{/ts}{ts}Thank-you Sent{/ts}{ts}Status{/ts} 
- -
-
-{else} -
-
- {ts}No contributions have been recorded for this recurring contribution.{/ts} -
-{/if} +{if $contributionsCount > 0} +
+
{ts}Related Contributions{/ts}
+
+ + + + + + + + + + + + +
{ts}Amount{/ts}{ts}Type{/ts}{ts}Source{/ts}{ts}Recieved{/ts}{ts}Thank-you Sent{/ts}{ts}Status{/ts} 
+ +
+
+{else} +
+
+ {ts}No contributions have been recorded for this recurring contribution.{/ts} +
+{/if} diff --git a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl index 9c48726237..09cf695365 100644 --- a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl +++ b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl @@ -1,111 +1,111 @@ -{* - +--------------------------------------------------------------------+ - | CiviCRM version 5 | - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2018 | - +--------------------------------------------------------------------+ - | 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 | - +--------------------------------------------------------------------+ -*} -{if $hasParent || $isRepeatingEntity || $scheduleReminderId} - {capture assign='entity_type'}{$recurringEntityType|lower}{/capture} - -{literal} - -{/literal} -{/if} +{* + +--------------------------------------------------------------------+ + | CiviCRM version 5 | + +--------------------------------------------------------------------+ + | Copyright CiviCRM LLC (c) 2004-2018 | + +--------------------------------------------------------------------+ + | 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 | + +--------------------------------------------------------------------+ +*} +{if $hasParent || $isRepeatingEntity || $scheduleReminderId} + {capture assign='entity_type'}{$recurringEntityType|lower}{/capture} + +{literal} + +{/literal} +{/if} diff --git a/templates/CRM/Member/Page/RecurringContributions.tpl b/templates/CRM/Member/Page/RecurringContributions.tpl index 37dcdc227a..4d11e7aa17 100644 --- a/templates/CRM/Member/Page/RecurringContributions.tpl +++ b/templates/CRM/Member/Page/RecurringContributions.tpl @@ -1,6 +1,6 @@ -{if $recur} -
-
-
- {include file="CRM/Contribute/Page/ContributionRecur.tpl" action=16} -{/if} +{if $recur} +
+
+
+ {include file="CRM/Contribute/Page/ContributionRecur.tpl" action=16} +{/if} -- 2.25.1