effective_memberships 0.9.15 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e299db8cf3241529169d0f61a9524263dce1b1752fb04cbec395951ae7d1d029
-  data.tar.gz: e04637274efa4c3bffae73bbd27b62588ec3f6c74379050f51c58609f513bbc0
+  metadata.gz: 978c99bc1bc8f0106fac7867dc8a07acea70bd94456d248e20cbb2e57c633b76
+  data.tar.gz: af1183a241f5b564c7b3ca4aa1ded0768dfde262d3b75da1933ddd177e430ede
 SHA512:
-  metadata.gz: 9d01059e8b8e98c6c5ed0838a15a4b126a6d031cbaea7f76adb19146985f687514f5d518ca05bebbf6b9b3735739efd26c63a5d3a970097572d836cadb478c01
-  data.tar.gz: 00da75ee33edb063d76280cfb6bd1c771903ff24bdab9db0bf5c0ca06cc76e0998bd72313705ae0bf2ef90acf0c37dc4703b9fc5b3d15b34808f13606ccf38bc
+  metadata.gz: caa13055dda3360d3d1426710a39923cc79fcf99cf0af710acead650e3f56089d068e4d30fde0072ba2708cc144515a948a4a265624f0726e6afee4e1457861d
+  data.tar.gz: 5f8241aba4c6d6ca7757346ae74520993d48d4d04af8c5bdf486337ec2e939da8f2d7641fe746319d8c284190c07594b0be1b675240e996beee98815bb124c74

data/app/datatables/admin/effective_fees_datatable.rb

@@ -42,6 +42,9 @@ module Admin
 
       col :checkout_type, search: Effective::Fee::CHECKOUT_TYPES, visible: false
 
+      col :late_on, visible: false
+      col :not_in_good_standing_on, visible: false
+
       unless attributes[:total] == false
         aggregate :total
       end

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
 
@@ -333,6 +337,25 @@ module EffectiveMembershipsOwner
     save!
   end
 
+  # Delete the last membership history
+  def rollback_membership_history!
+    raise('expected membership to be present') unless membership.present?
+
+    (history, last) = membership_histories.last(2)
+    raise('expected 2 or more membership histories') unless history.present? && last.present?
+
+    last.mark_for_destruction
+    history.assign_attributes(end_on: nil)
+
+    membership.assign_attributes(
+      number: history.number,
+      categories: history.membership_categories,
+      statuses: history.membership_statuses
+    )
+
+    save!
+  end
+
   def build_membership_history(start_on: nil, notes: nil)
     raise('expected membership to be present') unless membership.present?
 

data/app/models/concerns/effective_memberships_registrar.rb

@@ -76,27 +76,8 @@ module EffectiveMembershipsRegistrar
     membership.number ||= number
     membership.number_as_integer ||= (Integer(number) rescue nil)
 
-    # Delete any removed statuses
-    membership.membership_statuses.each do |membership_status|
-      next if statuses.include?(membership_status.status)
-      membership_status.mark_for_destruction
-    end
-
-    # Build any additional statuses
-    statuses.each do |status|
-      membership.build_membership_status(status: status)
-    end
-
-    # Delete any removed categories
-    membership.membership_categories.each do |membership_category|
-      next if categories.include?(membership_category.category)
-      membership_category.mark_for_destruction
-    end
-
-    # Build any additional categories
-    categories.each do |category|
-      membership.build_membership_category(category: category)
-    end
+    # Builds the membership_categories and membership_statuses. Marks for destruction ones that don't exist.
+    membership.assign_attributes(statuses: statuses, categories: categories)
 
     changed = membership.membership_categories.any? { |mc| mc.new_record? || mc.marked_for_destruction? }
     changed ||= membership.membership_statuses.any? { |ms| ms.new_record? || ms.marked_for_destruction? }
@@ -175,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
@@ -190,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)
+
+      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?
+        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/models/effective/membership.rb

@@ -156,6 +156,21 @@ module Effective
       membership_categories.reject(&:marked_for_destruction?).map(&:category_id)
     end
 
+    def categories=(categories)
+      categories = Array(categories)
+      raise('expecting a membership category') if categories.any? { |cat| !cat.class.respond_to?(:effective_memberships_category?) }
+
+      # Delete any removed categories
+      membership_categories.each do |membership_category|
+        membership_category.mark_for_destruction unless categories.include?(membership_category.category)
+      end
+
+      # Build any additional categories
+      categories.each { |category| build_membership_category(category: category) }
+
+      nil
+    end
+
     # We might want to use singular memberships.
     def category
       raise('expected singular usage but there are more than one membership category') if categories.length > 1
@@ -192,6 +207,21 @@ module Effective
       membership_statuses.reject(&:marked_for_destruction?).map(&:status_id)
     end
 
+    def statuses=(statuses)
+      statuses = Array(statuses)
+      raise('expecting a membership category') if statuses.any? { |status| !status.class.respond_to?(:effective_memberships_status?) }
+
+      # Delete any removed statuses
+      membership_statuses.each do |membership_status|
+        membership_status.mark_for_destruction unless statuses.include?(membership_status.status)
+      end
+
+      # Build any additional statuses
+      statuses.each { |status| build_membership_status(status: status) }
+
+      nil
+    end
+
     def statuses_sentence
       statuses.map(&:to_s).to_sentence.presence || 'None'
     end

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.15'
+  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.15
+  version: 0.10.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-13 00:00:00.000000000 Z
+date: 2023-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails