effective_memberships 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8631bb8b93a7995e011f7adec1de42aeea234db706f39d09e2b82354263e7d79
-  data.tar.gz: 0bbb9dfcd4376d091ed21e9a0e06f2b48e4124b8292c0209d64b5ccb57966ef4
+  metadata.gz: 928383b46dabf57a0ee3e4ebed61050c15ddd4d2da01fcc50cec8ead2ded706b
+  data.tar.gz: 2e7b2f5b6e5e75991239f093783ab8a83c6f2b522fa8f5a482c067d04cb122ba
 SHA512:
-  metadata.gz: 81a13b9ff646557e043080d8dcda78b47291bcfd605b648ac6f5617c06fc5c575c10b96ccda6da7416f25580a1245fc230fb7e4a6396ab681a81e5302ff1e421
-  data.tar.gz: cdcb59441b8a561ea6324c30656bac165c67acebb9a593ab7133110a24e38ad32d2b753fe6f539fd87cadd9789df0bb4bcd90b408a735d7817c6b692f9437728
+  metadata.gz: 8cd3faa8139e44db7aa485de820bed35f09b9d8cf8b2d56010cd87bf47515f143b9289362978cc305d63a50d8a24b4b8b9dadaabd240fffcc50abb970e8ac7d4
+  data.tar.gz: ba43e01d4180108144333d61d17f22a4297374db0842c6e33bf7044d381b192883d6813532b5717dca8df778293b065e1a0ba7d07a2c867f2c60b03912520e1e

data/app/controllers/effective/applicants_controller.rb

@@ -16,9 +16,6 @@ module Effective
       end
     end
 
-    before_render(only: :show, if: -> { step == :checkout }) do
-      resource.ready!
-    end
 
     after_save do
       flash.now[:success] = ''

data/app/controllers/effective/fee_payments_controller.rb

@@ -16,10 +16,6 @@ module Effective
       end
     end
 
-    before_render(only: :show, if: -> { step == :checkout }) do
-      resource.ready!
-    end
-
     after_save do
       flash.now[:success] = ''
     end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -60,6 +60,8 @@ module EffectiveMembershipsApplicant
       submitted: 'Submitted'
     )
 
+    acts_as_purchasable_wizard
+
     log_changes(except: :wizard_steps) if respond_to?(:log_changes)
 
     has_many_attached :applicant_files
@@ -247,12 +249,6 @@ module EffectiveMembershipsApplicant
       validates :declare_truth, acceptance: true
     end
 
-    # Billing Step
-    validate(if: -> { current_step == :billing && owner.present? }) do
-      self.errors.add(:base, "must have a billing address") unless owner.billing_address.present?
-      self.errors.add(:base, "must have an email") unless owner.email.present?
-    end
-
     # Admin Approve
     validate(if: -> { approved_membership_date.present? }) do
       if approved_membership_date.to_date > Time.zone.now.to_date
@@ -288,10 +284,47 @@ module EffectiveMembershipsApplicant
       end
     end
 
-    after_purchase do |_|
-      raise('expected submit_order to be purchased') unless submit_order&.purchased?
-      submit_purchased!
+    # All Fees and Orders
+    def submit_fees
+      fees.select { |fee| fee.applicant_submit_fee? }
+    end
+
+    def submit_order
+      orders.find { |order| order.purchasables.any?(&:applicant_submit_fee?) }
+    end
+
+    def submit_fee_qb_item_name
+      'Applicant'
+    end
+
+    def find_or_build_submit_fees
+      return submit_fees if submit_fees.present?
+
+      fees.build(
+        owner: owner,
+        fee_type: 'Applicant',
+        category: category,
+        price: category.applicant_fee,
+        qb_item_name: submit_fee_qb_item_name()
+      )
+
+      submit_fees
+    end
+
+    # Draft -> Submitted requirements
+    def submit!
+      raise('already submitted') if was_submitted?
+      raise('expected a purchased order') unless submit_order&.purchased?
+
+      after_commit do
+        applicant_references.each { |reference| reference.notify! if reference.submitted? }
+      end
+
+      wizard_steps[:checkout] ||= Time.zone.now
+      wizard_steps[:submitted] = Time.zone.now
+      submitted!
     end
+
   end
 
   # Instance Methods
@@ -330,10 +363,6 @@ module EffectiveMembershipsApplicant
     approved? || declined?
   end
 
-  def can_visit_step?(step)
-    can_revisit_completed_steps(step)
-  end
-
   def summary
     case status_was
     when 'draft'
@@ -435,101 +464,9 @@ module EffectiveMembershipsApplicant
     category&.min_applicant_files.to_i
   end
 
-  # All Fees and Orders
-  def submit_fees
-    fees.select { |fee| fee.applicant_submit_fee? }
-  end
-
-  def submit_order
-    orders.find { |order| order.purchasables.any?(&:applicant_submit_fee?) }
-  end
-
-  def submit_fee_qb_item_name
-    'Applicant'
-  end
-
-  def find_or_build_submit_fees
-    return submit_fees if submit_fees.present?
-
-    fees.build(
-      owner: owner,
-      fee_type: 'Applicant',
-      category: category,
-      price: category.applicant_fee,
-      qb_item_name: submit_fee_qb_item_name()
-    )
-
-    submit_fees
-  end
-
-  def find_or_build_submit_order
-    order = submit_order || orders.build(user: owner)
-    fees = submit_fees()
-
-    # Adds fees, but does not overwrite any existing price.
-    fees.each do |fee|
-      order.add(fee) unless order.purchasables.include?(fee)
-    end
-
-    order.purchasables.each do |purchasable|
-      order.remove(purchasable) unless fees.include?(purchasable)
-    end
-
-    # From Billing Step
-    order.billing_address = owner.billing_address if owner.billing_address.present?
-
-    order.save
-
-    order
-  end
-
-  # Should be indempotent.
-  def build_submit_fees_and_order
-    return false if was_submitted?
-
-    fees = find_or_build_submit_fees()
-    raise('already has purchased submit fees') if fees.any? { |fee| fee.purchased? }
-
-    order = find_or_build_submit_order()
-    raise('already has purchased submit order') if order.purchased?
-
-    true
-  end
-
-  # Owner clicks on the Billing step. Next step is Checkout
-  def billing!
-    ready!
-  end
-
-  # Ready to check out
-  def ready!
-    build_submit_fees_and_order
-    save!
-  end
-
-  # Called automatically via after_purchase hook above
-  def submit_purchased!
-    return false if was_submitted?
-
-    wizard_steps[:checkout] = Time.zone.now
-    submit!
-  end
-
-  # Draft -> Submitted requirements
-  def submit!
-    raise('already submitted') if was_submitted?
-    raise('expected a purchased order') unless submit_order&.purchased?
-
-    after_commit do
-      applicant_references.each { |reference| reference.notify! if reference.submitted? }
-    end
-
-    wizard_steps[:checkout] ||= Time.zone.now
-    wizard_steps[:submitted] = Time.zone.now
-    submitted!
-  end
-
-  # Submitted -> Completed requirements
+  # The submit! method used to be here
+  # But it needs to be inside the included do block
+  # So see above. Sorry.
 
   def applicant_references_required?
     min_applicant_references > 0

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -44,6 +44,8 @@ module EffectiveMembershipsFeePayment
       submitted: 'Submitted'
     )
 
+    acts_as_purchasable_wizard
+
     log_changes(except: :wizard_steps) if respond_to?(:log_changes)
 
     # Declarations Step
@@ -110,12 +112,6 @@ module EffectiveMembershipsFeePayment
       validates :declare_truth, acceptance: true
     end
 
-    # Billing Step
-    validate(if: -> { current_step == :billing && owner.present? }) do
-      self.errors.add(:base, "must have a billing address") unless owner.billing_address.present?
-      self.errors.add(:base, "must have an email") unless owner.email.present?
-    end
-
     # Clear required steps memoization
     after_save { @_required_steps = nil }
 
@@ -135,13 +131,30 @@ module EffectiveMembershipsFeePayment
       end
     end
 
-    after_purchase do |_order|
-      raise('expected submit_order to be purchased') unless submit_order&.purchased?
+    # All Fees and Orders
+    # Overriding acts_as_purchasable_wizard
+    def outstanding_fees
+      owner&.outstanding_fee_payment_fees
+    end
+
+    def submit_fees
+      fees
+    end
+
+    def submit_order
+      orders.first
+    end
+
+    # We take over the owner's outstanding fees.
+    def find_or_build_submit_fees
+      Array(outstanding_fees).each { |fee| fees << fee unless fees.include?(fee) }
+      submit_fees
+    end
 
-      submit_purchased!
-      after_submit_purchased!
+    def after_submit_purchased!
       EffectiveMemberships.Registrar.fee_payment_purchased!(owner)
     end
+
   end
 
   def to_s
@@ -157,14 +170,6 @@ module EffectiveMembershipsFeePayment
     submitted?
   end
 
-  def can_visit_step?(step)
-    can_revisit_completed_steps(step)
-  end
-
-  def outstanding_fees
-    owner&.outstanding_fee_payment_fees
-  end
-
   def select!
     reset!
   end
@@ -200,83 +205,4 @@ module EffectiveMembershipsFeePayment
     owner.representatives.any?(&:marked_for_destruction?)
   end
 
-  # All Fees and Orders
-  def submit_fees
-    fees
-  end
-
-  def submit_order
-    orders.first
-  end
-
-  # We take over the owner's outstanding fees.
-  def find_or_build_submit_fees
-    Array(outstanding_fees).each { |fee| fees << fee unless fees.include?(fee) }
-    submit_fees
-  end
-
-  def find_or_build_submit_order
-    order = submit_order || orders.build(user: owner)
-    fees = submit_fees()
-
-    fees.each do |fee|
-      order.add(fee) unless order.purchasables.include?(fee)
-    end
-
-    order.purchasables.each do |purchasable|
-      order.remove(purchasable) unless fees.include?(purchasable)
-    end
-
-    order.billing_address = owner.billing_address if owner.billing_address.present?
-
-    order.save
-
-    order
-  end
-
-  # Should be indempotent.
-  def build_submit_fees_and_order
-    return false if was_submitted?
-
-    fees = find_or_build_submit_fees()
-    raise('already has purchased submit fees') if fees.any? { |fee| fee.purchased? }
-
-    order = find_or_build_submit_order()
-    raise('already has purchased submit order') if order.purchased?
-
-    true
-  end
-
-  # Owner clicks on the Billing Submit. Next step is Checkout
-  def billing!
-    ready!
-  end
-
-  def ready!
-    build_submit_fees_and_order
-    save!
-  end
-
-  # Called automatically via after_purchase hook above
-  def submit_purchased!
-    return false if was_submitted?
-
-    wizard_steps[:checkout] = Time.zone.now
-    submit!
-  end
-
-  # A hook to extend
-  def after_submit_purchased!
-  end
-
-  # Draft -> Submitted
-  def submit!
-    raise('already submitted') if was_submitted?
-    raise('expected a purchased order') unless submit_order&.purchased?
-
-    wizard_steps[:checkout] ||= Time.zone.now
-    wizard_steps[:submitted] = Time.zone.now
-    submitted!
-  end
-
 end

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.1.22'
+  VERSION = '0.1.23'
 end

metadata

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