effective_memberships 0.9.16 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90078c67d46aca1f293b49ffacac17288bb24592a4007079e6843847845a4e48
-  data.tar.gz: 0063d4f68e0c2ff073c06eb62812006d13f050b50eecbc10163aa80f0a862a04
+  metadata.gz: 978c99bc1bc8f0106fac7867dc8a07acea70bd94456d248e20cbb2e57c633b76
+  data.tar.gz: af1183a241f5b564c7b3ca4aa1ded0768dfde262d3b75da1933ddd177e430ede
 SHA512:
-  metadata.gz: 01b87e4c9a1aa5664e5bb0fb14ca95a3fac57ea8f2ca0542e379e7e11a1d0450c7aef6fcd4b8d29ab3312e6db33e4a3729b60301b54870e0d7abe20f144df93b
-  data.tar.gz: e71ea11d0e5d126f4e37474726a234440f6e2105131a57fd1a6427c9c2ab897884f3502df0f2150a89318748b494d156a1e11d3fd81334aab8d9c19d9c2ef533
+  metadata.gz: caa13055dda3360d3d1426710a39923cc79fcf99cf0af710acead650e3f56089d068e4d30fde0072ba2708cc144515a948a4a265624f0726e6afee4e1457861d
+  data.tar.gz: 5f8241aba4c6d6ca7757346ae74520993d48d4d04af8c5bdf486337ec2e939da8f2d7641fe746319d8c284190c07594b0be1b675240e996beee98815bb124c74

data/app/models/concerns/effective_memberships_owner.rb

@@ -99,6 +99,10 @@ module EffectiveMembershipsOwner
     fees.select { |fee| fee.fee_payment_fee? && !fee.purchased? }
   end
 
+  def outstanding_renewal_fees
+    fees.select { |fee| fee.fee_type == 'Renewal' && !fee.purchased? }
+  end
+
   def outstanding_fee_payments
     fee_payments = EffectiveMemberships.FeePayment.all
 

data/app/models/concerns/effective_memberships_registrar.rb

@@ -156,6 +156,7 @@ module EffectiveMembershipsRegistrar
     raise('expected to and from to be different') if from == to
 
     date ||= Time.zone.now
+    period = period(date: date)
 
     # Existing Membership
     membership = owner.membership
@@ -171,11 +172,18 @@ module EffectiveMembershipsRegistrar
     membership.build_membership_status(status: status) if status.present?
 
     unless skip_fees
-      fee = owner.build_prorated_fee(date: date)
-      raise('already has purchased prorated fee') if fee.purchased?
+      existing = owner.membership_period_fee(category: from, period: period)
 
-      fee = owner.build_discount_fee(date: date, from: from)
-      raise('already has purchased discount fee') if fee.purchased?
+      if existing
+        fee = owner.build_prorated_fee(date: date)
+        raise('already has purchased prorated fee') if fee.purchased?
+
+        fee = owner.build_discount_fee(date: date, from: from)
+        raise('already has purchased discount fee') if fee.purchased?
+      else
+        fee = owner.build_renewal_fee(category: to, period: period)
+        raise('already has purchased renewal fee') if fee.purchased?
+      end
     end
 
     save!(owner, date: date)

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

@@ -31,8 +31,11 @@
       %li A #{month} prorated fee
 
     - if applicant.reclassification?
-      %li A #{month} prorated fee to the new category
-      %li A #{month} discount fee from their old category
+      - if applicant.owner.outstanding_renewal_fees.present?
+        %li A renewal fee in their new category
+      - else
+        %li A #{month} prorated fee to the new category
+        %li A #{month} discount fee from their old category
 
     - if applicant.reinstatement?
       %li A #{month} prorated fee to their reinstatement category

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.9.16'
+  VERSION = '0.10.0'
 end

metadata

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