effective_memberships 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85036ca2aa1362333f21d1da76e3ce330607f39922e8a9200f33794e01d326db
-  data.tar.gz: a266929f23d85a651aa70b353b70041088f442a46c576a28458674bf1959b286
+  metadata.gz: e5630148361e363550dea41e32b75f80ce1534bd93a4c18873d724c7b0b9cd61
+  data.tar.gz: 46e7aa62a886f604e4ebbf9b80e76f44f3fe5ee933f9e5f468513d412007fd62
 SHA512:
-  metadata.gz: b054a795fd94aadadb7d6986b1a4c9b2e7e375f7db63b94b3c3ce9e39ec7c6d1e035030db076777724e3d8a7bb47b33acbdd7dec3c81fbd2f01237d35bff2709
-  data.tar.gz: 38e7942eb0fcae97c12153442b390dc8d239c2ad26a8981287be8fb30d01808d263d6019445af11eb0a6e5f6676b8b0f167140b8ab0a13658d2e82327082d137
+  metadata.gz: 91fb28c6ba34f3ac0146219b14f613fb4d19b883963e268d1117bcd56d9f7fcdfb4c5bd807230c53d14d2aefc49eb525867cc23c370948562d881ad79a29029a
+  data.tar.gz: eb61306191817a7bde172a548d2cf373f3210b235857c1a35d6923522a7ffddafbeeff6124ce5ef2e8d2bb9161c32d0de606465738ee88aeb74adc2e15efc92e

data/app/models/concerns/effective_memberships_applicant.rb

@@ -383,14 +383,14 @@ module EffectiveMembershipsApplicant
     # This required_steps is defined inside the included do .. end block so it overrides the acts_as_wizard one.
     def required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
-      return self.class.all_wizard_steps if category.blank?
 
       @_required_steps ||= begin
         # All required
         required_steps = self.class.required_wizard_steps
 
         # Based on current applicant
-        applicant_steps = (reinstatement? ? category.applicant_reinstatement_wizard_steps : category.applicant_wizard_steps)
+        applicant_steps = self.class.all_wizard_steps if category.blank?
+        applicant_steps ||= (reinstatement? ? category.applicant_reinstatement_wizard_steps : category.applicant_wizard_steps)
 
         # Sanity check
         applicant_steps.delete(:stamp) unless apply_to_join?

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -100,7 +100,7 @@ module EffectiveMembershipsFeePayment
       self.organization_type = (EffectiveMemberships.Organization.name if organization_id.present?)
     end
 
-    before_validation(if: -> { current_step == :start && user && user.membership }) do
+    before_validation(if: -> { (new_record? || current_step == :start) && user && user.membership }) do
       self.category ||= user.membership.categories.first if user.membership.categories.length == 1
       self.with_status ||= user.membership.statuses.first if user.membership.statuses.length == 1
     end
@@ -121,14 +121,14 @@ module EffectiveMembershipsFeePayment
     # This required_steps is defined inside the included do .. end block so it overrides the acts_as_wizard one.
     def required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
-      return self.class.all_wizard_steps if category.blank?
 
       @_required_steps ||= begin
         # All required
         required_steps = self.class.required_wizard_steps
 
         # Based on current fee payment
-        fee_payment_steps = Array(category.fee_payment_wizard_steps)
+        fee_payment_steps = self.class.all_wizard_steps if category.blank?
+        fee_payment_steps ||= Array(category.fee_payment_wizard_steps)
 
         # Sanity Check
         fee_payment_steps.delete(:organization) unless organization?
@@ -162,10 +162,13 @@ module EffectiveMembershipsFeePayment
       submit_fees
     end
 
+    def existing_renewal_fee
+      fees.find { |fee| fee.fee_type == 'Renewal' }
+    end
+
     def after_submit_purchased!
       EffectiveMemberships.Registrar.fee_payment_purchased!(owner)
     end
-
   end
 
   def to_s

data/app/models/concerns/effective_memberships_owner.rb

@@ -193,7 +193,7 @@ module EffectiveMembershipsOwner
   end
 
   # Only thing optional is category, late_on and bad_standing_on
-  def build_title_fee(title:, fee_type:, period:, price:, tax_exempt:, qb_item_name:, category: nil)
+  def build_title_fee(title:, fee_type:, period:, price: nil, tax_exempt: nil, qb_item_name: nil, category: nil)
     fee = fees.find do |fee|
       fee.fee_type == fee_type && fee.period == period && fee.title == title &&
       (category.blank? || fee.category_id == category.id && fee.category_type == category.class.name)
@@ -228,7 +228,7 @@ module EffectiveMembershipsOwner
 
     # 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
+    # We shouldn't be building renewal fees for the same period a prorated fee is purchased 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?
 

data/app/models/concerns/effective_memberships_registrar.rb

@@ -437,7 +437,7 @@ module EffectiveMembershipsRegistrar
   # Called in the after_purchase of fee payment
   def fee_payment_purchased!(owner)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
-    owner.update_membership_status!
+    owner.update_membership_status! if owner.membership.present?
   end
 
   protected

data/app/models/concerns/effective_memberships_user.rb

@@ -45,7 +45,7 @@ module EffectiveMembershipsUser
   end
 
   def memberships_owners
-    Array(is?(:member) ? self : nil) + membership_organizations
+    Array(self) + membership_organizations
   end
 
   def membership_present?

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

@@ -13,4 +13,6 @@
 
   = f.price_field :price
 
+  = f.text_field :qb_item_name
+
   = effective_submit(f)

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2022-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails