effective_memberships 0.1.20 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2cbe81e83cfde35743c82714d341ec6630d11999b89efb6dba5d4fe63d1f2b3
-  data.tar.gz: 33504263d9b05a49d2811ac8b187cbf4bacae380b7d1dc93570a205fa2764313
+  metadata.gz: 2f8c32ed9ffd17db6a7c0826bfb9eb72615ec3e7049adbb9f18b99cb8957c905
+  data.tar.gz: 5685ca74db5bd94d757c6a209b135160a015fddd2900ba6d66b55976a495eaa9
 SHA512:
-  metadata.gz: 1274f2edc9e0879b19bd1353d57af7baa9a5519ab489004d833a6371f51dbb3e93e3bc90489dedfa0046e5a83a55016170d3db1079d05cc250ad929a0ba4df24
-  data.tar.gz: '08bc66d42dd4e1bf51d3d739489db673f4b1166451bb40d7c7a20b212ac76a4eeb4d6c00ca32486199634dc90c904bca0bf694e95dc5e1128b4a5a397264778f'
+  metadata.gz: 9590986cb17a70c70183acfa7a4bf7dbc23959fd9482058737a916f767feedeb77a14444f2b6f1ed9631bb1c4d7d70affaf46e38f879a0af1a6acdc4ac480c94
+  data.tar.gz: 4dc42f6e02b50adad0c8c714ee64e97ef398828a391736db51348fed377ced92784cf116f21f147edec98eea06c365925d4d0efce559001c839d2ad89826e7ca

data/app/controllers/effective/applicants_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/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,96 +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 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
-    )
-
-    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/app/models/concerns/effective_memberships_owner.rb

@@ -21,6 +21,8 @@ module EffectiveMembershipsOwner
   end
 
   included do
+    acts_as_role_restricted unless respond_to?(:acts_as_role_restricted?)
+
     # App scoped
     has_many :applicants, -> { order(:id) }, inverse_of: :owner, as: :owner
     has_many :fee_payments, -> { order(:id) }, inverse_of: :owner, as: :owner
@@ -57,6 +59,31 @@ module EffectiveMembershipsOwner
     owners || [self]
   end
 
+  # This is the calculated way of determining if an owner is a member or not.
+  # The correct way to check for membership is: current_user.is?(:member)
+  def membership_present?
+    individual_membership_present? || organization_membership_present?
+  end
+
+  def individual_membership_present?
+    membership.present? && !membership.marked_for_destruction?
+  end
+
+  def organization_membership_present?(except: nil)
+    return false unless self.class.respond_to?(:effective_organizations_user?)
+    organizations.any? { |organization| organization != except && organization.membership_present? }
+  end
+
+  def assign_member_role
+    membership_present? ? add_role(:member) : remove_role(:member)
+  end
+
+  # This can be called by a script to recalculate the owner role based on current membership
+  def update_member_role!
+    assign_member_role
+    save!
+  end
+
   def outstanding_fee_payment_owners
     effective_memberships_owners.select { |owner| !owner.membership_fees_paid? }
   end
@@ -230,6 +257,7 @@ module EffectiveMembershipsOwner
     fee
   end
 
+  # Called by the registrar.
   def update_membership_status!
     raise('expected membership to be present') unless membership.present?
 

data/app/models/concerns/effective_memberships_registrar.rb

@@ -37,7 +37,7 @@ module EffectiveMembershipsRegistrar
     categories = Array(categories)
 
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
-    raise('expecting a membership category') unless categories.all? { |cat| cat.class.respond_to?(:effective_memberships_category?) }
+    raise('expecting a membership category') unless categories.present? && categories.all? { |cat| cat.class.respond_to?(:effective_memberships_category?) }
 
     # Default Date and next number
     date ||= Time.zone.now
@@ -73,6 +73,9 @@ module EffectiveMembershipsRegistrar
       save!(owner, date: date)
     end
 
+    # Assign member role
+    add_member_role(owner)
+
     owner.update_membership_status!
   end
 
@@ -113,6 +116,9 @@ module EffectiveMembershipsRegistrar
       raise('already has purchased prorated fee') if fee.purchased?
     end
 
+    # Assign member role
+    add_member_role(owner)
+
     # Save owner
     save!(owner, date: date)
   end
@@ -163,6 +169,9 @@ module EffectiveMembershipsRegistrar
     owner.outstanding_fee_payment_fees.each { |fee| fee.mark_for_destruction }
     owner.outstanding_fee_payment_orders.each { |order| order.mark_for_destruction }
 
+    # Remove member role
+    remove_member_role(owner)
+
     save!(owner, date: date)
   end
 
@@ -293,6 +302,34 @@ module EffectiveMembershipsRegistrar
 
   protected
 
+  def add_member_role(owner)
+    owner.add_role(:member)
+
+    if owner.class.respond_to?(:effective_organizations_organization?)
+      organization = owner
+      organization.representatives.each { |representative| representative.user.add_role(:member) }
+    end
+
+    true
+  end
+
+  def remove_member_role(owner)
+    owner.remove_role(:member)
+
+    if owner.class.respond_to?(:effective_organizations_organization?)
+      organization = owner
+
+      organization.representatives.each do |representative|
+        user = representative.user
+        member = user.individual_membership_present? || user.organization_membership_present?(except: organization)
+
+        user.remove_role(:member) if !member
+      end
+    end
+
+    true
+  end
+
   def save!(owner, date: Time.zone.now)
     owner.build_membership_history(start_on: date)
     owner.save!

data/app/models/effective/fee.rb

@@ -107,8 +107,6 @@ module Effective
       EffectiveMemberships.custom_fee_types.include?(fee_type)
     end
 
-    private
-
     def default_period
       EffectiveMemberships.Registrar.current_period
     end
@@ -131,7 +129,7 @@ module Effective
     end
 
     def default_qb_item_name
-      category&.qb_item_name.presence || "#{fee_type} Fee"
+      category&.qb_item_name.presence || "#{fee_type}"
     end
 
     def default_tax_exempt

data/app/models/effective/membership.rb

@@ -58,6 +58,7 @@ module Effective
     validates :number, presence: true, uniqueness: true
     validates :joined_on, presence: true
     validates :registration_on, presence: true
+    validates :membership_categories, presence: true
 
     validate(if: -> { owner.present? }) do
       self.errors.add(:owner_id, 'must be a memberships owner') unless owner.class.effective_memberships_owner?

data/app/views/admin/categories/_form_applicant_fees.html.haml

@@ -6,6 +6,9 @@
   .row
     .col-lg-3= f.price_field :applicant_fee
 
+  .row
+    .col-lg-3= f.text_field :qb_item_name, label: "Quickbooks Item Name"
+
   %p Charged to join, based on the month of approval:
 
   .row

data/config/effective_memberships.rb

@@ -32,7 +32,7 @@ EffectiveMemberships.setup do |config|
   # config.deliver_method = :deliver_later
 
   # Default layout
-  config.mailer_layout = 'effective_memberships_mailer_layout'
+  # config.mailer_layout = 'effective_memberships_mailer_layout'
 
   # Default From
   config.mailer_sender = "no-reply@example.com"

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.1.20'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_roles
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: wicked
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_organizations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_developer
   requirement: !ruby/object:Gem::Requirement