Show disabled membership types on contact tab

civicrm · Jan 27, 2021 · 165e4a0 · 165e4a0
1 parent 7049cd0
commit 165e4a0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
@@ -1575,11 +1575,16 @@ public static function buildMembershipTypeValues($form, $membershipTypeID = [],
    * @return null|string
    */
   public static function getContactMembershipCount($contactID, $activeOnly = FALSE) {
-    CRM_Financial_BAO_FinancialType::getAvailableMembershipTypes($membershipTypes);
+    // @todo Move this check to financialtypeacls extension
+    $membershipTypes = \Civi\Api4\MembershipType::get(FALSE)
+      ->execute()
+      ->indexBy('id')
+      ->column('name');
     $addWhere = " AND membership_type_id IN (0)";
     if (!empty($membershipTypes)) {
       $addWhere = " AND membership_type_id IN (" . implode(',', array_keys($membershipTypes)) . ")";
     }
+
     $select = "SELECT count(*) FROM civicrm_membership ";
     $where = "WHERE civicrm_membership.contact_id = {$contactID} AND civicrm_membership.is_test = 0 ";
 

diff --git a/CRM/Member/Page/Tab.php b/CRM/Member/Page/Tab.php
@@ -32,7 +32,11 @@ class CRM_Member_Page_Tab extends CRM_Core_Page {
    */
   public function browse() {
     $links = self::links('all', $this->_isPaymentProcessor, $this->_accessContribution);
-    CRM_Financial_BAO_FinancialType::getAvailableMembershipTypes($membershipTypes);
+    // @todo Move this check to financialtypeacls extension
+    $membershipTypes = \Civi\Api4\MembershipType::get(FALSE)
+      ->execute()
+      ->indexBy('id')
+      ->column('name');
     $addWhere = "membership_type_id IN (0)";
     if (!empty($membershipTypes)) {
       $addWhere = "membership_type_id IN (" . implode(',', array_keys($membershipTypes)) . ")";