effective_memberships 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bea643081128f664a7c004dbc49a3e8e06f940781267f85f63c7c6d4e69fe6d1
-  data.tar.gz: a769c9c7216ccdc090fc8a3e6107d654e49eeca2b20a171c48769b46d27a0cb0
+  metadata.gz: f42637485b8a72cd2cf2a7f4845e75dbca8d3c379270d4dfe0a607e70610117d
+  data.tar.gz: 9d41bd14aad6e7e54c76568bd58147d43965fd30060c07525941294b7504d28e
 SHA512:
-  metadata.gz: 4553d6b65132b346f36882658baac0ae47ec8945f2f592c19fac705b2e5414d1f4597e5473d2209cdb6a6c0528768a4aa65fe75b59b9712f14ffccdc6c5203ca
-  data.tar.gz: f6c02642c63397a2484fb0d9cd4b3fd471767b9c1b8449528e720ac2f73946a86520094ba39bd0b7056df0544e230a0f1a3bd60ddeb64ba689431664d9c3938b
+  metadata.gz: d456e9bcd40ce78fc83689c5352a85bc156ec50f7149bd169f7af1521d3ec1c58f6ed67b06922b28b36fec1cbb7c880a58e4e6c7ddcf197f3872e37fb5ac247b
+  data.tar.gz: 2f27824362cf294f83d4f953bb8c283045ef70a03910b17eeff1591f90df0a508bcf7dff1bbca53b49d6663f60d50376e9a8d4fb50da9cc47e6889724d34ef4d

data/app/models/concerns/effective_memberships_applicant.rb

@@ -848,6 +848,8 @@ module EffectiveMembershipsApplicant
 
     approved!
 
+    EffectiveMemberships.Registrar.delete_fees!(owner)
+
     if apply_to_join?
       EffectiveMemberships.Registrar.register!(
         owner,

data/app/models/concerns/effective_memberships_owner.rb

@@ -99,6 +99,15 @@ module EffectiveMembershipsOwner
     fees.select { |fee| fee.fee_payment_fee? && !fee.purchased? }
   end
 
+  def outstanding_fee_payments
+    fee_payments = EffectiveMemberships.FeePayment.all
+
+    fee_payments = fee_payments.where(user: self) if self.class.respond_to?(:effective_memberships_user?)
+    fee_payments = fee_payments.where(organization: self) if self.class.respond_to?(:effective_memberships_organization?)
+
+    fee_payments.select { |fee_payment| fee_payment.in_progress? && fee_payment.orders.none?(&:purchased?) }
+  end
+
   def outstanding_fee_payment_orders
     orders.select { |order| order.parent_type.to_s.include?('FeePayment') && !order.purchased? }
   end

data/app/models/concerns/effective_memberships_registrar.rb

@@ -380,24 +380,51 @@ module EffectiveMembershipsRegistrar
     periods(from: from, to: to).reverse.map { |period| [period_end_on(date: period), period] }
   end
 
+  # Called by applicant.approve!
+  def delete_fees!(resource)
+    owner = (resource.class.respond_to?(:effective_memberships_owner?) ? resource : resource.try(:owner))
+    raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
+
+    # Delete unpurchased fees and orders
+    owner.outstanding_fee_payment_fees.each { |fee| fee.mark_for_destruction }
+    owner.outstanding_fee_payment_orders.each { |order| order.mark_for_destruction }
+    owner.save!
+
+    owner.outstanding_fee_payments.each { |fee_payment| fee_payment.destroy! }
+
+    true
+  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)
+  # Assigns NIGS
+  def create_all_fees!(period: nil)
     period ||= current_period
     memberships = Effective::Membership.deep.with_unpaid_fees_through(period)
 
+    memberships.find_each do |membership|
+      create_fees!(membership, period: period)
+      GC.start
+    end
+
+    true
+  end
+
+  def create_fees!(resource, period: nil)
+    period ||= current_period
+
+    membership = (resource.class.respond_to?(:effective_memberships_owner?) ? resource.membership : resource)
+    raise('expected a membership') unless membership.present? && membership.kind_of?(Effective::Membership)
+
     # Create Renewal Fees
-    memberships.find_each { |membership| create_renewal_fees!(membership, period: period) }
-    GC.start
+    create_renewal_fees!(membership, period: period)
 
     # Create Late Fees
-    memberships.find_each { |membership| create_late_fees!(membership, period: period) }
-    GC.start
+    create_late_fees!(membership, period: period)
 
     # Update Membership Status - Assign Not In Good Standing
-    memberships.find_each { |membership| create_not_in_good_standing!(membership, period: period) }
-    GC.start
+    create_not_in_good_standing!(membership, period: period)
 
     true
   end

data/app/models/effective/membership.rb

@@ -252,9 +252,8 @@ module Effective
       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.create_not_in_good_standing!(self, period: period)
+      EffectiveMemberships.Registrar.delete_fees!(self)
+      EffectiveMemberships.Registrar.create_fees!(self, period: period)
 
       true
     end

data/app/models/effective/registrar_action.rb

@@ -28,6 +28,7 @@ module Effective
     # Mark Fees Paid - Order Attributes
     attr_accessor :payment_provider
     attr_accessor :payment_card
+    attr_accessor :purchased_at
     attr_accessor :note_to_buyer
     attr_accessor :note_internal
 
@@ -136,6 +137,7 @@ module Effective
       {
         payment_provider: @payment_provider.presence,
         payment_card: @payment_card.presence,
+        purchased_at: @purchased_at.presence,
         note_to_buyer: @note_to_buyer.presence,
         note_internal: @note_internal.presence
       }.compact

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

@@ -16,7 +16,7 @@
         No membership number will be assigned.
 
   %h3 Fees
-  %p The following fee(s) will be created:
+  %p The following fees will be created:
   - month = Time.zone.now.strftime('%B')
 
   %ul
@@ -27,6 +27,16 @@
       %li A #{month} prorated fee to the new category
       %li A #{month} discount fee from their old category
 
+  %p The following unpurchased fees will be deleted:
+  - outstanding_fee_payment_fees = applicant.owner.outstanding_fee_payment_fees
+
+  %ul
+    - outstanding_fee_payment_fees.each do |fee|
+      %li= fee
+
+    - if outstanding_fee_payment_fees.blank?
+      %li None
+
   %h3 Email to send
   - email_templates = applicant.approve_email_templates
 

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

@@ -23,6 +23,6 @@
 
     = 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
+    %p.text-muted To update the current membership categories or statuses, use the 'Reclassify' or 'Status Change' actions below
 
     = f.submit 'Update Membership', border: false, center: true, 'data-confirm': "Really update #{f.object.owner}?"

data/app/views/admin/registrar_actions/_form_fees_paid.html.haml

@@ -31,6 +31,7 @@
           %p An order will be created and marked as paid with the following information:
 
           = f.select :payment_provider, EffectiveOrders.admin_payment_providers, required: true
+          = f.datetime_field :purchased_at, label: 'Purchased or completed'
 
           = f.text_field :payment_card,
             label: 'Payment card type, cheque or transaction number',

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

data/lib/tasks/effective_memberships_tasks.rake

@@ -11,7 +11,7 @@ namespace :effective_memberships do
     begin
       if ActiveRecord::Base.connection.table_exists?(:memberships)
         EffectiveLogger.info "Running effective_memberships:create_fees scheduled task" if defined?(EffectiveLogger)
-        EffectiveMemberships.Registrar.create_fees!
+        EffectiveMemberships.Registrar.create_all_fees!
       end
     rescue => e
       ExceptionNotifier.notify_exception(e) if defined?(ExceptionNotifier)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails