effective_memberships 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9433add3d7d0b17df72da4ff6041b5667d2d57361b58d1f0a33e6c58e9a75ed
-  data.tar.gz: 68b962790a39557618f6b3f43bf79ad1d9416631b5bf7a48eba8296d68f9afc2
+  metadata.gz: 813c2bf0f2491dd88f28e0deb9b66353c5fce7e08bbd60facdcadc4df29f3c63
+  data.tar.gz: e856e0600b5e5943565509c20ad06e7a1da807546169b1058b9d5e7b784e3fb2
 SHA512:
-  metadata.gz: 79784d64235015655ef74cb86025ea250b97984984b307508f7897d9800b48fae553fdcb7815d00a8332160ec2bd4d41667c89707ee1bd81871d181b3c5d8f29
-  data.tar.gz: 8d2063383c55489ab29f5a2f2532c2086f0827affae2d52cb5e29a973ea1e26f21125cdb61a5b7c344a4b9896cb65151520239e6a7287bcff5bc32d86edd2dfa
+  metadata.gz: 0a54c8464c3547b7040f987e06abaca0100c31d5ccd8e976c68fc432dce308ec555b3050cf618f58ac3d54e8fefa743cee91eb8134c400be05cc13a628d08603
+  data.tar.gz: 6e8363b016b80e3dfd3e9930586cb8bd57f957dcf0d11d0687b5f049445fb2c0964615a027f12fdb60982f7ab63318d4740b7d61a8ba6c692307a1b65baf9405

data/app/models/concerns/effective_memberships_registrar.rb

@@ -202,15 +202,14 @@ module EffectiveMembershipsRegistrar
 
   def reinstate!(owner, to: nil, date: nil, skip_fees: false)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
-    raise('owner must have a removed membership.') unless owner.membership_removed?
 
-    history = owner.reinstatement_membership_history
-    raise('owner must have a reinstatement membership history.') if history.blank?
+    history = owner.reinstatement_membership_history || owner.membership_histories.last
+    raise('owner must have a removed membership history or some kind of history.') if history.blank?
 
     to ||= owner.reinstatement_membership_category
     raise('expecting a to memberships category') unless to.class.respond_to?(:effective_memberships_category?)
 
-    statuses = owner.reinstatement_membership_statuses
+    statuses = Array(owner.reinstatement_membership_statuses)
 
     # Default Date
     date ||= Time.zone.now

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

@@ -9,7 +9,7 @@
   %p
     - if applicant.owner.membership&.number_was.present?
       The member will keep their existing membership number: #{applicant.owner.membership.number}.
-    - elsif applicant.reinstatement? && reinstatement.number.present?
+    - elsif applicant.reinstatement? && reinstatement&.number.present?
       The member will keep their previous membership number: #{reinstatement.number}.
     - else
       - number = EffectiveMemberships.Registrar.next_membership_number(applicant.owner, to: applicant.category)
@@ -19,7 +19,7 @@
       - else
         No membership number will be assigned.
 
-  - if applicant.reinstatement?
+  - if applicant.reinstatement? && reinstatement.present?
     %p The member will be reinstated with their previous status: #{badges(reinstatement.membership_statuses) || 'None'}.
 
   %h3 Fees

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.9.13'
+  VERSION = '0.9.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2023-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails