effective_memberships 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf72d5bb8220dd574786eceebb0f8722521e6b097c1aff7a97742681f74bd0de
-  data.tar.gz: 00564617a0a0b722d39aa4466fa16c8fff00dfa60ed372e7cca86d9f5f8b95bf
+  metadata.gz: c506926f876b0fe6e4559cce6784e0c0ac8f30891dca21183f74dd5ab1fc5ee6
+  data.tar.gz: 980454f32127c3423d33aaaf4136615fac433dbede09f718ae7ebfb1c0cc3b39
 SHA512:
-  metadata.gz: 67ee50afa73bd30d416a152d8e43b6ed3827733ab1c01565a270fb295f8eb47ffe327d5b9155ff584b8e1a6558f2a5b0c3f33e016e9cb966fe16d0ca250c1d6e
-  data.tar.gz: d2af28eea6edf0bc4790e819e712be0b7fe3eb4981b9a1068d9699b3274480a0b7e8ed78a44bbbb7fd8646cf0cca5579b0b712450e486b9fbe2388a18b5e597d
+  metadata.gz: 29813982537ac083f937e2c1d8df597676b51eb26c7512f773f018fd91e0e2a3a389b6095f89ba8e8acdb44086313b2ff3638f926f380490366b8c7148eaaf46
+  data.tar.gz: 436039fe95ff3c095bb755663ec6f51674ffe620957b2f1a0557d598f634eeb651aa317476a887d818cd71bacf5a9708eb34eab2df06a3456201c6b02e1af890

data/app/datatables/admin/effective_memberships_datatable.rb

@@ -24,11 +24,48 @@ module Admin
       col :bad_standing_admin, visible: false
       col :bad_standing_reason, visible: false
 
+      col :email do |membership|
+        email = membership.owner.try(:email)
+        mail_to(email) if email.present?
+      end
+
+      col :phone do |membership|
+        membership.owner.try(:phone) || membership.owner.try(:home_phone) || membership.owner.try(:cell_phone)
+      end
+
+      col :address do |membership|
+        membership.owner.try(:addresses).try(:first).try(:to_html)
+      end
+
+      col :address1, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:address1)
+      end
+
+      col :address2, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:address2)
+      end
+
+      col :city, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:city)
+      end
+
+      col :province, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:province)
+      end
+
+      col :country, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:country)
+      end
+
+      col :postal_code, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:postal_code)
+      end
+
       actions_col
     end
 
     collection do
-      memberships = Effective::Membership.deep.all.includes(:owner)
+      memberships = Effective::Membership.deep.all.includes(owner: :addresses)
 
       raise('expected an owner_id, not user_id') if attributes[:user_id].present?
 

data/app/datatables/effective_memberships_directory_datatable.rb

@@ -11,7 +11,7 @@ class EffectiveMembershipsDirectoryDatatable < Effective::Datatable
   end
 
   collection do
-    scope = Effective::Membership.deep.includes(:owner)
+    scope = Effective::Membership.deep.good_standing.includes(:owner)
 
     archived_klasses.each do |klass|
       scope = scope.where.not(owner_id: klass.archived.select('id'), owner_type: klass.name)

data/app/models/effective/membership.rb

@@ -29,6 +29,8 @@ module Effective
     scope :deep, -> { includes(membership_categories: :category) }
     scope :sorted, -> { order(:id) }
 
+    scope :good_standing, -> { where(bad_standing: [nil, false]) }
+
     scope :with_paid_fees_through, -> (period = nil) {
       where(arel_table[:fees_paid_period].gteq(period || EffectiveMemberships.Registrar.current_period))
     }

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.3.9'
+  VERSION = '0.3.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails