effective_memberships 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d060a4560ac81c9ca5ff85d01017de52a187f9c488999cc8d070e487ce06e919
-  data.tar.gz: 61ff798a1d3dcb6bb1bc6b524fb1572d009f36faa4ef75dbe8df99c47d607fab
+  metadata.gz: 3eddddc73bf54e32d870cd26982092d29cedf29083845a6ec93ddad09f9a8c46
+  data.tar.gz: 69e21c598c39b6d28a5031bd07308c2ededa79448975da5d4db4d9a3be50325e
 SHA512:
-  metadata.gz: e5d47c15f035b8fc63ed6ddcb99d18b3247093a01843b931c16f32822c278a637d3251c73091171c55e6f4bf43e11b0b012549f51b3ed4be9a6fb8fa6a37c851
-  data.tar.gz: 3a8cec75a97f6acb2188189c259cca502e6ae34c436246dcd3c4ea4cf11448b0fd44dea340656f016afa6a4525aeee9e75f0535b6e75583faeb4dc389d5e25c2
+  metadata.gz: 69b84ed6117f73c0b463f4236defe71bec83a59c0f06a6a2954373e6ae88070132d022dcb9f9fd39e87bd14f993b236a32e2f3ddc1b63aa8969bbb1826400ae0
+  data.tar.gz: 509f767917c6d3553127423e26f26784ca92f6a73b115482b5d1d25ad393fa578f73d5396446c5be8335d8a3f18dcefa53e15634edb40c80bed5c8b91658d718

data/app/models/concerns/effective_memberships_applicant.rb

@@ -360,7 +360,6 @@ module EffectiveMembershipsApplicant
       validates :declare_reinstatement, acceptance: true
     end
 
-
     # Admin Approve
     validate(if: -> { approved_membership_date.present? }) do
       if approved_membership_date.to_date > Time.zone.now.to_date
@@ -501,9 +500,9 @@ module EffectiveMembershipsApplicant
     end
 
     # Draft -> Submitted requirements
-    def submit!
-      raise('already submitted') if was_submitted?
-      raise('expected a purchased order') unless submit_order&.purchased?
+    def submit!(force: false)
+      raise('already submitted') if was_submitted? && !force
+      raise('expected a purchased order') if !submit_order&.purchased? && !force
 
       wizard_steps[:checkout] ||= Time.zone.now
       wizard_steps[:submitted] = Time.zone.now
@@ -863,9 +862,21 @@ module EffectiveMembershipsApplicant
         number: approved_membership_number.presence    # Set by the Admin Process form, or nil
       )
     elsif reclassification?
-      EffectiveMemberships.Registrar.reclassify!(owner, to: to_category, status: to_status)
+      EffectiveMemberships.Registrar.reclassify!(
+        owner,
+        to: to_category,
+        status: to_status,
+        date: approved_membership_date.presence,       # Set by the Admin Process form, or nil
+        number: approved_membership_number.presence    # Set by the Admin Process form, or nil
+      )
     elsif reinstatement?
-      EffectiveMemberships.Registrar.reinstate!(owner, to: to_category)
+      # No status
+      EffectiveMemberships.Registrar.reinstate!(
+        owner,
+        to: to_category,
+        date: approved_membership_date.presence,       # Set by the Admin Process form, or nil
+        number: approved_membership_number.presence    # Set by the Admin Process form, or nil
+      )
     else
       raise('unsupported approval applicant_type')
     end

data/app/models/concerns/effective_memberships_registrar.rb

@@ -163,7 +163,7 @@ module EffectiveMembershipsRegistrar
     owner.build_prorated_fee(date: date)
   end
 
-  def reclassify!(owner, to:, status: nil, date: nil, skip_fees: false)
+  def reclassify!(owner, to:, status: nil, date: nil, number: 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?
 
@@ -183,6 +183,14 @@ module EffectiveMembershipsRegistrar
     # Last Changed Date
     membership.registration_on = date
 
+    # Assign Number (this could be nil)
+    number = next_membership_number(owner, to: to) if number.nil?
+
+    if number.present?
+      membership.number = number
+      membership.number_as_integer = (Integer(number) rescue nil)
+    end
+
     # Assign Category
     membership.build_membership_category(category: to)
     membership.membership_category(category: from).mark_for_destruction
@@ -213,7 +221,7 @@ module EffectiveMembershipsRegistrar
     end
   end
 
-  def reinstate!(owner, to: nil, date: nil, skip_fees: false)
+  def reinstate!(owner, to: nil, date: nil, number: nil, skip_fees: false)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
 
     history = owner.reinstatement_membership_history || owner.membership_histories.last
@@ -236,10 +244,15 @@ module EffectiveMembershipsRegistrar
     membership.joined_on = date
     membership.registration_on = date
 
+    # Assign Old Number (this could be nil)
+    number = history.number if history.number.present?
+
     # Assign Number (this could be nil)
-    if history.number.present?
-      membership.number = history.number
-      membership.number_as_integer = (Integer(history.number) rescue nil)
+    number = next_membership_number(owner, to: to) if number.nil?
+
+    if number.present?
+      membership.number = number
+      membership.number_as_integer = (Integer(number) rescue nil)
     end
 
     # Assign Category

data/app/models/effective/registrar_action.rb

@@ -64,12 +64,12 @@ module Effective
 
     def reclassify!
       update!(current_action: :reclassify)
-      EffectiveMemberships.Registrar.reclassify!(owner, to: category, skip_fees: skip_fees?)
+      EffectiveMemberships.Registrar.reclassify!(owner, to: category, number: number, skip_fees: skip_fees?)
     end
 
     def reinstate!
       update!(current_action: :reinstate)
-      EffectiveMemberships.Registrar.reinstate!(owner, skip_fees: skip_fees?)
+      EffectiveMemberships.Registrar.reinstate!(owner, number: number, skip_fees: skip_fees?)
     end
 
     def status_assign!

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

@@ -8,7 +8,7 @@
 
   %p
     - if applicant.owner.membership&.number_was.present?
-      The member will keep their existing membership number: #{applicant.owner.membership.number}.
+      The member will keep their existing membership number: #{applicant.owner.membership.number_was}.
     - elsif applicant.reinstatement? && reinstatement&.number.present?
       The member will keep their previous membership number: #{reinstatement.number}.
     - else

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

@@ -18,12 +18,15 @@
       = f.check_box :current_action, label: 'Yes, reclassify this member to another category'
 
       = f.show_if :current_action, true do
-        %p The member will keep their existing membership number: #{membership.number}.
-
         - categories = f.object.owner.registrar_action_categories(:reclassify) - membership.categories
-
         = f.select :category_id, categories, label: 'Reclassify to', required: true
 
+        %p
+          - if membership.number.present?
+            The member will keep their existing membership number: #{membership.number}.
+          - else
+            = f.text_field :membership_number, hint: "leave blank to assign the next number as per the category"
+
         = f.check_box :skip_fees, label: 'Yes, skip creating fees and just set the category'
 
         = f.hide_if :skip_fees, true do

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

@@ -27,6 +27,12 @@
       = f.check_box :current_action, label: 'Yes, reinstate this member to their previous category, status and number'
 
       = f.show_if :current_action, true do
+        %p
+          - if reinstatement.number.present?
+            The member will keep their existing membership number: #{reinstatement.number}.
+          - else
+            = f.text_field :membership_number, hint: "leave blank to assign the next number as per the category"
+
         = f.check_box :skip_fees, label: 'Yes, skip creating fees and just set the category'
 
         = f.hide_if :skip_fees, true do

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.13.1'
+  VERSION = '0.13.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-23 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails