effective_memberships 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 940bfa04e965ae36e054add85ac673260b5fa11f2ff3939ec0f00a3732b6bba1
-  data.tar.gz: c3d94b16860a507b64e75bc7b156e6ce96f79845e5561a25a52ae48c57f3951b
+  metadata.gz: 20a57ae6829f25668b31b12a6a67ca6b0fb648810a6efba12c516a30a969144f
+  data.tar.gz: 7b67ecef9d09b021e924b8f8e1a0eb33a741a8a10c8a8912c6aae5aff7fd8545
 SHA512:
-  metadata.gz: 81ba80b0314968331c9bc85a2a021be327780daf44854379f52f4f9f64d8e6c0a3b816871129610b953d2b6d29f8eca22aa4699cc5fc5aceee3fbf86b72e87e2
-  data.tar.gz: 7671e32ba29f5540b90bbd250e5f78503033af257702a01caccfb93064c5e8a111e95cff7212f64c7b0ef2d0d8872131b76cef7ee10a800700f157fd3e8258d1
+  metadata.gz: 14d942c1d353f5b439392fe6a5646efd1f5dbd2d74959c65a776394c339e3bbc6aaf794bbd7d352cb192416bd04ea7f97db21931ab88ff48c3f773f4c707322c
+  data.tar.gz: 5ac8508dd130358939656a248d568b8257c3f751dafb2a5d9b49e5cc4d036982750e8f33bcae7a9b5be9957eb0b9a9f3e28f942ece9dfb26b7ac83684d36b4f4

data/app/datatables/admin/effective_organizations_datatable.rb

@@ -1,7 +1,12 @@
 module Admin
   class EffectiveOrganizationsDatatable < Effective::Datatable
-    datatable do
+    filters do
+      scope :unarchived, label: 'All'
+      scope :members
+      scope :archived
+    end
 
+    datatable do
       col :updated_at, visible: false
       col :created_at, visible: false
 
@@ -11,16 +16,54 @@ module Admin
         col :category, search: categories
       end
 
-      col :title
+      col(:to_s, label: 'Organization', sql_column: true, action: :edit)
+      .search do |collection, term|
+        collection.where(id: effective_resource.search_any(term))
+      end.sort do |collection, direction|
+        collection.order(title: direction)
+      end
+
+      col :title, visible: false
+
+      col 'membership.joined_on'
+      col 'membership.fees_paid_through_period', label: 'Fees Paid Through'
+      col 'membership.categories'
 
       col :representatives_count
       col :representatives
 
+      col :email, visible: false
+
+      col :address1, visible: false do |organization|
+        organization.billing_address&.address1
+      end
+      col :address2, visible: false do |organization|
+        organization.billing_address&.address2
+      end
+      col :city, visible: false do |organization|
+        organization.billing_address&.city
+      end
+      col :state_code, label: 'Prov', visible: false do |organization|
+        organization.billing_address&.state_code
+      end
+      col :postal_code, label: 'Postal', visible: false do |organization|
+        organization.billing_address&.postal_code
+      end
+      col :country_code, label: 'Country', visible: false do |organization|
+        organization.billing_address&.country_code
+      end
+
+      col :phone, visible: false
+      col :fax, visible: false
+      col :website, visible: false
+      col :category, visible: false
+      col :notes, visible: false
+
       actions_col
     end
 
     collection do
-      EffectiveMemberships.Organization.deep.all
+      EffectiveMemberships.Organization.deep.left_joins(:membership).includes(membership: :membership_categories)
     end
 
     def categories

data/app/models/concerns/effective_memberships_organization.rb

@@ -23,6 +23,7 @@ module EffectiveMembershipsOrganization
     effective_memberships_owner
 
     acts_as_addressable :billing # effective_addresses
+    acts_as_archived unless respond_to?(:acts_as_archived?)
     log_changes(except: [:representatives, :users]) if respond_to?(:log_changes)
 
     # rich_text_body

data/app/views/admin/organizations/_fields.html.haml

@@ -2,5 +2,3 @@
 
 - if categories.present?
   = f.select :category, categories, required: true
-
-= f.text_field :title

data/app/views/admin/organizations/_form.html.haml

@@ -5,7 +5,7 @@
   - if organization.persisted?
     - if can?(:index, Effective::Membership)
       = tab 'Membership' do
-        = render 'admin/registrar_actions/form', owner: organization
+        = render 'admin/memberships/form', owner: organization
 
     = tab 'Representatives' do
       = render_datatable(Admin::EffectiveRepresentativesDatatable.new(organization: organization), inline: true, namespace: :admin)
@@ -18,10 +18,6 @@
       = tab 'Fee Payments' do
         = render_inline_datatable(Admin::EffectiveFeePaymentsDatatable.new(organization: organization))
 
-    - if can?(:index, Effective::MembershipHistory)
-      = tab 'History' do
-        = render_datatable(Admin::EffectiveMembershipHistoriesDatatable.new(owner: organization))
-
     - if can?(:index, Effective::Order)
       = tab 'Orders' do
         = render_datatable(Admin::EffectiveOrdersDatatable.new(user: organization))

data/app/views/admin/organizations/_form_organization.html.haml

@@ -3,9 +3,7 @@
     .col-sm-6
       %h2 Demographics
       = render 'admin/organizations/fields', f: f
-
-      %h2 Billing Address
-      = effective_address_fields(f, :billing)
+      = render 'organizations/fields_demographics', f: f
 
     .col-sm-6
       %h2 Membership

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

metadata

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