effective_memberships 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52711c835dc479a8bc52e2c523d295999270b98eac479cfa8af855d12452466e
-  data.tar.gz: d5368da347ce46759fc6858b4c231788f91a0baf4ba70a8a8c9104c10e991c1d
+  metadata.gz: 60e4351c09c9d070ea622ed6e7770df2f14d53e177a4ea74e04294d00b91af6f
+  data.tar.gz: 65436fdfda6a93aa08e1846d44b13131eedcc9d92e5831742dd6892d5ed87a32
 SHA512:
-  metadata.gz: 7a62bf9547cd039f6f9035c0e075328db83455173709a0dbd672db63be2a6c92cf10551d43962deddcafca76c828c53ff0df2cf374ebf26a8e960d443b71586b
-  data.tar.gz: 7d57abebdaffccdf19af9a1220e20cd244054f04e8807da1e2dc3a45bb40a6010758e4e8676ded2e6321f14d59e4ca488dd05ac391514403c0315464b21c5c86
+  metadata.gz: bffdf6c0614f8f36ee84b38426b1a8ea9aae37a7b1385fe9ce746584196bb043d2c835f1414942f8dc504b53090e6725649657fe348feab736a9b00453aa13c7
+  data.tar.gz: 845130d67ea3500c634f2f9c96684af9ca1785dc50133ac94efda8087cb80e2e50bf05ea071540106d7d0250c557a0267ead9ed5b3ea2f98ca59cb99858b197a

data/app/models/concerns/effective_memberships_organization.rb

@@ -62,6 +62,11 @@ module EffectiveMembershipsOrganization
     scope :deep, -> { includes(:representatives) }
     scope :sorted, -> { order(:title) }
 
+    scope :membership_applying, -> {
+      applicants = EffectiveMemberships.Applicant.all
+      without_role(:member).where(id: applicants.select(:organization_id))
+    }
+
     validates :title, presence: true, uniqueness: true
     validates :email, presence: true
   end

data/app/models/concerns/effective_memberships_owner.rb

@@ -37,6 +37,22 @@ module EffectiveMembershipsOwner
     accepts_nested_attributes_for :membership_histories
 
     scope :members, -> { joins(:membership) }
+
+    scope :membership_removed, -> {
+      removed = Effective::MembershipHistory.removed.where(owner_type: name)
+      without_role(:member).where(id: removed.select(:owner_id))
+    }
+
+    scope :membership_bad_standing, -> {
+      bad_standing = Effective::Membership.where(bad_standing: true).where(owner_type: name)
+      where(id: bad_standing.select(:owner_id))
+    }
+
+    scope :membership_renewed_this_period, -> {
+      with_paid_fees_through = Effective::Membership.with_paid_fees_through.where(owner_type: name)
+      where(id: with_paid_fees_through.select(:owner_id))
+    }
+
   end
 
   def assign_member_role

data/app/models/concerns/effective_memberships_user.rb

@@ -27,6 +27,11 @@ module EffectiveMembershipsUser
       class_name: 'Effective::Representative', inverse_of: :user, dependent: :delete_all
 
     accepts_nested_attributes_for :representatives, allow_destroy: true
+
+    scope :membership_applying, -> {
+      applicants = EffectiveMemberships.Applicant.all
+      without_role(:member).where(id: applicants.select(:user_id))
+    }
   end
 
   # Instance Methods

data/app/models/effective/membership_history.rb

@@ -25,6 +25,8 @@ module Effective
     scope :deep, -> { includes(:owner) }
     scope :sorted, -> { order(:start_on) }
 
+    scope :removed, -> { where(removed: true) }
+
     validates :owner, presence: true
 
     # validates :categories, presence: true, unless: -> { removed? }

data/app/views/admin/fee_payments/_fee_payment.html.haml

@@ -1 +1,5 @@
+.card
+  .card-body= render 'effective/fee_payments/summary', fee_payment: fee_payment
+
 = render 'effective/fee_payments/fee_payment', fee_payment: fee_payment
+= render 'effective/fee_payments/orders', fee_payment: fee_payment

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

@@ -3,9 +3,8 @@
     = f.hidden_field :owner_id
     = f.hidden_field :owner_type
   - else
-    - raise('todo')
-    - collection = EffectiveMembershipsOwner.descendants.map { |d| [d.name.to_s, d.members.sorted] }.to_h
-    = f.select :owner_id, collection, polymorphic: true
+    - collection = { 'Users' => current_user.class.sorted, 'Organizations' => EffectiveMemberships.Organization.sorted }
+    = f.select :owner, collection, polymorphic: true
 
   - if f.object.new_record?
     = f.select :fee_type, EffectiveMemberships.custom_fee_types

data/app/views/admin/users/_col.html.haml

@@ -0,0 +1,12 @@
+- user = (resource.respond_to?(:email) ? resource : resource.user)
+
+= user.to_s
+
+- if user.email.present?
+  %br
+  = mail_to user.email
+
+- if user.membership.present?
+  %br
+  = '#' + user.membership.number
+  #{user.membership.categories.to_sentence}

data/app/views/effective/fee_payments/_orders.html.haml

@@ -1,4 +1,4 @@
 - if fee_payment.submit_order&.purchased?
   .card.mb-4
     .card-body
-      = render(fee_payment.submit_order)
+      = render('effective/orders/order', order: fee_payment.submit_order)

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.4.8'
+  VERSION = '0.4.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Code and Effect
@@ -366,6 +366,7 @@ files:
 - app/views/admin/registrar_actions/_form_remove.html.haml
 - app/views/admin/representatives/_form.html.haml
 - app/views/admin/representatives/_user_fields.html.haml
+- app/views/admin/users/_col.html.haml
 - app/views/effective/applicant_references/_applicant_reference.html.haml
 - app/views/effective/applicant_references/_datatable_actions.html.haml
 - app/views/effective/applicant_references/_form.html.haml