From ad88b2bcc3aa2c5c85a4a776a412dd905a71b7dc Mon Sep 17 00:00:00 2001 From: Justin Freeman Date: Thu, 13 Oct 2022 18:13:07 +1100 Subject: [PATCH] CIVICRM-2052 Fix inconsistent terminology used when referring to Member Since, Membership Start Date and Membership Expiration Date --- CRM/Core/SelectValues.php | 6 +++--- CRM/Member/ActionMapping.php | 4 ++-- CRM/Member/Form/Membership.php | 4 ++-- CRM/Member/Form/MembershipRenewal.php | 2 +- CRM/Member/Selector/Search.php | 4 ++-- CRM/Report/Form/Contact/Detail.php | 6 +++--- CRM/Report/Form/Member/ContributionDetail.php | 6 +++--- CRM/Report/Form/Member/Detail.php | 6 +++--- CRM/Report/Form/Member/Summary.php | 2 +- .../templates/CRM/Contact/Form/Search/Custom/FullText.tpl | 2 +- templates/CRM/Member/Form/Membership.tpl | 2 +- templates/CRM/Member/Form/MembershipRenewal.tpl | 6 +++--- templates/CRM/Member/Form/MembershipStatus.tpl | 8 ++++---- templates/CRM/Member/Form/MembershipView.tpl | 4 ++-- templates/CRM/Member/Form/Task/Print.tpl | 4 ++-- templates/CRM/Member/Form/Task/SearchTaskHookSample.tpl | 4 ++-- templates/CRM/Member/Page/Tab.tpl | 8 ++++---- templates/CRM/Member/Page/UserDashboard.tpl | 8 ++++---- tests/phpunit/CRM/Core/PseudoConstantTest.php | 4 ++-- tests/phpunit/CRM/Member/Form/MembershipTest.php | 8 ++++---- tests/phpunit/CRM/Member/Form/Task/PDFLetterTest.php | 6 +++--- xml/templates/civicrm_data.tpl | 4 ++-- xml/templates/civicrm_navigation.tpl | 4 ++-- .../membership_autorenew_cancelled_html.tpl | 2 +- .../membership_autorenew_cancelled_text.tpl | 2 +- .../message_templates/membership_offline_receipt_html.tpl | 4 ++-- .../message_templates/membership_offline_receipt_text.tpl | 4 ++-- .../message_templates/membership_online_receipt_html.tpl | 4 ++-- .../message_templates/membership_online_receipt_text.tpl | 4 ++-- 29 files changed, 66 insertions(+), 66 deletions(-) diff --git a/CRM/Core/SelectValues.php b/CRM/Core/SelectValues.php index 5490d0562a..b980d1b8d7 100644 --- a/CRM/Core/SelectValues.php +++ b/CRM/Core/SelectValues.php @@ -156,9 +156,9 @@ class CRM_Core_SelectValues { */ public static function eventDate() { return [ - 'start_date' => ts('start date'), - 'end_date' => ts('end date'), - 'join_date' => ts('member since'), + 'start_date' => ts('Membership Start Date'), + 'end_date' => ts('Membership Expiration Date'), + 'join_date' => ts('Member Since'), ]; } diff --git a/CRM/Member/ActionMapping.php b/CRM/Member/ActionMapping.php index 24977439d9..aa40f00bb7 100644 --- a/CRM/Member/ActionMapping.php +++ b/CRM/Member/ActionMapping.php @@ -52,9 +52,9 @@ class CRM_Member_ActionMapping extends \Civi\ActionSchedule\Mapping { */ public function getDateFields() { return [ - 'join_date' => ts('Membership Join Date'), + 'join_date' => ts('Member Since'), 'start_date' => ts('Membership Start Date'), - 'end_date' => ts('Membership End Date'), + 'end_date' => ts('Membership Expiration Date'), ]; } diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php index f4a4e7462a..3977a21f22 100644 --- a/CRM/Member/Form/Membership.php +++ b/CRM/Member/Form/Membership.php @@ -1499,7 +1499,7 @@ DESC limit 1"); $statusMsg = ts('Membership for %1 has been updated.', [1 => $this->_memberDisplayName]); if ($endDate) { $endDate = CRM_Utils_Date::customFormat($endDate); - $statusMsg .= ' ' . ts('The membership End Date is %1.', [1 => $endDate]); + $statusMsg .= ' ' . ts('The Membership Expiration Date is %1.', [1 => $endDate]); } return $statusMsg; } @@ -1521,7 +1521,7 @@ DESC limit 1"); if ($memEndDate) { $memEndDate = CRM_Utils_Date::formatDateOnlyLong($memEndDate); - $statusMsg[$membership['membership_type_id']] .= ' ' . ts('The new membership End Date is %1.', [1 => $memEndDate]); + $statusMsg[$membership['membership_type_id']] .= ' ' . ts('The new Membership Expiration Date is %1.', [1 => $memEndDate]); } } $statusMsg = implode('
', $statusMsg); diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php index 433e563ab6..82dd22d5b6 100644 --- a/CRM/Member/Form/MembershipRenewal.php +++ b/CRM/Member/Form/MembershipRenewal.php @@ -431,7 +431,7 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form { // We process both the dates before comparison using CRM utils so that they are in same date format if (isset($params['renewal_date'])) { if ($params['renewal_date'] < $joinDate) { - $errors['renewal_date'] = ts('Renewal date must be the same or later than Member since (Join Date).'); + $errors['renewal_date'] = ts('Renewal date must be the same or later than Member Since.'); } } diff --git a/CRM/Member/Selector/Search.php b/CRM/Member/Selector/Search.php index 3505c836bb..e12e1e5519 100644 --- a/CRM/Member/Selector/Search.php +++ b/CRM/Member/Selector/Search.php @@ -477,12 +477,12 @@ class CRM_Member_Selector_Search extends CRM_Core_Selector_Base implements CRM_C 'direction' => CRM_Utils_Sort::DESCENDING, ], [ - 'name' => ts('Start Date'), + 'name' => ts('Membership Start Date'), 'sort' => 'membership_start_date', 'direction' => CRM_Utils_Sort::DONTCARE, ], [ - 'name' => ts('End Date'), + 'name' => ts('Membership Expiration Date'), 'sort' => 'membership_end_date', 'direction' => CRM_Utils_Sort::DONTCARE, ], diff --git a/CRM/Report/Form/Contact/Detail.php b/CRM/Report/Form/Contact/Detail.php index 98c7c18925..1394293d97 100644 --- a/CRM/Report/Form/Contact/Detail.php +++ b/CRM/Report/Form/Contact/Detail.php @@ -207,14 +207,14 @@ class CRM_Report_Form_Contact_Detail extends CRM_Report_Form { 'default' => TRUE, ], 'join_date' => [ - 'title' => ts('Join Date'), + 'title' => ts('Member Since'), ], 'membership_start_date' => [ - 'title' => ts('Start Date'), + 'title' => ts('Membership Start Date'), 'default' => TRUE, ], 'membership_end_date' => [ - 'title' => ts('End Date'), + 'title' => ts('Membership Expiration Date'), 'default' => TRUE, ], 'membership_status_id' => [ diff --git a/CRM/Report/Form/Member/ContributionDetail.php b/CRM/Report/Form/Member/ContributionDetail.php index 7f13f34f4e..a9a121eba1 100644 --- a/CRM/Report/Form/Member/ContributionDetail.php +++ b/CRM/Report/Form/Member/ContributionDetail.php @@ -299,15 +299,15 @@ class CRM_Report_Form_Member_ContributionDetail extends CRM_Report_Form { 'no_repeat' => TRUE, ], 'membership_start_date' => [ - 'title' => ts('Start Date'), + 'title' => ts('Membership Start Date'), 'default' => TRUE, ], 'membership_end_date' => [ - 'title' => ts('End Date'), + 'title' => ts('Membership Expiration Date'), 'default' => TRUE, ], 'join_date' => [ - 'title' => ts('Join Date'), + 'title' => ts('Member Since'), 'default' => TRUE, ], 'source' => ['title' => ts('Membership Source')], diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php index abab6c9d4f..527f42725c 100644 --- a/CRM/Report/Form/Member/Detail.php +++ b/CRM/Report/Form/Member/Detail.php @@ -79,11 +79,11 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form { 'no_repeat' => TRUE, ], 'membership_start_date' => [ - 'title' => ts('Start Date'), + 'title' => ts('Membership Start Date'), 'default' => TRUE, ], 'membership_end_date' => [ - 'title' => ts('End Date'), + 'title' => ts('Membership Expiration Date'), 'default' => TRUE, ], 'owner_membership_id' => [ @@ -91,7 +91,7 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form { 'default' => TRUE, ], 'join_date' => [ - 'title' => ts('Join Date'), + 'title' => ts('Member Since'), 'default' => TRUE, ], 'source' => ['title' => ts('Source')], diff --git a/CRM/Report/Form/Member/Summary.php b/CRM/Report/Form/Member/Summary.php index 198503f3c2..2559f35356 100644 --- a/CRM/Report/Form/Member/Summary.php +++ b/CRM/Report/Form/Member/Summary.php @@ -65,7 +65,7 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form { ], 'membership_end_date' => [ 'name' => 'end_date', - 'title' => ts('Membership End Date'), + 'title' => ts('Membership Expiration Date'), 'type' => CRM_Utils_Type::T_DATE, 'operatorType' => CRM_Report_Form::OP_DATE, ], diff --git a/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/FullText.tpl b/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/FullText.tpl index 2503715ca9..bc0f884a67 100644 --- a/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/FullText.tpl +++ b/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/FullText.tpl @@ -320,7 +320,7 @@ {ts}Membership Type{/ts} {ts}Membership Fee{/ts} {ts}Membership Start Date{/ts} - {ts}Membership End Date{/ts} + {ts}Membership Expiration Date{/ts} {ts}Source{/ts} {ts}Status{/ts} {if $allowFileSearch}{ts}File{/ts}{/if} diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl index 4796538045..a7564b1520 100644 --- a/templates/CRM/Member/Form/Membership.tpl +++ b/templates/CRM/Member/Form/Membership.tpl @@ -109,7 +109,7 @@ {$form.num_terms.label}  {$form.num_terms.html}
- {ts}Set the membership end date this many membership periods from now. Make sure the appropriate corresponding fee is entered below.{/ts} + {ts}Set the Membership Expiration Date this many membership periods from now. Make sure the appropriate corresponding fee is entered below.{/ts} {/if} diff --git a/templates/CRM/Member/Form/MembershipRenewal.tpl b/templates/CRM/Member/Form/MembershipRenewal.tpl index 2877601037..a8e00e02b4 100644 --- a/templates/CRM/Member/Form/MembershipRenewal.tpl +++ b/templates/CRM/Member/Form/MembershipRenewal.tpl @@ -72,7 +72,7 @@ {ts}Status of this membership.{/ts} - {ts}Membership End Date{/ts} + {ts}Membership Expiration Date{/ts}  {$endDate|crmDate} @@ -81,7 +81,7 @@ - {ts}Renewal extends membership end date by one membership period{/ts} + {ts}Renewal extends Membership Expiration Date by one membership period{/ts}   {ts}change{/ts} @@ -90,7 +90,7 @@ {$form.num_terms.label} {$form.num_terms.html|crmAddClass:two} {ts}membership periods{/ts}
{ts}Extend the membership end date by this many membership periods. Make sure the appropriate corresponding fee is entered below.{/ts} + class="description">{ts}Extend the Membership Expiration Date by this many membership periods. Make sure the appropriate corresponding fee is entered below.{/ts} {if $accessContribution and ! $membershipMode} diff --git a/templates/CRM/Member/Form/MembershipStatus.tpl b/templates/CRM/Member/Form/MembershipStatus.tpl index 0994cd0251..da4445c6ee 100644 --- a/templates/CRM/Member/Form/MembershipStatus.tpl +++ b/templates/CRM/Member/Form/MembershipStatus.tpl @@ -35,25 +35,25 @@ {$form.start_event.label} {$form.start_event.html}
- {ts}When does this status begin? EXAMPLE: New status begins at the membership 'join date'.{/ts} + {ts}When does this status begin? EXAMPLE: New status begins at the Member Since.{/ts} {$form.start_event_adjust_unit.label}  {$form.start_event_adjust_interval.html}  {$form.start_event_adjust_unit.html}
- {ts}Optional adjustment period added or subtracted from the Start Event. EXAMPLE: Current status might begin at 'join date' PLUS 3 months (to distinguish Current from New members).{/ts} + {ts}Optional adjustment period added or subtracted from the Start Event. EXAMPLE: Current status might begin at Member Since PLUS 3 months (to distinguish Current from New members).{/ts} {$form.end_event.label} {$form.end_event.html}
- {ts}When does this status end? EXAMPLE: Current status ends at the membership 'end date'.{/ts} + {ts}When does this status end? EXAMPLE: Current status ends at the Membership Expiration Date.{/ts} {$form.end_event_adjust_unit.label}  {$form.end_event_adjust_interval.html} {$form.end_event_adjust_unit.html}
- {ts}Optional adjustment period added or subtracted from the End Event. EXAMPLE: Grace status might end at 'end date' PLUS 1 month.{/ts} + {ts}Optional adjustment period added or subtracted from the End Event. EXAMPLE: Grace status might end at the Membership Expiration Date PLUS 1 month.{/ts} diff --git a/templates/CRM/Member/Form/MembershipView.tpl b/templates/CRM/Member/Form/MembershipView.tpl index 5751c106a8..442b0f7a6a 100644 --- a/templates/CRM/Member/Form/MembershipView.tpl +++ b/templates/CRM/Member/Form/MembershipView.tpl @@ -48,8 +48,8 @@ {ts}Source{/ts}{$source} {if $campaign}{ts}Campaign{/ts}{$campaign}{/if} {ts}Member Since{/ts}{$join_date|crmDate} - {ts}Start date{/ts}{$start_date|crmDate} - {ts}End date{/ts}{$end_date|crmDate} + {ts}Membership Start Date{/ts}{$start_date|crmDate} + {ts}Membership Expiration Date{/ts}{$end_date|crmDate} {ts}Auto-renew{/ts}{$auto_renew} {if $contribution_recur_id} diff --git a/templates/CRM/Member/Form/Task/Print.tpl b/templates/CRM/Member/Form/Task/Print.tpl index 0fee97559f..35755fc3ef 100644 --- a/templates/CRM/Member/Form/Task/Print.tpl +++ b/templates/CRM/Member/Form/Task/Print.tpl @@ -20,8 +20,8 @@ {ts}Name{/ts} {ts}Type{/ts} {ts}Member Since{/ts} - {ts}Start Date{/ts} - {ts}End Date{/ts} + {ts}Membership Start Date{/ts} + {ts}Membership Expiration Date{/ts} {ts}Source{/ts} {ts}Status{/ts} diff --git a/templates/CRM/Member/Form/Task/SearchTaskHookSample.tpl b/templates/CRM/Member/Form/Task/SearchTaskHookSample.tpl index c906f807d0..f639568e3e 100644 --- a/templates/CRM/Member/Form/Task/SearchTaskHookSample.tpl +++ b/templates/CRM/Member/Form/Task/SearchTaskHookSample.tpl @@ -10,8 +10,8 @@ - - + + diff --git a/templates/CRM/Member/Page/Tab.tpl b/templates/CRM/Member/Page/Tab.tpl index 7e807c9482..a54f9de191 100644 --- a/templates/CRM/Member/Page/Tab.tpl +++ b/templates/CRM/Member/Page/Tab.tpl @@ -47,8 +47,8 @@ - - + + @@ -98,8 +98,8 @@ - - + + diff --git a/templates/CRM/Member/Page/UserDashboard.tpl b/templates/CRM/Member/Page/UserDashboard.tpl index 11042160a9..5a715b44b6 100644 --- a/templates/CRM/Member/Page/UserDashboard.tpl +++ b/templates/CRM/Member/Page/UserDashboard.tpl @@ -18,8 +18,8 @@ - - + + @@ -49,8 +49,8 @@
{ts}Display Name{/ts}{ts}Start Date{/ts}{ts}End Date{/ts}{ts}Membership Start Date{/ts}{ts}Membership Expiration Date{/ts} {ts}Source{/ts}
{ts}Membership{/ts} {ts}Member Since{/ts}{ts}Start Date{/ts}{ts}End Date{/ts}{ts}Membership Start Date{/ts}{ts}Membership Expiration Date{/ts} {ts}Status{/ts} {ts}Source{/ts} {ts}Auto-renew{/ts}
{ts}Membership{/ts} {ts}Member Since{/ts}{ts}Start Date{/ts}{ts}End Date{/ts}{ts}Membership Start Date{/ts}{ts}Membership Expiration Date{/ts} {ts}Status{/ts} {ts}Source{/ts} {ts}Auto-renew{/ts}
{ts}Membership{/ts} {ts}Member Since{/ts}{ts}Start Date{/ts}{ts}End Date{/ts}{ts}Membership Start Date{/ts}{ts}Membership Expiration Date{/ts} {ts}Status{/ts}
- - + + diff --git a/tests/phpunit/CRM/Core/PseudoConstantTest.php b/tests/phpunit/CRM/Core/PseudoConstantTest.php index 29f75600b1..55aae27340 100644 --- a/tests/phpunit/CRM/Core/PseudoConstantTest.php +++ b/tests/phpunit/CRM/Core/PseudoConstantTest.php @@ -800,11 +800,11 @@ class CRM_Core_PseudoConstantTest extends CiviUnitTestCase { 'CRM_Member_DAO_MembershipStatus' => [ [ 'fieldName' => 'start_event', - 'sample' => 'start date', + 'sample' => 'Membership Start Date', ], [ 'fieldName' => 'end_event', - 'sample' => 'member since', + 'sample' => 'Member Since', ], [ 'fieldName' => 'start_event_adjust_unit', diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php index 85eef82334..f092f0484c 100644 --- a/tests/phpunit/CRM/Member/Form/MembershipTest.php +++ b/tests/phpunit/CRM/Member/Form/MembershipTest.php @@ -571,7 +571,7 @@ class CRM_Member_Form_MembershipTest extends CiviUnitTestCase { $this->mut->stop(); $this->assertEquals([ [ - 'text' => 'AnnualFixed membership for Mr. Anthony Anderson II has been added. The new membership End Date is December 31st, ' . $membershipEndYear . '. A membership confirmation and receipt has been sent to anthony_anderson@civicrm.org.', + 'text' => 'AnnualFixed membership for Mr. Anthony Anderson II has been added. The new Membership Expiration Date is December 31st, ' . $membershipEndYear . '. A membership confirmation and receipt has been sent to anthony_anderson@civicrm.org.', 'title' => 'Complete', 'type' => 'success', 'options' => NULL, @@ -841,7 +841,7 @@ class CRM_Member_Form_MembershipTest extends CiviUnitTestCase { ], 1); $this->assertEquals([ [ - 'text' => 'AnnualFixed membership for Mr. Anthony Anderson II has been added. The new membership End Date is ' . date('F jS, Y', strtotime('last day of this month')) . '.', + 'text' => 'AnnualFixed membership for Mr. Anthony Anderson II has been added. The new Membership Expiration Date is ' . date('F jS, Y', strtotime('last day of this month')) . '.', 'title' => 'Complete', 'type' => 'success', 'options' => NULL, @@ -1553,7 +1553,7 @@ Expires: ', $endDate = (new DateTime(date('Y-m-d')))->modify('+3 years')->modify('-1 day'); $endDate = $endDate->format("Y-m-d"); - $this->assertEquals($endDate, $membership['end_date'], 'Membership end date should be ' . $endDate); + $this->assertEquals($endDate, $membership['end_date'], 'Membership Expiration Date should be ' . $endDate); $this->assertEquals(1, count($contribution['values']), 'Pending contribution should be created.'); $contribution = $contribution['values'][$contribution['id']]; $additionalPaymentForm = new CRM_Contribute_Form_AdditionalPayment(); @@ -1576,7 +1576,7 @@ Expires: ', 'contact_id' => $this->_individualId, 'contribution_status_id' => CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed'), ]); - $this->assertEquals($endDate, $membership['end_date'], 'Membership end date should be same (' . $endDate . ') after payment'); + $this->assertEquals($endDate, $membership['end_date'], 'Membership Expiration Date should be same (' . $endDate . ') after payment'); $this->assertCount(1, $contribution['values'], 'Completed contribution should be fetched.'); } diff --git a/tests/phpunit/CRM/Member/Form/Task/PDFLetterTest.php b/tests/phpunit/CRM/Member/Form/Task/PDFLetterTest.php index 1d18d0ede2..6fba0c8bd4 100644 --- a/tests/phpunit/CRM/Member/Form/Task/PDFLetterTest.php +++ b/tests/phpunit/CRM/Member/Form/Task/PDFLetterTest.php @@ -109,9 +109,9 @@ class CRM_Member_Form_Task_PDFLetterTest extends CiviUnitTestCase { 'Test Fee' => 'fee', 'Test Type' => 'membership_type_id:label', 'Test Status' => 'status_id:label', - 'Test Join Date' => 'join_date', - 'Test Start Date' => 'start_date', - 'Test End Date' => 'end_date', + 'Test Member Since' => 'join_date', + 'Test Membership Start Date' => 'start_date', + 'Test Membership Expiration Date' => 'end_date', ]; $html = ''; diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl index 2012ca4755..91305a9245 100644 --- a/xml/templates/civicrm_data.tpl +++ b/xml/templates/civicrm_data.tpl @@ -586,8 +586,8 @@ VALUES (@option_group_id_report , '{ts escape="sql"}SYBUNT Report{/ts}', 'contribute/sybunt', 'CRM_Report_Form_Contribute_Sybunt', NULL, 0, 0, 12, '{ts escape="sql"}SYBUNT means some year(s) but not this year. Provides a list of constituents who donated at some time in the history of your organization but did not donate during the time period you specify.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL), (@option_group_id_report , '{ts escape="sql"}LYBUNT Report{/ts}', 'contribute/lybunt', 'CRM_Report_Form_Contribute_Lybunt', NULL, 0, 0, 13, '{ts escape="sql"}LYBUNT means last year but not this year. Provides a list of constituents who donated last year but did not donate during the time period you specify as the current year.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL), (@option_group_id_report , '{ts escape="sql"}Soft Credit Report{/ts}', 'contribute/softcredit', 'CRM_Report_Form_Contribute_SoftCredit', NULL, 0, 0, 14, '{ts escape="sql"}Shows contributions made by contacts that have been soft-credited to other contacts.{/ts}', 0, 0, 1,@contributeCompId, NULL, NULL), - (@option_group_id_report , '{ts escape="sql"}Membership Report (Summary){/ts}', 'member/summary', 'CRM_Report_Form_Member_Summary', NULL, 0, 0, 15, '{ts escape="sql"}Provides a summary of memberships by type and join date.{/ts}', 0, 0, 1, @memberCompId, NULL, NULL), - (@option_group_id_report , '{ts escape="sql"}Membership Report (Detail){/ts}', 'member/detail', 'CRM_Report_Form_Member_Detail', NULL, 0, 0, 16, '{ts escape="sql"}Provides a list of members along with their membership status and membership details (Join Date, Start Date, End Date). Can also display contributions (payments) associated with each membership.{/ts}', 0, 0, 1, @memberCompId, NULL, NULL), + (@option_group_id_report , '{ts escape="sql"}Membership Report (Summary){/ts}', 'member/summary', 'CRM_Report_Form_Member_Summary', NULL, 0, 0, 15, '{ts escape="sql"}Provides a summary of memberships by type and Member Since.{/ts}', 0, 0, 1, @memberCompId, NULL, NULL), + (@option_group_id_report , '{ts escape="sql"}Membership Report (Detail){/ts}', 'member/detail', 'CRM_Report_Form_Member_Detail', NULL, 0, 0, 16, '{ts escape="sql"}Provides a list of members along with their membership status and membership details (Member Since, Membership Start Date, Membership Expiration Date). Can also display contributions (payments) associated with each membership.{/ts}', 0, 0, 1, @memberCompId, NULL, NULL), (@option_group_id_report , '{ts escape="sql"}Membership Report (Lapsed){/ts}', 'member/lapse', 'CRM_Report_Form_Member_Lapse', NULL, 0, 0, 17, '{ts escape="sql"}Provides a list of memberships that lapsed or will lapse before the date you specify.{/ts}', 0, 0, 1, @memberCompId, NULL, NULL), (@option_group_id_report , '{ts escape="sql"}Event Participant Report (List){/ts}', 'event/participantListing', 'CRM_Report_Form_Event_ParticipantListing', NULL, 0, 0, 18, '{ts escape="sql"}Provides lists of participants for an event.{/ts}', 0, 0, 1, @eventCompId, NULL, NULL), (@option_group_id_report , '{ts escape="sql"}Event Income Report (Summary){/ts}', 'event/summary', 'CRM_Report_Form_Event_Summary', NULL, 0, 0, 19, '{ts escape="sql"}Provides an overview of event income. You can include key information such as event ID, registration, attendance, and income generated to help you determine the success of an event.{/ts}', 0, 0, 1, @eventCompId, NULL, NULL), diff --git a/xml/templates/civicrm_navigation.tpl b/xml/templates/civicrm_navigation.tpl index 5cc596a1eb..db6decff11 100644 --- a/xml/templates/civicrm_navigation.tpl +++ b/xml/templates/civicrm_navigation.tpl @@ -684,12 +684,12 @@ VALUES INSERT INTO `civicrm_report_instance` ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`) VALUES - ( @domainID, '{ts escape="sql" skip="true"}Membership Summary{/ts}', 'member/summary', '{ts escape="sql" skip="true"}Provides a summary of memberships by type and join date.{/ts}', 'access CiviMember', '{literal}a:18:{s:6:"fields";a:2:{s:18:"membership_type_id";s:1:"1";s:12:"total_amount";s:1:"1";}s:29:"membership_join_date_relative";s:1:"0";s:25:"membership_join_date_from";s:0:"";s:23:"membership_join_date_to";s:0:"";s:21:"membership_type_id_op";s:2:"in";s:24:"membership_type_id_value";a:0:{}s:12:"status_id_op";s:2:"in";s:15:"status_id_value";a:0:{}s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:0:{}s:9:"group_bys";a:2:{s:9:"join_date";s:1:"1";s:18:"membership_type_id";s:1:"1";}s:14:"group_bys_freq";a:1:{s:9:"join_date";s:5:"MONTH";}s:11:"description";s:56:"Provides a summary of memberships by type and join date.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviMember";s:9:"domain_id";i:1;}{/literal}'); + ( @domainID, '{ts escape="sql" skip="true"}Membership Summary{/ts}', 'member/summary', '{ts escape="sql" skip="true"}Provides a summary of memberships by Type and Member Since.{/ts}', 'access CiviMember', '{literal}a:18:{s:6:"fields";a:2:{s:18:"membership_type_id";s:1:"1";s:12:"total_amount";s:1:"1";}s:29:"membership_join_date_relative";s:1:"0";s:25:"membership_join_date_from";s:0:"";s:23:"membership_join_date_to";s:0:"";s:21:"membership_type_id_op";s:2:"in";s:24:"membership_type_id_value";a:0:{}s:12:"status_id_op";s:2:"in";s:15:"status_id_value";a:0:{}s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:0:{}s:9:"group_bys";a:2:{s:9:"join_date";s:1:"1";s:18:"membership_type_id";s:1:"1";}s:14:"group_bys_freq";a:1:{s:9:"join_date";s:5:"MONTH";}s:11:"description";s:59:"Provides a summary of memberships by Type and Member Since.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviMember";s:9:"domain_id";i:1;}{/literal}'); INSERT INTO `civicrm_report_instance` ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`) VALUES - ( @domainID, '{ts escape="sql" skip="true"}Membership Details{/ts}', 'member/detail', '{ts escape="sql" skip="true"}Provides a list of members along with their membership status and membership details (Join Date, Start Date, End Date). Can also display contributions (payments) associated with each membership.{/ts}', 'access CiviMember', '{literal}a:28:{s:6:"fields";a:5:{s:9:"sort_name";s:1:"1";s:18:"membership_type_id";s:1:"1";s:21:"membership_start_date";s:1:"1";s:19:"membership_end_date";s:1:"1";s:4:"name";s:1:"1";}s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:6:"id_min";s:0:"";s:6:"id_max";s:0:"";s:5:"id_op";s:3:"lte";s:8:"id_value";s:0:"";s:29:"membership_join_date_relative";s:1:"0";s:25:"membership_join_date_from";s:0:"";s:23:"membership_join_date_to";s:0:"";s:23:"owner_membership_id_min";s:0:"";s:23:"owner_membership_id_max";s:0:"";s:22:"owner_membership_id_op";s:3:"lte";s:25:"owner_membership_id_value";s:0:"";s:6:"tid_op";s:2:"in";s:9:"tid_value";a:0:{}s:6:"sid_op";s:2:"in";s:9:"sid_value";a:0:{}s:6:"gid_op";s:2:"in";s:9:"gid_value";a:0:{}s:8:"tagid_op";s:2:"in";s:11:"tagid_value";a:0:{}s:11:"description";s:119:"Provides a list of members along with their membership status and membership details (Join Date, Start Date, End Date).";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviMember";s:9:"domain_id";i:1;}{/literal}'); + ( @domainID, '{ts escape="sql" skip="true"}Membership Details{/ts}', 'member/detail', '{ts escape="sql" skip="true"}Provides a list of members along with their Membership Status and membership details (Member Since, Membership Start Date, Membership Expiration Date). Can also display contributions (payments) associated with each membership.{/ts}', 'access CiviMember', '{literal}a:28:{s:6:"fields";a:5:{s:9:"sort_name";s:1:"1";s:18:"membership_type_id";s:1:"1";s:21:"membership_start_date";s:1:"1";s:19:"membership_end_date";s:1:"1";s:4:"name";s:1:"1";}s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:6:"id_min";s:0:"";s:6:"id_max";s:0:"";s:5:"id_op";s:3:"lte";s:8:"id_value";s:0:"";s:29:"membership_join_date_relative";s:1:"0";s:25:"membership_join_date_from";s:0:"";s:23:"membership_join_date_to";s:0:"";s:23:"owner_membership_id_min";s:0:"";s:23:"owner_membership_id_max";s:0:"";s:22:"owner_membership_id_op";s:3:"lte";s:25:"owner_membership_id_value";s:0:"";s:6:"tid_op";s:2:"in";s:9:"tid_value";a:0:{}s:6:"sid_op";s:2:"in";s:9:"sid_value";a:0:{}s:6:"gid_op";s:2:"in";s:9:"gid_value";a:0:{}s:8:"tagid_op";s:2:"in";s:11:"tagid_value";a:0:{}s:11:"description";s:151:"Provides a list of members along with their Membership Status and membership details (Member Since, Membership Start Date, Membership Expiration Date).";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviMember";s:9:"domain_id";i:1;}{/literal}'); INSERT INTO `civicrm_report_instance` ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`) diff --git a/xml/templates/message_templates/membership_autorenew_cancelled_html.tpl b/xml/templates/message_templates/membership_autorenew_cancelled_html.tpl index 6c8ccdb379..738a71b90a 100644 --- a/xml/templates/message_templates/membership_autorenew_cancelled_html.tpl +++ b/xml/templates/message_templates/membership_autorenew_cancelled_html.tpl @@ -54,7 +54,7 @@ {if $mem_end_date} {/if} - + {foreach from=$value item=line} diff --git a/xml/templates/message_templates/membership_offline_receipt_text.tpl b/xml/templates/message_templates/membership_offline_receipt_text.tpl index d96589dc38..16207453d0 100644 --- a/xml/templates/message_templates/membership_offline_receipt_text.tpl +++ b/xml/templates/message_templates/membership_offline_receipt_text.tpl @@ -14,7 +14,7 @@ {if empty($cancelled)} {if empty($lineItem)} {ts}Membership Start Date{/ts}: {$mem_start_date} -{ts}Membership End Date{/ts}: {$mem_end_date} +{ts}Membership Expiration Date{/ts}: {$mem_end_date} {/if} {if $formValues.total_amount OR $formValues.total_amount eq 0 } @@ -36,7 +36,7 @@ {capture assign=ts_total}{ts}Total{/ts}{/capture} {/if} {capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture} -{capture assign=ts_end_date}{ts}Membership End Date{/ts}{/capture} +{capture assign=ts_end_date}{ts}Membership Expiration Date{/ts}{/capture} {$ts_item|string_format:"%-30s"} {$ts_total|string_format:"%10s"} {if !empty($dataArray)} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {$ts_total|string_format:"%10s"} {/if} {$ts_start_date|string_format:"%20s"} {$ts_end_date|string_format:"%20s"} -------------------------------------------------------------------------------------------------- diff --git a/xml/templates/message_templates/membership_online_receipt_html.tpl b/xml/templates/message_templates/membership_online_receipt_html.tpl index 3bb4b2f417..dd22db6b2f 100644 --- a/xml/templates/message_templates/membership_online_receipt_html.tpl +++ b/xml/templates/message_templates/membership_online_receipt_html.tpl @@ -61,7 +61,7 @@ {if $mem_end_date} {/if} - + {foreach from=$value item=line} diff --git a/xml/templates/message_templates/membership_online_receipt_text.tpl b/xml/templates/message_templates/membership_online_receipt_text.tpl index 02be9e48f3..1f8de194ca 100644 --- a/xml/templates/message_templates/membership_online_receipt_text.tpl +++ b/xml/templates/message_templates/membership_online_receipt_text.tpl @@ -17,7 +17,7 @@ {ts}Membership Type{/ts}: {$membership_name} {if $mem_start_date}{ts}Membership Start Date{/ts}: {$mem_start_date|crmDate} {/if} -{if $mem_end_date}{ts}Membership End Date{/ts}: {$mem_end_date|crmDate} +{if $mem_end_date}{ts}Membership Expiration Date{/ts}: {$mem_end_date|crmDate} {/if} {/if} @@ -60,7 +60,7 @@ {capture assign=ts_total}{ts}Total{/ts}{/capture} {/if} {capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture} -{capture assign=ts_end_date}{ts}Membership End Date{/ts}{/capture} +{capture assign=ts_end_date}{ts}Membership Expiration Date{/ts}{/capture} {$ts_item|string_format:"%-30s"} {$ts_total|string_format:"%10s"} {if !empty($dataArray)} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {$ts_total|string_format:"%10s"} {/if} {$ts_start_date|string_format:"%20s"} {$ts_end_date|string_format:"%20s"} -------------------------------------------------------------------------------------------------- -- 2.25.1
{ts}Membership{/ts}{ts}Start Date{/ts}{ts}End Date{/ts}{ts}Membership Start Date{/ts}{ts}Membership Expiration Date{/ts} {ts}Status{/ts}
- {ts}Membership End Date{/ts} + {ts}Membership Expiration Date{/ts} {$mem_end_date|crmDate} diff --git a/xml/templates/message_templates/membership_autorenew_cancelled_text.tpl b/xml/templates/message_templates/membership_autorenew_cancelled_text.tpl index 11806cc784..ca6d827bde 100644 --- a/xml/templates/message_templates/membership_autorenew_cancelled_text.tpl +++ b/xml/templates/message_templates/membership_autorenew_cancelled_text.tpl @@ -9,6 +9,6 @@ {ts}Membership Status{/ts}: {$membership_status} {if $mem_start_date}{ts}Membership Start Date{/ts}: {$mem_start_date|crmDate} {/if} -{if $mem_end_date}{ts}Membership End Date{/ts}: {$mem_end_date|crmDate} +{if $mem_end_date}{ts}Membership Expiration Date{/ts}: {$mem_end_date|crmDate} {/if} diff --git a/xml/templates/message_templates/membership_offline_receipt_html.tpl b/xml/templates/message_templates/membership_offline_receipt_html.tpl index 03e5be8a8c..65de42bd1a 100644 --- a/xml/templates/message_templates/membership_offline_receipt_html.tpl +++ b/xml/templates/message_templates/membership_offline_receipt_html.tpl @@ -59,7 +59,7 @@
- {ts}Membership End Date{/ts} + {ts}Membership Expiration Date{/ts} {$mem_end_date} @@ -98,7 +98,7 @@ {ts}Total{/ts}{ts}Membership Start Date{/ts}{ts}Membership End Date{/ts}{ts}Membership Expiration Date{/ts}
- {ts}Membership End Date{/ts} + {ts}Membership Expiration Date{/ts} {$mem_end_date|crmDate} @@ -164,7 +164,7 @@ {ts}Total{/ts}{ts}Membership Start Date{/ts}{ts}Membership End Date{/ts}{ts}Membership Expiration Date{/ts}