Skip to content

Commit

Permalink
Release 1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mattwire committed Dec 15, 2020
1 parent 2855ed2 commit 09f21a3
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,12 @@ CREATE TABLE IF NOT EXISTS `civicrm_membership_churn_monthly_table` (
* Resigned = Membership ended in that month
* Rejoined = Member rejoined in that month (The member has a expired membership record & a new membership record was created of the same membership type)
* Churn = (Joined + Rejoined - Resigned) / BroughtForward

## Release Notes

### Release 1.1

* Replace settings with generic form.
* Rename database tables to follow standard naming (ie. `civicrm_`).
* Handle current memberships with no end date (life members).
* Updates to coding standards and autogenerated code.
7 changes: 4 additions & 3 deletions info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
<email>[email protected]</email>
</maintainer>
<urls>
<url desc="Main Extension Page">https://civicrm.org/extensions/membership-churn-reports</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2020-11-30</releaseDate>
<version>1.1-dev</version>
<develStage>beta</develStage>
<releaseDate>2020-12-15</releaseDate>
<version>1.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.28</ver>
</compatibility>
Expand Down
6 changes: 3 additions & 3 deletions membershipchurnchart.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ function membershipchurnchart_civicrm_navigationMenu(&$menu) {
_membershipchurnchart_civix_navigationMenu($menu);
}

function membershipchurnchart_civicrm_pageRun( &$page ){
$sPageName = $page->getVar('_name') ;
if($sPageName == "CRM_Membershipchurnchart_Page_MembershipChurnChart"){
function membershipchurnchart_civicrm_pageRun(&$page) {
$sPageName = $page->getVar('_name');
if ($sPageName == "CRM_Membershipchurnchart_Page_MembershipChurnChart") {
CRM_Core_Resources::singleton()
->addScriptFile('uk.co.vedaconsulting.membershipchurnchart', 'js/d3.v3.js', 110, 'html-header', FALSE)
->addScriptFile('uk.co.vedaconsulting.membershipchurnchart', 'js/dc/dc.js', 110, 'html-header', FALSE)
Expand Down

0 comments on commit 09f21a3

Please sign in to comment.