effective_memberships 0.4.6 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20a57ae6829f25668b31b12a6a67ca6b0fb648810a6efba12c516a30a969144f
-  data.tar.gz: 7b67ecef9d09b021e924b8f8e1a0eb33a741a8a10c8a8912c6aae5aff7fd8545
+  metadata.gz: 60e4351c09c9d070ea622ed6e7770df2f14d53e177a4ea74e04294d00b91af6f
+  data.tar.gz: 65436fdfda6a93aa08e1846d44b13131eedcc9d92e5831742dd6892d5ed87a32
 SHA512:
-  metadata.gz: 14d942c1d353f5b439392fe6a5646efd1f5dbd2d74959c65a776394c339e3bbc6aaf794bbd7d352cb192416bd04ea7f97db21931ab88ff48c3f773f4c707322c
-  data.tar.gz: 5ac8508dd130358939656a248d568b8257c3f751dafb2a5d9b49e5cc4d036982750e8f33bcae7a9b5be9957eb0b9a9f3e28f942ece9dfb26b7ac83684d36b4f4
+  metadata.gz: bffdf6c0614f8f36ee84b38426b1a8ea9aae37a7b1385fe9ce746584196bb043d2c835f1414942f8dc504b53090e6725649657fe348feab736a9b00453aa13c7
+  data.tar.gz: 845130d67ea3500c634f2f9c96684af9ca1785dc50133ac94efda8087cb80e2e50bf05ea071540106d7d0250c557a0267ead9ed5b3ea2f98ca59cb99858b197a

data/app/controllers/admin/memberships_controller.rb

@@ -5,7 +5,7 @@ module Admin
 
     include Effective::CrudController
 
-    submit :save, 'Update Membership',
+    submit :revise, 'Update Membership',
       success: -> { "#{resource.owner} has been successfully updated. Please double check the membership history is correct" },
       redirect: -> { admin_owners_path(resource) }
 

data/app/datatables/admin/effective_organizations_datatable.rb

@@ -63,7 +63,7 @@ module Admin
     end
 
     collection do
-      EffectiveMemberships.Organization.deep.left_joins(:membership).includes(membership: :membership_categories)
+      EffectiveMemberships.Organization.deep.left_joins(:membership).includes(:addresses, membership: :membership_categories)
     end
 
     def categories

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
@@ -181,8 +197,8 @@ module EffectiveMembershipsOwner
     # Build the renewal fee
     fee ||= fees.build()
 
-    late_on ||= EffectiveMemberships.Registrar.late_fee_date(period: period)
-    bad_standing_on ||= EffectiveMemberships.Registrar.bad_standing_date(period: period)
+    late_on ||= EffectiveMemberships.Registrar.late_fee_date(period: period) if category.create_late_fees?
+    bad_standing_on ||= EffectiveMemberships.Registrar.bad_standing_date(period: period) if category.create_bad_standing?
 
     fee.assign_attributes(
       fee_type: 'Renewal',

data/app/models/concerns/effective_memberships_registrar.rb

@@ -284,52 +284,53 @@ module EffectiveMembershipsRegistrar
     retval
   end
 
-
   # This is intended to be run once per day in a rake task
   # rake effective_memberships:create_fees
   # Create Renewal and Late fees
-  def create_fees!(period: nil, late_on: nil, bad_standing_on: nil)
-    # The current period, based on Time.zone.now
+  def create_fees!(period: nil)
     period ||= current_period
-    late_on ||= late_fee_date(period: period)
-    bad_standing_on ||= bad_standing_date(period: period)
+    memberships = Effective::Membership.deep.with_unpaid_fees_through(period)
 
     # Create Renewal Fees
-    Effective::Membership.deep.with_unpaid_fees_through(period).find_each do |membership|
-      membership.categories.select(&:create_renewal_fees?).map do |category|
-        existing = membership.owner.membership_period_fee(category: category, period: period, except: 'Renewal')
-        next if existing.present? # This might be an existing Prorated fee
+    memberships.find_each { |membership| create_renewal_fees!(membership, period: period) }
+    GC.start
 
-        fee = membership.owner.build_renewal_fee(category: category, period: period, late_on: late_on, bad_standing_on: bad_standing_on)
-        raise("expected build_renewal_fee to return a fee for period #{period}") unless fee.kind_of?(Effective::Fee)
-        next if fee.purchased?
+    # Create Late Fees
+    memberships.find_each { |membership| create_late_fees!(membership, period: period) }
+    GC.start
 
-        puts("Created renewal fee for #{membership.owner}") if fee.new_record? && !Rails.env.test?
+    # Update Membership Status - Assign In Bad Standing
+    memberships.find_each { |membership| update_membership_status!(membership, period: period) }
+    GC.start
 
-        fee.save!
-      end
-    end
+    true
+  end
 
-    GC.start
+  def create_renewal_fees!(membership, period:)
+    membership.categories.select(&:create_renewal_fees?).map do |category|
+      existing = membership.owner.membership_period_fee(category: category, period: period, except: 'Renewal')
+      next if existing.present? # This might be an existing Prorated fee
 
-    # Create Late Fees
-    Effective::Membership.deep.with_unpaid_fees_through(period).find_each do |membership|
-      membership.categories.select(&:create_late_fees?).map do |category|
-        fee = membership.owner.build_late_fee(category: category, period: period)
-        next if fee.blank? || fee.purchased?
+      fee = membership.owner.build_renewal_fee(category: category, period: period)
+      raise("expected build_renewal_fee to return a fee for period #{period}") unless fee.kind_of?(Effective::Fee)
+      next if fee.purchased?
 
-        fee.save!
-      end
-    end
+      puts("Created renewal fee for #{membership.owner}") if fee.new_record? && !Rails.env.test?
 
-    GC.start
+      fee.save!
+    end
+  end
 
-    # Update Membership Status - Assign In Bad Standing
-    Effective::Membership.deep.with_unpaid_fees_through(period).find_each do |membership|
-      membership.owner.update_membership_status!
+  def create_late_fees!(membership, period:)
+    membership.categories.select(&:create_late_fees?).map do |category|
+      fee = membership.owner.build_late_fee(category: category, period: period)
+      next if fee.blank? || fee.purchased?
+      fee.save!
     end
+  end
 
-    true
+  def update_membership_status!(membership, period: nil)
+    membership.owner.update_membership_status!
   end
 
   # Called in the after_purchase of fee payment

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.rb

@@ -38,8 +38,9 @@ module Effective
     }
 
     scope :with_unpaid_fees_through, -> (period = nil) {
-      where(arel_table[:fees_paid_period].lt(period || EffectiveMemberships.Registrar.current_period))
-      .or(where(fees_paid_period: nil))
+      joined = where(arel_table[:joined_on].lt(period || EffectiveMemberships.Registrar.current_period))
+      unpaid = where(arel_table[:fees_paid_period].lt(period || EffectiveMemberships.Registrar.current_period)).or(where(fees_paid_period: nil))
+      joined.merge(unpaid)
     }
 
     before_validation do
@@ -119,7 +120,24 @@ module Effective
     end
 
     def fees_paid?
-      fees_paid_period == EffectiveMemberships.Registrar.current_period
+      paid_fees_through?(EffectiveMemberships.Registrar.current_period)
+    end
+
+    def paid_fees_through?(period = nil)
+      period ||= EffectiveMemberships.Registrar.current_period
+
+      return false if fees_paid_period.blank?
+      fees_paid_period >= period
+    end
+
+    def unpaid_fees_through?(period = nil)
+      period ||= EffectiveMemberships.Registrar.current_period
+
+      return false if joined_on.blank?
+      return false unless joined_on < period
+
+      return true if fees_paid_period.blank?
+      fees_paid_period < period
     end
 
     def change_fees_paid_period
@@ -127,6 +145,10 @@ module Effective
     end
 
     def change_fees_paid_period=(date)
+      if date.blank?
+        return assign_attributes(fees_paid_period: nil, fees_paid_through_period: nil)
+      end
+
       date = (date.respond_to?(:strftime) ? date : Date.parse(date))
 
       period = EffectiveMemberships.Registrar.period(date: date)
@@ -135,5 +157,20 @@ module Effective
       assign_attributes(fees_paid_period: period, fees_paid_through_period: period_end_on)
     end
 
+    # Admin updating membership info
+    def revise!
+      save!
+
+      period = EffectiveMemberships.Registrar.current_period
+      return true if paid_fees_through?(period)
+
+      # Otherwise build fees right now
+      EffectiveMemberships.Registrar.create_renewal_fees!(self, period: period)
+      EffectiveMemberships.Registrar.create_late_fees!(self, period: period)
+      EffectiveMemberships.Registrar.update_membership_status!(self, period: period)
+
+      true
+    end
+
   end
 end

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/memberships/_form_membership.html.haml

@@ -21,7 +21,7 @@
     - periods = registrar.periods(from: f.object.joined_on)
     - collection = periods.reverse.map { |period| [registrar.period_end_on(date: period), period] }
 
-    = f.select :change_fees_paid_period, collection, label: 'Fees Paid Through', hint: 'Which period this user has fees paid through. Can change how renewal fees are created.'
+    = f.select :change_fees_paid_period, collection, label: 'Fees Paid Through', hint: 'Which period this user has fees paid through. Determines which renewal fees should be created. Setting this to a past or blank period may create a renewal fee in the current period.'
 
     %p.text-muted To update the current membership categories, use the 'Assign' or 'Reclassify' actions below
 

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.6'
+  VERSION = '0.4.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_test_bot
   requirement: !ruby/object:Gem::Requirement
@@ -352,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