effective_memberships 0.9.4 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 611d01eb6651211b44bbc681c6060aa4a74541a08ec9ac59d3b0d1972ceacbfc
-  data.tar.gz: 78796ebd87001ae6e9448f48892d61b034077637ceea0437084a259746824e57
+  metadata.gz: f42637485b8a72cd2cf2a7f4845e75dbca8d3c379270d4dfe0a607e70610117d
+  data.tar.gz: 9d41bd14aad6e7e54c76568bd58147d43965fd30060c07525941294b7504d28e
 SHA512:
-  metadata.gz: 60bd9e7864f520588a47b4ef69a9460c5cbadbc7fbd0718086566787a16e785348666e87c16c41a6e95826c6b4cd5b93a5c9c67a239b14a5ed82699681e6c279
-  data.tar.gz: 5032cf5a31bda06e919a7abc9009c00ae2d3fcaf25c2889453184839b625cdaa8987c88c95ae7c462c0fb501d6303126b1f2a0b8f14778bbb7d945d49574c9ff
+  metadata.gz: d456e9bcd40ce78fc83689c5352a85bc156ec50f7149bd169f7af1521d3ec1c58f6ed67b06922b28b36fec1cbb7c880a58e4e6c7ddcf197f3872e37fb5ac247b
+  data.tar.gz: 2f27824362cf294f83d4f953bb8c283045ef70a03910b17eeff1591f90df0a508bcf7dff1bbca53b49d6663f60d50376e9a8d4fb50da9cc47e6889724d34ef4d

data/app/datatables/admin/effective_fees_datatable.rb

@@ -21,6 +21,13 @@ module Admin
 
       col :fee_type, search: EffectiveMemberships.fee_types
 
+      col :period, search: { collection: EffectiveMemberships.Registrar.periods_collection } do |fee|
+        EffectiveMemberships.Registrar.period_end_on(date: fee.period)
+      end
+
+      col :category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
+      col :title
+
       col :price, as: :price
       col :qb_item_name, label: 'Quickbooks Item Name'
       col :tax_exempt, visible: false
@@ -31,9 +38,8 @@ module Admin
         col :parent, search: :string, visible: false
       end
 
-      col :purchased_order, visible: false
+      col :purchased_order
 
-      col :category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
       col :checkout_type, search: Effective::Fee::CHECKOUT_TYPES, visible: false
 
       unless attributes[:total] == false

data/app/models/concerns/effective_memberships_applicant.rb

@@ -623,6 +623,7 @@ module EffectiveMembershipsApplicant
     category_ids = user.membership.category_ids
 
     categories.select do |cat|
+      cat.can_apply_new? ||
       cat.can_apply_existing? ||
       (cat.can_apply_restricted? && (category_ids & cat.can_apply_restricted_ids).present?)
     end
@@ -847,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

@@ -375,24 +375,56 @@ module EffectiveMembershipsRegistrar
     retval
   end
 
+  def periods_collection(from: nil, to: nil)
+    from ||= Time.zone.now - 10.years
+    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/fee.rb

@@ -44,9 +44,13 @@ module Effective
       self.with_status ||= owner.membership.statuses.first if owner.membership.statuses.length == 1
     end
 
+    before_validation(if: -> { changes['title'].blank? && (changes.keys & ['period', 'category_id', 'fee_type']).present? }) do
+      self.title = default_title()
+    end
+
     before_validation do
       self.period ||= EffectiveMemberships.Registrar.current_period
-      self.title ||= default_title()
+      self.title = default_title() if self.title.blank?
     end
 
     before_validation(if: -> { fee_type == 'Renewal' && category.present? && period.present? }) do

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/fees/_form.html.haml

@@ -6,45 +6,38 @@
     - collection = { 'Users' => current_user.class.sorted, 'Organizations' => EffectiveMemberships.Organization.sorted }
     = f.select :owner, collection, polymorphic: true
 
+  - registrar = EffectiveMemberships.Registrar
   - fee_types = EffectiveMemberships.fee_types
   - membership_period_fee_types = fee_types.select { |fee_type| Effective::Fee.new(fee_type: fee_type).membership_period_fee? }
 
-  - if f.object.new_record?
-    = f.select :fee_type, fee_types
-  - else
-    = f.static_field :fee_type
-
-  = f.show_if_any(:fee_type, membership_period_fee_types) do
-    = card do
-      %p This is a membership period fee. It will advance the membership fees paid through period when purchased.
-      %p Only one membership period fee -- Prorated or Renewal -- is expected to exist per membership period.
-
-      - registrar = EffectiveMemberships.Registrar
-      - periods = registrar.periods(from: Time.zone.now - 10.years)
-      - collection = periods.reverse.map { |period| [registrar.period_end_on(date: period), period] }
+  - f.object.period ||= registrar.current_period
+  - f.object.checkout_type ||= 'Default'
 
-      - f.object.period ||= registrar.current_period
-      = f.select :period, collection, label: 'Membership period', hint: 'When purchased, set the membership fees paid through period to this period'
+  - f.object.category_id ||= f.object.owner&.membership&.categories&.first&.id
+  - f.object.category ||= f.object.owner&.membership&.categories&.first
 
-      - # Renewal Fees Only
-      - if f.object.persisted? && f.object.renewal_fee?
-        - if f.object.category.create_late_fees?
-          = f.date_field :late_on, hint: 'A late fee will be applied on this date unless purchased'
+  = f.select :period, registrar.periods_collection, label: 'Membership period'
+  = f.select :fee_type, fee_types
+  = f.select :category_id, EffectiveMemberships.Category.all
 
-        - if f.object.category.create_not_in_good_standing?
-          = f.date_field :not_in_good_standing_on, hint: 'The membership will be marked NIGS on this date unless purchased'
+  = f.show_if_any(:fee_type, membership_period_fee_types) do
+    %p.text-muted
+      This is a membership period fee. It will advance the membership fees paid through period when purchased.
+      %br
+      Only one membership period fee -- Prorated or Renewal -- is expected to exist per membership period.
 
-  - f.object.category_id = f.object.owner&.membership&.categories&.first&.id
-  = f.select :category_id, EffectiveMemberships.Category.all
+  - if f.object.category.present?
+    = f.show_if(:fee_type, 'Renewal') do
+      - if f.object.category.create_late_fees?
+        = f.date_field :late_on, hint: 'A late fee will be applied on this date unless purchased. Leave blank to assign the default.'
 
-  - if f.object.parent.blank?
-    - f.object.checkout_type ||= 'Default'
+      - if f.object.category.create_not_in_good_standing?
+        = f.date_field :not_in_good_standing_on, hint: 'The membership will be marked NIGS on this date unless purchased. Leave blank to assign the default.'
 
-    = f.radios :checkout_type, Effective::Fee::CHECKOUT_TYPES, inline: true, label: 'Checkout wizard',
-      hint: 'When default, Applicant and Reinstatement fees will be charged from the applicant wizard, and all other fee types from the fee payment wizard'
-  - else
-    = f.static_field :parent
+  = f.radios :checkout_type, Effective::Fee::CHECKOUT_TYPES, inline: true, label: 'Checkout wizard',
+    hint: 'When default, Applicant and Reinstatement fees will be charged from the applicant wizard, and all other fee types from the fee payment wizard'
 
+  = f.text_field :title, hint: 'Leave blank to assign the default', required: false
   = f.price_field :price
   = f.text_field :qb_item_name, label: 'Quickbooks Item Name'
   = f.check_box :tax_exempt, label: 'Yes, this fee is tax exempt'

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/config/routes.rb

@@ -52,7 +52,7 @@ EffectiveMemberships::Engine.routes.draw do
 
     resources :applicant_reviews, only: [:index, :show]
 
-    resources :fees
+    resources :fees, except: [:show]
     resources :categories, only: [:index, :edit, :update]
 
     resources :applicant_course_areas, except: [:show]

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.9.4'
+  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.4
+  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