effective_memberships 0.4.3 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1de9f1b37bb81729fcb68686af4113263a847742ef6c763679c74ad75e0633ca
-  data.tar.gz: 930ceb5ab018318e39331a02d9fbf725129b997c09d5019fc8a3bb03e7e916e4
+  metadata.gz: 20a57ae6829f25668b31b12a6a67ca6b0fb648810a6efba12c516a30a969144f
+  data.tar.gz: 7b67ecef9d09b021e924b8f8e1a0eb33a741a8a10c8a8912c6aae5aff7fd8545
 SHA512:
-  metadata.gz: 3872b4f4e30ec2e6c2f5a3068cfcb2dc5fbcadd557cf1146942f95dfd6663b04d586cf6137990b2742e410e8eac6b36a0d6f05b15ed537ef0a7aec1328b68dcf
-  data.tar.gz: 8806de111fc454554070e6d93213ce3a6c0f2bb6db1dd0bf4b5d07f4f9d352014be9f1da1ae078d1a0f99653be5613834449fccadebe02e67b55bf1512162848
+  metadata.gz: 14d942c1d353f5b439392fe6a5646efd1f5dbd2d74959c65a776394c339e3bbc6aaf794bbd7d352cb192416bd04ea7f97db21931ab88ff48c3f773f4c707322c
+  data.tar.gz: 5ac8508dd130358939656a248d568b8257c3f751dafb2a5d9b49e5cc4d036982750e8f33bcae7a9b5be9957eb0b9a9f3e28f942ece9dfb26b7ac83684d36b4f4

data/app/datatables/admin/effective_applicants_datatable.rb

@@ -48,7 +48,7 @@ module Admin
       end
 
       if attributes[:user_id].present?
-        applicants = applicants.where(user_id: attributes[:owner_id])
+        applicants = applicants.where(user_id: attributes[:user_id])
       end
 
       if attributes[:organization_id].present?

data/app/datatables/admin/effective_categories_datatable.rb

@@ -17,6 +17,10 @@ module Admin
       col :tax_exempt
       col :qb_item_name, visible: false
 
+      col :create_renewal_fees, visible: false
+      col :create_late_fees, visible: false
+      col :create_bad_standing, visible: false
+
       col :category_type, search: EffectiveMemberships.Category.category_types
 
       col :optional_applicant_wizard_steps, label: 'Applicant Steps'

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

@@ -110,11 +110,6 @@ module EffectiveMembershipsCategory
       .or(where(can_apply_restricted: true))
     }
 
-    # For the create_fees rake task
-    scope :create_renewal_fees, -> { where(create_renewal_fees: true) }
-    scope :create_late_fees, -> { where(create_late_fees: true) }
-    scope :create_bad_standing, -> { where(create_bad_standing: true) }
-
     validates :title, presence: true, uniqueness: true
     validates :category_type, presence: true
     validates :position, presence: true

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/models/concerns/effective_memberships_owner.rb

@@ -160,9 +160,21 @@ module EffectiveMembershipsOwner
     fee
   end
 
+  # These should be singular fees anyway.
+  def membership_period_fee(category:, period:, except: nil)
+    raise('expected except to be a string like Renewal') if except.present? && !except.kind_of?(String)
+    fees.find { |fee| fee.membership_period_fee? && fee.period == period && fee.category_id == category.id && fee.category_type == category.class.name && (except.blank? || fee.fee_type != except) }
+  end
+
   def build_renewal_fee(category:, period:, late_on: nil, bad_standing_on: nil)
     raise('must have an existing membership') unless membership.present?
 
+    # Sanity check.
+    # If there's already a purchased or unpurchased Prorated (or other membership period advancing fee) in this period
+    # We shouldn't be building renewal fees for the same period a prorated fee is purcahsed in
+    prorated = membership_period_fee(category: category, period: period, except: 'Renewal')
+    raise('must not have an existing membership_period (prorated) fee in this period') if prorated.present?
+
     fee = fees.find { |fee| fee.fee_type == 'Renewal' && fee.period == period && fee.category_id == category.id && fee.category_type == category.class.name }
     return fee if fee&.purchased?
 

data/app/models/concerns/effective_memberships_registrar.rb

@@ -33,6 +33,15 @@ module EffectiveMembershipsRegistrar
     raise('to be implemented by app registrar')
   end
 
+  # Should two could be overridden if we do non 1-year periods
+  def advance_period(period:, number:)
+    period.advance(years: number).beginning_of_year
+  end
+
+  def period_end_on(date:)
+    period(date: date).end_of_year
+  end
+
   def assign!(owner, categories:, date: nil, number: nil)
     categories = Array(categories)
 
@@ -243,18 +252,41 @@ module EffectiveMembershipsRegistrar
     period(date: Time.zone.now)
   end
 
+  def last_period
+    advance_period(period: current_period, number: -1)
+  end
+
   # Returns a date of Jan 1, Year
   def period(date:)
     cutoff = renewal_fee_date(date: date) # period_end_on
-    period = (date < cutoff) ? date.beginning_of_year : date.advance(years: 1).beginning_of_year
+    period = (date < cutoff) ? advance_period(period: date, number: 0) : advance_period(period: date, number: 1)
     period.to_date
   end
 
-  def period_end_on(date:)
-    period(date: date).end_of_year
+  # This is only used for a form collection on admin memberships
+  def periods(from:, to: nil)
+    to ||= Time.zone.now
+
+    raise('expected to date') unless to.respond_to?(:strftime)
+    raise('expected from date') unless from.respond_to?(:strftime)
+
+    from = period(date: from)
+    to = period(date: to)
+
+    retval = []
+
+    loop do
+      retval << from
+      from = advance_period(period: from, number: 1)
+      break if from > to
+    end
+
+    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
@@ -263,13 +295,17 @@ module EffectiveMembershipsRegistrar
     bad_standing_on ||= bad_standing_date(period: period)
 
     # Create Renewal Fees
-    Effective::Membership.create_renewal_fees(period).find_each do |membership|
-
+    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
+
         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?
 
+        puts("Created renewal fee for #{membership.owner}") if fee.new_record? && !Rails.env.test?
+
         fee.save!
       end
     end
@@ -277,7 +313,7 @@ module EffectiveMembershipsRegistrar
     GC.start
 
     # Create Late Fees
-    Effective::Membership.create_late_fees(period).find_each do |membership|
+    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?

data/app/models/effective/membership.rb

@@ -42,18 +42,6 @@ module Effective
       .or(where(fees_paid_period: nil))
     }
 
-    scope :create_renewal_fees, -> (period = nil) {
-      deep.with_unpaid_fees_through(period).where.not(fees_paid_period: nil) # Must have purchased a Prorated or Renewal Fee before
-    }
-
-    scope :create_late_fees, -> (period = nil) {
-      deep.with_unpaid_fees_through(period).where.not(fees_paid_period: nil) # Must have purchased a Prorated or Renewal Fee before
-    }
-
-    scope :create_bad_standing, -> (period = nil) {
-      deep.with_unpaid_fees_through(period).where.not(fees_paid_period: nil) # Must have purchased a Prorated or Renewal Fee before
-    }
-
     before_validation do
       self.registration_on ||= joined_on
     end
@@ -134,5 +122,18 @@ module Effective
       fees_paid_period == EffectiveMemberships.Registrar.current_period
     end
 
+    def change_fees_paid_period
+      fees_paid_period
+    end
+
+    def change_fees_paid_period=(date)
+      date = (date.respond_to?(:strftime) ? date : Date.parse(date))
+
+      period = EffectiveMemberships.Registrar.period(date: date)
+      period_end_on = EffectiveMemberships.Registrar.period_end_on(date: date)
+
+      assign_attributes(fees_paid_period: period, fees_paid_through_period: period_end_on)
+    end
+
   end
 end

data/app/views/admin/memberships/_form_membership.html.haml

@@ -17,6 +17,12 @@
     = f.date_field :registration_on, label: 'Registered', hint: 'When the membership category last changed'
     = f.text_field :number, hint: 'The membership number. Must be unique.'
 
+    - registrar = EffectiveMemberships.Registrar
+    - 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.'
+
     %p.text-muted To update the current membership categories, use the 'Assign' or 'Reclassify' actions below
 
     = f.submit 'Update Membership', border: false, center: true, 'data-confirm': "Really update #{f.object.owner}?"

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.3'
+  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.3
+  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