effective_memberships 0.12.2 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eee6457653137fc81d4b2bbb9523c2158da073a2a3742678f17e305047854b45
-  data.tar.gz: 5ad84fb485691eda2cef81d3b08b7de3c41306e07bd2adf62cef22903b42cdb6
+  metadata.gz: ef95cbbf40f72c47c5ca64efd70d28d1cb879e52431b22471f2d570ef759d495
+  data.tar.gz: a150c327ec0869e26822f7d484cdc99c414cd666679150e9ee0c83efc3b125aa
 SHA512:
-  metadata.gz: da419613c6a9c13734575d280cbfbbc9d25c7cda500db77f3fd062d181b3c1a03de55a9915aedbbd2943e79d7f206be285945b723fb123fbeb8ba39f4d31bd90
-  data.tar.gz: 1f58b027945b279185489021ef228ecd21cf6df2cefd9a473d67ed50002fa1b8a2bc847efd1cf1cd6ad70a6e06357db62439613ab8e0d5e81ce208fafb32c3ea
+  metadata.gz: cc04a6003782b0c39e4b67d03c012dc3e2247c93b5f43bd38fd47a843da7ee0c9fa11e5a02d56672724f95c453e5cf266179ea22f9e06da851c1d484a583edd2
+  data.tar.gz: dc070be5820ad2f616c4320a745879ff26b8e153f24ddc99fb92913d753f96198c387b58b8656e443737cec8ea1b5417032faceb394eae2ea640c61efbb05cf4

data/app/models/concerns/effective_memberships_owner.rb

@@ -208,6 +208,7 @@ module EffectiveMembershipsOwner
     fee.assign_attributes(
       fee_type: 'Discount',
       category: category,
+      from_category: from,
       period: period,
       price: price,
       tax_exempt: category.tax_exempt,

data/app/models/concerns/effective_memberships_registrar.rb

@@ -19,17 +19,17 @@ module EffectiveMembershipsRegistrar
   end
 
   def renewal_fee_date(date:)
-    Date.new(date.year, 12, 1) # Fees roll over every December 1st
+    Time.zone.local(date.year, 12, 1) # Fees roll over every December 1st
     raise('to be implemented by app registrar')
   end
 
   def late_fee_date(period:)
-    Date.new(period.year, 2, 1) # Fees are late after February 1st
+    Time.zone.local(period.year, 2, 1) # Fees are late after February 1st
     raise('to be implemented by app registrar')
   end
 
   def not_in_good_standing_date(period:)
-    Date.new(period.year, 3, 1) # Membership in bad standing after March 1st
+    Time.zone.local(period.year, 3, 1) # Membership in bad standing after March 1st
     raise('to be implemented by app registrar')
   end
 
@@ -54,7 +54,7 @@ module EffectiveMembershipsRegistrar
     EffectiveMemberships.Status.where(title: 'Not In Good Standing').first!
   end
 
-  # Should two could be overridden if we do non 1-year periods
+  # These two could be overridden if we do non 1-year periods
   def advance_period(period:, number:)
     period.advance(years: number).beginning_of_year
   end
@@ -147,8 +147,8 @@ module EffectiveMembershipsRegistrar
 
     # Or, Build Fees
     unless skip_fees
-      fee = owner.build_prorated_fee(date: date)
-      raise('already has purchased prorated fee') if fee.purchased?
+      fees = build_register_fees(owner: owner, membership: membership, date: date)
+      raise('unexpected purchased fee') if Array(fees).compact.any?(&:purchased?)
     end
 
     # Assign member role
@@ -159,6 +159,10 @@ module EffectiveMembershipsRegistrar
     owner.save!
   end
 
+  def build_register_fees(owner:, membership:, date:)
+    owner.build_prorated_fee(date: date)
+  end
+
   def reclassify!(owner, to:, status: nil, date: nil, skip_fees: false)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('owner must have an existing membership. use register! instead') if owner.membership.blank?
@@ -187,18 +191,8 @@ module EffectiveMembershipsRegistrar
     membership.build_membership_status(status: status) if status.present?
 
     unless skip_fees
-      existing = owner.membership_period_fee(category: from, period: period)
-
-      if existing
-        fee = owner.build_prorated_fee(date: date)
-        raise('already has purchased prorated fee') if fee.purchased?
-
-        fee = owner.build_discount_fee(date: date, from: from)
-        raise('already has purchased discount fee') if fee.purchased?
-      else
-        fee = owner.build_renewal_fee(category: to, period: period)
-        raise('already has purchased renewal fee') if fee.purchased?
-      end
+      fees = build_reclassify_fees(owner: owner, membership: membership, to: to, from: from, period: period, date: date)
+      raise('unexpected purchased fee') if Array(fees).compact.any?(&:purchased?)
     end
 
     # Save owner
@@ -206,6 +200,19 @@ module EffectiveMembershipsRegistrar
     owner.save!
   end
 
+  def build_reclassify_fees(owner:, membership:, to:, from:, period:, date:)
+    existing = owner.membership_period_fee(category: from, period: period)
+
+    if existing
+      [
+        owner.build_prorated_fee(date: date),
+        owner.build_discount_fee(date: date, from: from)
+      ]
+    else
+      owner.build_renewal_fee(category: to, period: period)
+    end
+  end
+
   def reinstate!(owner, to: nil, date: nil, skip_fees: false)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
 
@@ -251,7 +258,7 @@ module EffectiveMembershipsRegistrar
 
     # Or, Build Fees
     unless skip_fees
-      fee = owner.build_prorated_fee(date: date)
+      build_reinstate_fees(owner: owner, membership: membership, date: date)
       # This might already be present and purchased if joined and reinstated in the same period
     end
 
@@ -263,6 +270,10 @@ module EffectiveMembershipsRegistrar
     owner.save!
   end
 
+  def build_reinstate_fees(owner:, membership:, date:)
+    owner.build_prorated_fee(date: date)
+  end
+
   def status_clear!(owner, date: nil)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('owner must have an existing membership. use register! instead') if owner.membership.blank?
@@ -464,8 +475,7 @@ module EffectiveMembershipsRegistrar
     memberships = Effective::Membership.deep.with_unpaid_fees_through(period)
 
     memberships.find_each do |membership|
-      create_fees!(membership, period: period)
-      GC.start
+      create_fees!(membership, period: period); GC.start
     end
 
     true
@@ -496,9 +506,9 @@ module EffectiveMembershipsRegistrar
 
       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?
+      next if fee.blank? || fee.persisted?
 
-      puts("Created renewal fee for #{membership.owner}") if fee.new_record? && debug?
+      puts("Created renewal fee for #{membership.owner}") if debug?
 
       fee.save!
     end
@@ -507,16 +517,18 @@ module EffectiveMembershipsRegistrar
   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?
+      next if fee.blank? || fee.persisted?
 
-      puts("Created late fee for #{membership.owner}") if fee.new_record? && debug?
+      puts("Created late fee for #{membership.owner}") if debug?
 
       fee.save!
     end
   end
 
   def create_not_in_good_standing!(membership, period:)
+    return unless Time.zone.now.beginning_of_day == not_in_good_standing_date(period: period).beginning_of_day
     return unless membership.categories.any?(&:create_not_in_good_standing?)
+
     membership.owner.update_membership_status!
   end
 

data/app/models/effective/fee.rb

@@ -13,6 +13,9 @@ module Effective
     # The membership category for this fee, if there's only 1 membership.categories
     belongs_to :category, polymorphic: true, optional: true
 
+    # Only set on the Discount fee right now
+    belongs_to :from_category, polymorphic: true, optional: true
+
     # The membership status for this fee, if there's only 1 membership.statuses
     belongs_to :with_status, polymorphic: true, optional: true
 
@@ -149,7 +152,7 @@ module Effective
       [
         period.strftime('%Y'),
         category,
-        EffectiveResources.et("effective_memberships.fees.#{fee_type.downcase}")
+        EffectiveResources.et("effective_memberships.fees.#{fee_type.parameterize.underscore}")
       ].join(' ')
     end
 

data/app/models/effective/registrar.rb

@@ -4,15 +4,15 @@ module Effective
     include EffectiveMembershipsRegistrar
 
     def renewal_fee_date(date:)
-      Date.new(date.year, 12, 1) # Fees roll over every December 1st
+      Time.zone.local(date.year, 12, 1) # Fees roll over every December 1st
     end
 
     def late_fee_date(period:)
-      Date.new(period.year, 2, 1) # Fees are late after February 1st
+      Time.zone.local(period.year, 2, 1) # Fees are late after February 1st
     end
 
     def not_in_good_standing_date(period:)
-      Date.new(period.year, 3, 1) # Membership are Not In Good Standing after March 1st
+      Time.zone.local(period.year, 3, 1) # Membership are Not In Good Standing after March 1st
     end
 
   end

data/app/views/admin/applicants/_fees_approve.html.haml

@@ -0,0 +1,17 @@
+%h3 Fees
+%p The following fees will be created:
+- month = Time.zone.now.strftime('%B')
+
+%ul
+  - if applicant.apply_to_join?
+    %li A #{month} prorated fee
+
+  - if applicant.reclassification?
+    - if applicant.owner.outstanding_renewal_fees.present?
+      %li A renewal fee in their new category
+    - else
+      %li A #{month} prorated fee to the new category
+      %li A #{month} discount fee from their old category
+
+  - if applicant.reinstatement?
+    %li A #{month} prorated fee to their reinstatement category

data/app/views/admin/applicants/_form_approve.html.haml

@@ -22,23 +22,7 @@
   - if applicant.reinstatement? && reinstatement.present?
     %p The member will be reinstated with their previous status: #{badges(reinstatement.membership_statuses) || 'None'}.
 
-  %h3 Fees
-  %p The following fees will be created:
-  - month = Time.zone.now.strftime('%B')
-
-  %ul
-    - if applicant.apply_to_join?
-      %li A #{month} prorated fee
-
-    - if applicant.reclassification?
-      - if applicant.owner.outstanding_renewal_fees.present?
-        %li A renewal fee in their new category
-      - else
-        %li A #{month} prorated fee to the new category
-        %li A #{month} discount fee from their old category
-
-    - if applicant.reinstatement?
-      %li A #{month} prorated fee to their reinstatement category
+  = render('admin/applicants/fees_approve', f: f, applicant: applicant)
 
   %p The following unpurchased fees will be deleted:
   - outstanding_fee_payment_fees = applicant.owner.outstanding_fee_payment_fees

data/app/views/admin/categories/_fees_additional.html.haml

@@ -0,0 +1 @@
+- # Intentionally blank. Used to extend category fees form.

data/app/views/admin/categories/_fees_applicant.html.haml

@@ -0,0 +1,23 @@
+%h3 Applicant Fees
+.row
+  .col= f.price_field :applicant_fee
+  .col= f.text_field :qb_item_name, label: "Quickbooks Item Name"
+
+%h3 Pro-rated fees based on date of approval
+.row
+  .col-lg-3
+    = f.price_field :prorated_jan, label: "January"
+    = f.price_field :prorated_feb, label: "February"
+    = f.price_field :prorated_mar, label: "March"
+  .col-lg-3
+    = f.price_field :prorated_apr, label: "April"
+    = f.price_field :prorated_may, label: "May"
+    = f.price_field :prorated_jun, label: "June"
+  .col-lg-3
+    = f.price_field :prorated_jul, label: "July"
+    = f.price_field :prorated_aug, label: "August"
+    = f.price_field :prorated_sep, label: "September"
+  .col-lg-3
+    = f.price_field :prorated_oct, label: "October"
+    = f.price_field :prorated_nov, label: "November"
+    = f.price_field :prorated_dec, label: "December"

data/app/views/admin/categories/_fees_late.html.haml

@@ -0,0 +1,10 @@
+%h3 Late Fees
+= f.check_box :create_late_fees, label: 'Yes, late fees should be created'
+
+= f.show_if(:create_late_fees, true) do
+  - period = EffectiveMemberships.Registrar.current_period
+  - date = EffectiveMemberships.Registrar.late_fee_date(period: period)
+
+  %p Charged to members, on #{date.strftime('%B %e')}, with outstanding renewal dues or other fees.
+  .row
+    .col-3= f.price_field :late_fee

data/app/views/admin/categories/_fees_nigs.html.haml

@@ -0,0 +1,8 @@
+%h3 Not In Good Standing
+= f.check_box :create_not_in_good_standing, label: 'Yes, Not in Good Standing status should be applied'
+
+= f.show_if(:create_not_in_good_standing, true) do
+  - period = EffectiveMemberships.Registrar.current_period
+  - date = EffectiveMemberships.Registrar.not_in_good_standing_date(period: period)
+
+  %p Members with outstanding fees, on #{date.strftime('%B %e')}, will automatically be marked #{badge('Not In Good Standing')}.

data/app/views/admin/categories/_fees_renewal.html.haml

@@ -0,0 +1,9 @@
+%h3 Renewal Fees
+= f.check_box :create_renewal_fees, label: 'Yes, annual renewal fees should be created'
+
+= f.show_if(:create_renewal_fees, true) do
+  - date = EffectiveMemberships.Registrar.renewal_fee_date(date: Time.zone.now)
+
+  %p Charged to members, every #{date.strftime('%B %e')}, to renew their dues.
+  .row
+    .col-3= f.price_field :renewal_fee

data/app/views/admin/categories/_form_fees.html.haml

@@ -1,56 +1,7 @@
 = effective_form_with(model: [:admin, category], engine: true) do |f|
-  %h3 Applicant Fees
-  .row
-    .col= f.price_field :applicant_fee
-    .col= f.text_field :qb_item_name, label: "Quickbooks Item Name"
-
-  %h3 Pro-rated fees based on date of approval
-  .row
-    .col-lg-3
-      = f.price_field :prorated_jan, label: "January"
-      = f.price_field :prorated_feb, label: "February"
-      = f.price_field :prorated_mar, label: "March"
-    .col-lg-3
-      = f.price_field :prorated_apr, label: "April"
-      = f.price_field :prorated_may, label: "May"
-      = f.price_field :prorated_jun, label: "June"
-    .col-lg-3
-      = f.price_field :prorated_jul, label: "July"
-      = f.price_field :prorated_aug, label: "August"
-      = f.price_field :prorated_sep, label: "September"
-    .col-lg-3
-      = f.price_field :prorated_oct, label: "October"
-      = f.price_field :prorated_nov, label: "November"
-      = f.price_field :prorated_dec, label: "December"
-
-  %h3 Renewal Fees
-  = f.check_box :create_renewal_fees, label: 'Yes, annual renewal fees should be created'
-
-  = f.show_if(:create_renewal_fees, true) do
-    - date = EffectiveMemberships.Registrar.renewal_fee_date(date: Time.zone.now)
-
-    %p Charged to members, every #{date.strftime('%B %e')}, to renew their dues.
-    .row
-      .col-3= f.price_field :renewal_fee
-
-  %h3 Late Fees
-  = f.check_box :create_late_fees, label: 'Yes, late fees should be created'
-
-  = f.show_if(:create_late_fees, true) do
-    - period = EffectiveMemberships.Registrar.current_period
-    - date = EffectiveMemberships.Registrar.late_fee_date(period: period)
-
-    %p Charged to members, on #{date.strftime('%B %e')}, with outstanding renewal fees
-    .row
-      .col-3= f.price_field :late_fee
-
-  %h3 Bad Standing
-  = f.check_box :create_not_in_good_standing, label: 'Yes, Not in Good Standing status should be applied'
-
-  = f.show_if(:create_not_in_good_standing, true) do
-    - period = EffectiveMemberships.Registrar.current_period
-    - date = EffectiveMemberships.Registrar.not_in_good_standing_date(period: period)
-
-    %p Members with outstanding fees, on #{date.strftime('%B %e')}, will automatically be marked #{badge('Not In Good Standing')}.
-
+  = render('admin/categories/fees_applicant', f: f)
+  = render('admin/categories/fees_renewal', f: f)
+  = render('admin/categories/fees_late', f: f)
+  = render('admin/categories/fees_additional', f: f)
+  = render('admin/categories/fees_nigs', f: f)
   = f.submit

data/db/migrate/01_create_effective_memberships.rb.erb

@@ -457,6 +457,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.integer :category_id
       t.string :category_type
 
+      t.integer :from_category_id
+      t.string :from_category_type
+
       t.integer :with_status_id
       t.string :with_status_type
 

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.12.2'
+  VERSION = '0.13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -354,6 +354,7 @@ files:
 - app/views/admin/applicant_endorsements/_applicant_endorsement.html.haml
 - app/views/admin/applicant_references/_applicant_reference.html.haml
 - app/views/admin/applicant_reviews/_applicant_review.html.haml
+- app/views/admin/applicants/_fees_approve.html.haml
 - app/views/admin/applicants/_form.html.haml
 - app/views/admin/applicants/_form_applicant.html.haml
 - app/views/admin/applicants/_form_approve.html.haml
@@ -363,6 +364,11 @@ files:
 - app/views/admin/applicants/_form_process.html.haml
 - app/views/admin/applicants/_form_transcripts.html.haml
 - app/views/admin/applicants/_status.html.haml
+- app/views/admin/categories/_fees_additional.html.haml
+- app/views/admin/categories/_fees_applicant.html.haml
+- app/views/admin/categories/_fees_late.html.haml
+- app/views/admin/categories/_fees_nigs.html.haml
+- app/views/admin/categories/_fees_renewal.html.haml
 - app/views/admin/categories/_form.html.haml
 - app/views/admin/categories/_form_applicant_content.html.haml
 - app/views/admin/categories/_form_applicant_steps.html.haml