effective_memberships 0.8.7 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a05ef926bab6297cf92f4df0dce83af5380ed575945461b2afe5f63d853b385c
-  data.tar.gz: 747ff46a96635c7a434bd98931cc7569d18cc29a314da06f2dedc5cc968ee6b6
+  metadata.gz: 6e82e009171632439c6f52ec8932a7e5f3f254c26148b41cbdc864e3d003bca9
+  data.tar.gz: 58fb7dee1b53c29b4c8f2b00ae29e9ce56537249937edaa48a8873c31e03b6d0
 SHA512:
-  metadata.gz: a3a206e225335ba504c963976d3ea73fd5e6a141c3e041f8c9f9bcff26a1020c8b76c5e799811b7045108d8f54c660605d08991ea6e50e9adef90d0b16a289cb
-  data.tar.gz: 93db46c6155328b3882192eb2041c7f49e35f14fcd607c47df8cce0a61bc8a365f032554fa8b5c6058a14dc45b4d809af5a5272a12e7a369437517d425501c3d
+  metadata.gz: d689ddb87455e6344f838d13c622e1a8312b7740754c79e18a6a06e56f7cb283f4a824a270357e17997cc1728aa30108eac774937f0c89881b06b0935349261b
+  data.tar.gz: 78064744e55a7fbb0a4e4285b1a29a469342461b0607f93877223fc456016d61ea614f4f40663b69dbf2f141cdb60cb59b3a2c9890c08a10c897ed54fdc5e68e

data/app/datatables/admin/effective_applicants_datatable.rb

@@ -31,8 +31,9 @@ module Admin
       col :organization, visible: false
 
       col :applicant_type
-      col :category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
-      col :from_category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }, visible: false
+      col :category, label: 'Applicant Category', search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
+      col :from_category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
+      col :from_status, search: { collection: EffectiveMemberships.Status.all, polymorphic: false }
 
       col :orders, visible: false
 

data/app/datatables/admin/effective_fees_datatable.rb

@@ -19,19 +19,22 @@ module Admin
         col :owner
       end
 
-      unless attributes[:applicant_id] || attributes[:fee_payment_id]
-        col :parent, search: :string, visible: false
-      end
-
       col :fee_type, search: EffectiveMemberships.fee_types
+
       col :price, as: :price
+      col :qb_item_name, label: 'Quickbooks Item Name'
       col :tax_exempt, visible: false
-      col :qb_item_name, visible: false
 
       col :purchased?, as: :boolean
+
+      unless attributes[:applicant_id] || attributes[:fee_payment_id]
+        col :parent, search: :string, visible: false
+      end
+
       col :purchased_order, visible: false
 
       col :category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
+      col :checkout_type, search: Effective::Fee::CHECKOUT_TYPES, visible: false
 
       unless attributes[:total] == false
         aggregate :total

data/app/models/concerns/effective_memberships_applicant.rb

@@ -236,9 +236,10 @@ module EffectiveMembershipsApplicant
       validates :category, presence: true
     end
 
-    validate(if: -> { current_step == :select && owner.present? }) do
-      self.errors.add(:base, 'may not have outstanding fees') if owner.outstanding_fee_payment_fees.present?
-    end
+    # They can checkout with outstanding fees
+    # validate(if: -> { current_step == :select && owner.present? }) do
+    #   self.errors.add(:base, 'may not have outstanding fees') if owner.outstanding_fee_payment_fees.present?
+    # end
 
     # Applicant Educations Step
     with_options(if: -> { current_step == :education }) do
@@ -453,17 +454,27 @@ module EffectiveMembershipsApplicant
     end
 
     # All Fees and Orders
+
+    # We take over the owner's outstanding applicant fees.
+    # These may have been created by an admin and assigned to the next applicant
+    def find_or_build_submit_fees
+      Array(owner.outstanding_applicant_submit_fees).each { |fee| fees << fee unless fees.include?(fee) }
+      submit_fees
+    end
+
     def submit_fees
       default_applicant_submit_fees
     end
 
     def default_applicant_submit_fees
-      # Find or build submit fee
-      fee = fees.first || build_fee(fee_type: applicant_fee_type)
+      raise('expected an applicant fee type') if applicant_fee_type.blank?
+      raise('expected an applicant fee price') if applicant_fee_price.blank?
 
-      raise('expected a present applicant fee price') if applicant_fee_price.blank?
+      # Find or build Applicant or Reinstatement submit fee
+      fee = fees.find { |fee| fee.fee_type == applicant_fee_type } || build_fee(fee_type: applicant_fee_type)
 
-      unless fee.purchased?
+      # This wasn't created by an admin, so we should apply our prices.
+      if (fee.new_record? || fee.checkout_type.blank?) && !fee.purchased?
         fee.assign_attributes(
           fee_type: applicant_fee_type,
           category: applicant_fee_category,

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -156,7 +156,7 @@ module EffectiveMembershipsFeePayment
       orders.first
     end
 
-    # We take over the owner's outstanding fees.
+    # We take over the owner's outstanding fee payment fees.
     def find_or_build_submit_fees
       Array(owner.outstanding_fee_payment_fees).each { |fee| fees << fee unless fees.include?(fee) }
       submit_fees

data/app/models/concerns/effective_memberships_owner.rb

@@ -27,10 +27,10 @@ module EffectiveMembershipsOwner
     has_many :orders, -> { order(:id) }, inverse_of: :user, as: :user, class_name: 'Effective::Order', dependent: :nullify
     accepts_nested_attributes_for :orders, reject_if: :all_blank, allow_destroy: true
 
-    has_one :membership, inverse_of: :owner, as: :owner, class_name: 'Effective::Membership'
+    has_one :membership, inverse_of: :owner, as: :owner, class_name: 'Effective::Membership', dependent: :destroy
     accepts_nested_attributes_for :membership
 
-    has_many :membership_histories, -> { Effective::MembershipHistory.sorted }, inverse_of: :owner, as: :owner, class_name: 'Effective::MembershipHistory'
+    has_many :membership_histories, -> { Effective::MembershipHistory.sorted }, inverse_of: :owner, as: :owner, class_name: 'Effective::MembershipHistory', dependent: :delete_all
     accepts_nested_attributes_for :membership_histories
 
     scope :members, -> { joins(:membership) }
@@ -91,6 +91,10 @@ module EffectiveMembershipsOwner
     outstanding_fee_payment_fees.blank? && membership && membership.fees_paid?
   end
 
+  def outstanding_applicant_submit_fees
+    fees.select { |fee| fee.applicant_submit_fee? && !fee.purchased? }
+  end
+
   def outstanding_fee_payment_fees
     fees.select { |fee| fee.fee_payment_fee? && !fee.purchased? }
   end

data/app/models/effective/fee.rb

@@ -16,8 +16,11 @@ module Effective
     # The membership status for this fee, if there's only 1 membership.statuses
     belongs_to :with_status, polymorphic: true, optional: true
 
+    CHECKOUT_TYPES = ['Default', 'Applicant', 'Fee Payment']
+
     effective_resource do
       fee_type          :string
+      checkout_type     :string     # When created by Admin can override default Applicant or Fee Payment
 
       title             :string
 
@@ -46,6 +49,11 @@ module Effective
       self.title ||= default_title()
     end
 
+    before_validation(if: -> { fee_type == 'Renewal' && category.present? && period.present? }) do
+      self.late_on ||= EffectiveMemberships.Registrar.late_fee_date(period: period) if category.create_late_fees?
+      self.not_in_good_standing_on ||= EffectiveMemberships.Registrar.not_in_good_standing_date(period: period) if category.create_not_in_good_standing?
+    end
+
     validates :fee_type, presence: true
 
     validates :title, presence: true
@@ -55,6 +63,8 @@ module Effective
     validates :tax_exempt, inclusion: { in: [true, false] }
     validates :qb_item_name, presence: true
 
+    validates :checkout_type, inclusion: { in: CHECKOUT_TYPES, allow_blank: true }
+
     validate(if: -> { fee_type.present? }) do
       self.errors.add(:fee_type, 'is not included') unless EffectiveMemberships.fee_types.include?(fee_type)
     end
@@ -87,12 +97,20 @@ module Effective
     def applicant_submit_fee?
       return true if parent.kind_of?(EffectiveMemberships.Applicant)
 
+      return false if checkout_type == 'Fee Payment'
+      return true if checkout_type == 'Applicant'
+
+      # Default
       ['Applicant', 'Reinstatement'].include?(fee_type)
     end
 
     def fee_payment_fee?
       return false if parent.kind_of?(EffectiveMemberships.Applicant)
 
+      return false if checkout_type == 'Applicant'
+      return true if checkout_type == 'Fee Payment'
+
+      # Default
       ['Applicant', 'Reinstatement'].exclude?(fee_type)
     end
 
@@ -101,6 +119,10 @@ module Effective
       ['Prorated', 'Renewal'].include?(fee_type)
     end
 
+    def renewal_fee?
+      fee_type == 'Renewal'
+    end
+
     def custom_fee?
       EffectiveMemberships.custom_fee_types.include?(fee_type)
     end

data/app/views/admin/fees/_form.html.haml

@@ -6,13 +6,47 @@
     - collection = { 'Users' => current_user.class.sorted, 'Organizations' => EffectiveMemberships.Organization.sorted }
     = f.select :owner, collection, polymorphic: true
 
+  - 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, EffectiveMemberships.custom_fee_types
+    = f.select :fee_type, fee_types
   - else
     = f.static_field :fee_type
 
-  = f.price_field :price
+  = 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.select :period, collection, label: 'Membership period', hint: 'When purchased, set the membership fees paid through period to this period'
+
+      - # 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'
+
+        - 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.text_field :qb_item_name
+  - f.object.category_id = f.object.owner&.membership&.categories&.first&.id
+  = f.select :category_id, EffectiveMemberships.Category.all
+
+  - if f.object.parent.blank?
+    - f.object.checkout_type ||= '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.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'
 
   = effective_submit(f)

data/app/views/effective/fees/_fee.html.haml

@@ -1,17 +1,16 @@
 %table.table.table-sm
   %tbody
     %tr
-      %th Category
-      %td= fee.category
+      %th Title
+      %td= fee.title
 
-    - if fee.category.present?
-      %tr
-        %th Membership Category
-        %td
-          - if request.path.start_with?('/admin')
-            = link_to(fee.category, effective_memberships.edit_admin_category_path(fee.category))
-          - else
-            = fee.category
+    %tr
+      %th Membership Category
+      %td
+        - if fee.category.present? && request.path.start_with?('/admin')
+          = link_to(fee.category, effective_memberships.edit_admin_category_path(fee.category))
+        - else
+          = fee.category.presence || 'None'
 
     - if request.path.start_with?('/admin')
       %tr
@@ -35,3 +34,18 @@
     %tr
       %th Price
       %td= price_to_currency(fee.price)
+
+    - if fee.late_on.present?
+      %tr
+        %th Late On
+        %td= fee.late_on.strftime('%F')
+
+    - if fee.not_in_good_standing_on.present?
+      %tr
+        %th Not In Good Standing On
+        %td= fee.not_in_good_standing_on.strftime('%F')
+
+    - if fee.checkout_type.present?
+      %tr
+        %th Checkout Type
+        %td= fee.checkout_type

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

@@ -458,6 +458,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.string :with_status_type
 
       t.string :fee_type
+      t.string :checkout_type
 
       t.integer :purchased_order_id
 

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.8.7'
+  VERSION = '0.9.1'
 end

metadata

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