effective_memberships 0.17.2 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e2e3a9a54270eaf14471e05b279d68d6f6d67238daf4b016fa70681c82d07a4
-  data.tar.gz: 8e344f17e247d18db2e9a5c276f4124d3eeff041a1761ef49906d2cd75bdec21
+  metadata.gz: 702306099757c4fc797be8baaab6e90a8f122b1b21ee2d45975c0e9e204c77a9
+  data.tar.gz: 1ddd79323d0835c87d7625be41b3fa17548f617b06223d655dac3fbf978b03b3
 SHA512:
-  metadata.gz: b8eff0a5c66e4b2e0d59024c4e686cbf2a0ca264df522064c5074c89b8fd911d4c14be2732e0ea677a1e9998a36a2d9674acf70ccb1393ca74f7a1a1e6ce3c8a
-  data.tar.gz: c4190c54eff0c58c6b1234f5f739d1b131c0dcc90cba603f1708a55a0dac9c224eec0ca0be8964b3bdae09cddcab32322adeeb4789792487b737fdb17b41caad
+  metadata.gz: c740293acf21b1f6c31e3c617e0c0a3c76918d7203c29b001b84de562240d1ae2a803bd7743eab552fdedc684626a5841b60e69a5a3e7b8e93d84687a5f08cc1
+  data.tar.gz: 7dc911eab9b73239a5944bdae2b5ac3593aa069c46e89cee575efc6686e611dfbbee6d4b0b1a175f4362fbd93ae2e1ab7175ad8a6e10c5c6cc923109d0155f50

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -48,6 +48,7 @@ module EffectiveMembershipsFeePayment
 
     # CPD Step
     attr_accessor :declare_cpd
+    attr_accessor :skip_cpd_validation
 
     # Declarations Step
     attr_accessor :declare_code_of_ethics
@@ -127,11 +128,11 @@ module EffectiveMembershipsFeePayment
     # CPD step
     with_options(if: -> { current_step == :cpd }) do
       validates :declare_cpd, acceptance: true
+    end
 
-      validate do
-        if (cpd_cycles = cpd_uncompleted_cpd_cycles).present?
-          self.errors.add(:base, "Please complete #{cpd_cycles.map(&:to_s).to_sentence} to continue")
-        end
+    validate(if: -> { current_step == :cpd && !skip_cpd_validation }) do
+      if (cpd_cycles = cpd_uncompleted_cpd_cycles).present?
+        self.errors.add(:base, "Please complete #{cpd_cycles.map(&:to_s).to_sentence} to continue")
       end
     end
 
@@ -172,6 +173,11 @@ module EffectiveMembershipsFeePayment
       end
     end
 
+    def can_visit_step?(step)
+      return (step == :submitted) if was_submitted?
+      can_revisit_completed_steps(step)
+    end
+
     # All Fees and Orders
     # Overriding acts_as_purchasable_wizard
     def submit_fees
@@ -246,12 +252,30 @@ module EffectiveMembershipsFeePayment
   end
 
   def cpd_required_cpd_cycles
-    date = submitted_at || Time.zone.now
+    @cpd_required_cpd_cycles ||= begin
+      date = submitted_at || Time.zone.now
+
+      cpd_cycles = [] # Return value
+
+      # The current and previous cycle
+      current = EffectiveCpd.current_cpd_cycle(date: date)
+      previous = EffectiveCpd.previous_cpd_cycle(date: date)
 
-    [
-      (EffectiveCpd.previous_cpd_cycle(date: date) if cpd_requirement.to_s.include?('previous')),
-      (EffectiveCpd.current_cpd_cycle(date: date) if cpd_requirement.to_s.include?('current'))
-    ].compact
+      if current.present? && cpd_requirement.to_s.include?('current')
+        cpd_cycles << current
+      end
+
+      # Only include if they were a member during the previous period
+      if previous.present? && cpd_requirement.to_s.include?('previous')
+        period = EffectiveMemberships.Registrar.period(date: previous.end_at&.advance(months: -1) || current&.start_at&.advance(months: -1) || previous.start_at.advance(months: 1))
+        renewal_date = EffectiveMemberships.Registrar.renewal_fee_date(date: period)
+        membership_history = owner.membership_history_on(renewal_date.advance(days: -1))
+
+        cpd_cycles << previous if membership_history.present? && !membership_history.removed?
+      end
+
+      cpd_cycles
+    end
   end
 
   def cpd_completed_cpd_cycles

data/app/models/concerns/effective_memberships_owner.rb

@@ -432,6 +432,13 @@ module EffectiveMembershipsOwner
     history
   end
 
+  def membership_category_start_on(category: :current)
+    category = membership&.categories&.first if category == :current
+    raise('expected a category') unless category.present?
+
+    membership_histories.find { |history| history.membership_category_ids.include?(category.id) }&.start_on || membership&.joined_on
+  end
+
   def membership_history_on(date)
     raise('expected a date') unless date.respond_to?(:strftime)
     membership_histories.find { |history| (history.start_on..history.end_on).cover?(date) } # Ruby 2.6 supports endless ranges

data/app/models/concerns/effective_memberships_registrar.rb

@@ -103,6 +103,7 @@ module EffectiveMembershipsRegistrar
   end
 
   # This is only used for a form collection on admin memberships
+  # And now for ASPB applicant reinstatement fees
   def periods(from:, to: nil)
     to ||= Time.zone.now
 

data/app/models/effective/membership_history.rb

@@ -69,5 +69,13 @@ module Effective
       assign_attributes(statuses: statuses.map(&:to_s), status_ids: statuses.map(&:id))
     end
 
+    def start_period
+      EffectiveMemberships.Registrar.period(date: start_on)
+    end
+
+    def end_period
+      EffectiveMemberships.Registrar.period(date: end_on)
+    end
+
   end
 end

data/app/views/effective/applicants/cpd.html.haml

@@ -4,12 +4,12 @@
   = card(et('effective_cpd.name')) do
     = render('cpd_requirements', applicant: resource)
 
-  = card('All ' + cpd_statements_label) do
-    = render('effective/wizard_steps/cpd_statements', resource: resource)
-
   = card('Requirements') do
     = render('effective/wizard_steps/cpd_requirements', resource: resource)
 
+  = card('All ' + cpd_statements_label) do
+    = render('effective/wizard_steps/cpd_statements', resource: resource)
+
   = card do
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id

data/app/views/effective/fee_payments/_cpd.html.haml

@@ -1,3 +1,3 @@
 = wizard_card(fee_payment) do
-  = render('effective/wizard_steps/cpd_statements', resource: fee_payment)
   = render('effective/wizard_steps/cpd_requirements', resource: fee_payment)
+  = render('effective/wizard_steps/cpd_statements', resource: fee_payment)

data/app/views/effective/fee_payments/cpd.html.haml

@@ -4,12 +4,12 @@
   = card(et('effective_cpd.name')) do
     = render('cpd_requirements', fee_payment: resource)
 
-  = card('All ' + cpd_statements_label) do
-    = render('effective/wizard_steps/cpd_statements', resource: resource)
-
   = card('Requirements') do
     = render('effective/wizard_steps/cpd_requirements', resource: resource)
 
+  = card('All ' + cpd_statements_label) do
+    = render('effective/wizard_steps/cpd_statements', resource: resource)
+
   = card do
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id
@@ -17,4 +17,7 @@
       - f.object.declare_cpd = true if f.object.has_completed_step?(:cpd)
       = render('effective/wizard_steps/cpd_fields', f: f)
 
+      - if Rails.env.development? || Rails.env.test?
+        = f.check_box :skip_cpd_validation, label: "Yes, skip the :cpd step validation (development and test mode only)"
+
       = f.save 'Save and Continue'

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.17.2'
+  VERSION = '0.17.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-04 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails