effective_memberships 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99f08d66833ddda5de88911b43a3bdbeec7a3c8471a8018612dad529c577d8bd
-  data.tar.gz: 0de87e5740113cde0a6dc6447eae0d53341637b6eeac1787ec233dceeab5b50c
+  metadata.gz: 8544e4c2c8881ecaf20650d65109ceec61d336d6da71934efeb456106fd106e7
+  data.tar.gz: d6c35955b6d1c50ac00e38f8e61c06be8ea5f09bd9f0b46151df34e595a3fb41
 SHA512:
-  metadata.gz: 4e7dbbdfccb1c6dc0f0c30f15c58fa04a82a556cf00d9ad00e252fcfd99c29c5b74a973a694c9447f19cf1b114d15a59decc1ac52049fc3019425c252938f7b7
-  data.tar.gz: '0683eee612f3d51e1024c118813cce613a3f5715c2959ac09b7cbea1cb000e9c17e3acfced1deaf28c717a6398b0d1a26622394018a2ff3f4f3225de7fb58c90'
+  metadata.gz: 825b440ee144856494653beed35d1f2897d9636450b30401aed9197c13614ed1e6c1e64a3cbdc3e8534d7f8080be630d19066a780dd7c6405da30eb455998785
+  data.tar.gz: df56086d4d6c6b856ca4b477a5fd6dbd78791e533523ef6e6d1a47efc75e326cb7b402ded63d1146d95a3929f2a0dc0846d16ae3f7d37173d82f788b9e355c58

data/app/controllers/admin/registrar_actions_controller.rb

@@ -14,6 +14,10 @@ module Admin
       success: -> { "#{resource.owner} has been reclassified to #{resource.owner.membership.category}" },
       redirect: -> { admin_owners_path(resource) }
 
+    submit :assign, 'Assign',
+      success: -> { "#{resource.owner} has been assigned to #{resource.owner.membership.categories.to_sentence}" },
+      redirect: -> { admin_owners_path(resource) }
+
     submit :remove, 'Remove',
       success: -> { "#{resource.owner} has been removed" },
       redirect: -> { admin_owners_path(resource) }

data/app/controllers/effective/applicant_references_controller.rb

@@ -24,8 +24,9 @@ module Effective
 
     def permitted_params
       permitted = params.require(:effective_applicant_reference).permit!.except(:token, :last_notified_at, :status, :status_steps)
+      authorized = current_user.effective_memberships_owners.include?(resource.applicant.owner) == false
 
-      if resource.submitted? && resource.applicant.was_submitted? && (resource.applicant.owner != current_user.effective_memberships_owner)
+      if resource.submitted? && resource.applicant.was_submitted? && authorized
         permitted
       else
         permitted.except(:reservations, :reservations_reason, :work_history, :accept_declaration)

data/app/controllers/effective/applicants_controller.rb

@@ -4,7 +4,7 @@ module Effective
 
     include Effective::WizardController
 
-    resource_scope -> { EffectiveMemberships.Applicant.deep.where(owner: current_user.effective_memberships_owner) }
+    resource_scope -> { EffectiveMemberships.Applicant.deep.where(owner: current_user.effective_memberships_owners) }
 
     # Allow only 1 in-progress application at a time
     before_action(only: [:new, :show], unless: -> { resource&.done? }) do

data/app/controllers/effective/fee_payments_controller.rb

@@ -4,7 +4,7 @@ module Effective
 
     include Effective::WizardController
 
-    resource_scope -> { EffectiveMemberships.FeePayment.deep.where(owner: current_user.effective_memberships_owner) }
+    resource_scope -> { EffectiveMemberships.FeePayment.deep.where(owner: current_user.effective_memberships_owners) }
 
     # Allow only 1 in-progress fee payment at a time
     before_action(only: [:new, :show], unless: -> { resource&.done? }) do
@@ -16,12 +16,15 @@ module Effective
       end
     end
 
+    after_save do
+      flash.now[:success] = ''
+    end
+
     private
 
     def permitted_params
       params.require(:fee_payment).permit!.except(
-        :owner_id, :owner_type, :status, :status_steps, :wizard_steps,
-        :submitted_at
+        :status, :status_steps, :wizard_steps, :submitted_at
       )
     end
 

data/app/datatables/admin/effective_membership_histories_datatable.rb

@@ -14,7 +14,15 @@ module Admin
 
       col :number
 
-      col :categories, label: 'Category'
+      col :categories, label: 'Category' do |history|
+        history.categories.map.with_index do |category, index|
+          category_id = history.category_ids[index]
+          link = link_to(category, effective_memberships.edit_admin_category_path(category_id))
+
+          content_tag(:div, link, class: 'col-resource_item')
+        end.join.html_safe
+      end
+
       col :category_ids, visible: false
 
       col :bad_standing

data/app/datatables/effective_applicants_datatable.rb

@@ -28,7 +28,7 @@ class EffectiveApplicantsDatatable < Effective::Datatable
   end
 
   collection do
-    EffectiveMemberships.Applicant.deep.where(owner: current_user.effective_memberships_owner)
+    EffectiveMemberships.Applicant.deep.where(owner: current_user.effective_memberships_owners)
   end
 
 end

data/app/datatables/effective_fee_payments_datatable.rb

@@ -6,24 +6,19 @@ class EffectiveFeePaymentsDatatable < Effective::Datatable
     col :token, visible: false
     col :created_at, visible: false
 
-    col :status
-    col :period, visible: false
+    col :owner
+    col :status, visible: false
     col :submitted_at, label: 'Submitted', as: :date
+    col :period, visible: false
 
-    col :orders
+    col :orders, action: :show
 
-    actions_col(show: false) do |fee_payment|
-      if fee_payment.draft?
-        dropdown_link_to('Continue', effective_memberships.fee_payment_build_path(fee_payment, fee_payment.next_step), 'data-turbolinks' => false)
-        dropdown_link_to('Delete', effective_memberships.fee_payment_path(fee_payment), 'data-confirm': "Really delete #{fee_payment}?", 'data-method': :delete)
-      else
-        dropdown_link_to('Show', effective_memberships.fee_payment_path(fee_payment))
-      end
-    end
+    actions_col(new: false)
   end
 
   collection do
-    EffectiveMemberships.FeePayment.deep.where(owner: current_user.effective_memberships_owner)
+    EffectiveMemberships.FeePayment.deep.done
+      .where(owner: current_user.effective_memberships_owners)
   end
 
 end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -247,6 +247,12 @@ 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
@@ -453,12 +459,17 @@ module EffectiveMembershipsApplicant
 
   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.
-    submit_fees.each do |fee|
+    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?
 

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -110,6 +110,12 @@ 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 }
 
@@ -205,17 +211,22 @@ module EffectiveMembershipsFeePayment
 
   # We take over the owner's outstanding fees.
   def find_or_build_submit_fees
-    Array(outstanding_fees).each { |fee| fees << fee }
+    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()
 
-    submit_fees.each do |fee|
+    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
@@ -244,7 +255,6 @@ module EffectiveMembershipsFeePayment
     save!
   end
 
-
   # Called automatically via after_purchase hook above
   def submit_purchased!
     return false if was_submitted?

data/app/models/concerns/effective_memberships_owner.rb

@@ -46,7 +46,23 @@ module EffectiveMembershipsOwner
   end
 
   def effective_memberships_owner
-    self
+    raise('expected singular usage but there are more than one owner') if effective_memberships_owners.length > 1
+    effective_memberships_owners.first
+  end
+
+  def effective_memberships_owners
+    owners = users if respond_to?(:users) && users.any? { |user| user.class.respond_to?(:effective_memberships_owner?) }
+    owners = organizations if respond_to?(:organizations) && organizations.any? { |organization| organization.class.respond_to?(:effective_memberships_owner?) }
+
+    owners || [self]
+  end
+
+  def outstanding_fee_payment_owners
+    effective_memberships_owners.select { |owner| !owner.membership_fees_paid? }
+  end
+
+  def current_fee_payment_owner
+    outstanding_fee_payment_owners.first || self
   end
 
   def owner_label
@@ -87,6 +103,10 @@ module EffectiveMembershipsOwner
     membership_histories.find { |history| history.removed? }.start_on
   end
 
+  def registrar_action_categories(action)
+    EffectiveMemberships.Category.sorted.all
+  end
+
   # Instance Methods
   def additional_fee_attributes(fee)
     raise('expected an Effective::Fee') unless fee.kind_of?(Effective::Fee)
@@ -161,6 +181,8 @@ module EffectiveMembershipsOwner
       late_on: nil,
       bad_standing_on: nil
     )
+
+    fee
   end
 
   def build_renewal_fee(category:, period:, late_on:, bad_standing_on:)

data/app/models/effective/registrar_action.rb

@@ -17,6 +17,9 @@ module Effective
     attr_accessor :membership_number
     attr_accessor :skip_fees
 
+    # Assign
+    attr_accessor :category_ids
+
     # All Action Validations
     validates :current_action, presence: true
     validates :current_user, presence: true
@@ -29,10 +32,27 @@ module Effective
     validates :category_id, presence: true,
       if: -> { current_action == :reclassify || current_action == :register }
 
+    validates :category_ids, presence: true, if: -> { current_action == :assign }
+
     def to_s
       'action'
     end
 
+    def register!
+      update!(current_action: :register)
+      EffectiveMemberships.Registrar.register!(owner, to: category, number: membership_number.presence, skip_fees: skip_fees?)
+    end
+
+    def reclassify!
+      update!(current_action: :reclassify)
+      EffectiveMemberships.Registrar.reclassify!(owner, to: category, skip_fees: skip_fees?)
+    end
+
+    def assign!
+      update!(current_action: :assign)
+      EffectiveMemberships.Registrar.assign!(owner, categories: categories, number: membership_number.presence)
+    end
+
     def good_standing!
       update!(current_action: :good_standing)
       EffectiveMemberships.Registrar.good_standing!(owner)
@@ -43,11 +63,6 @@ module Effective
       EffectiveMemberships.Registrar.bad_standing!(owner, reason: bad_standing_reason)
     end
 
-    def reclassify!
-      update!(current_action: :reclassify)
-      EffectiveMemberships.Registrar.reclassify!(owner, to: category, skip_fees: skip_fees?)
-    end
-
     def fees_paid!
       update!(current_action: :fees_paid)
       EffectiveMemberships.Registrar.fees_paid!(owner)
@@ -58,11 +73,6 @@ module Effective
       EffectiveMemberships.Registrar.remove!(owner)
     end
 
-    def register!
-      update!(current_action: :register)
-      EffectiveMemberships.Registrar.register!(owner, to: category, number: membership_number.presence, skip_fees: skip_fees?)
-    end
-
     def update!(atts)
       assign_attributes(atts); save!
     end
@@ -89,6 +99,10 @@ module Effective
       EffectiveMemberships.Category.find(@category_id) if @category_id
     end
 
+    def categories
+      EffectiveMemberships.Category.where(id: @category_ids) if @category_ids
+    end
+
     def skip_fees?
       EffectiveResources.truthy?(@skip_fees)
     end

data/app/views/admin/registrar_actions/_form_assign.html.haml

@@ -0,0 +1,34 @@
+.card
+  .card-body
+    %h5.card-title Assign
+
+    = effective_form_with(model: [:admin, registrar_action], url: effective_memberships.admin_registrar_actions_path) do |f|
+      = f.hidden_field :owner_id
+      = f.hidden_field :owner_type
+
+      - membership = f.object.owner.membership
+
+      %p.text-muted
+        Assign to one or more categories.
+
+      = f.static_field :current_action, label: 'Current Categories' do
+        - Array(membership&.categories).each do |category|
+          %div= link_to(category, effective_memberships.edit_admin_category_path(category))
+
+        - if membership.blank?
+          None
+
+      = f.check_box :current_action, label: 'Yes, assign this member to categories'
+
+      = f.show_if :current_action, true do
+        - categories = f.object.owner.registrar_action_categories(:assign)
+        = f.select :category_ids, categories, label: 'Assign to', required: true, multiple: true
+
+        - if membership.present?
+          %p The member will keep their existing membership number: #{membership.number}.
+        - else
+          = f.text_field :membership_number, hint: "leave blank to assign the next number"
+
+        %p No fees will be created
+
+        = f.submit 'Assign', border: false, center: true, 'data-confirm': "Really assign #{f.object.owner}?"

data/app/views/admin/registrar_actions/_form_bad_standing.html.haml

@@ -9,13 +9,14 @@
       - membership = f.object.owner.membership
 
       - period = EffectiveMemberships.Registrar.current_period
-      - date = EffectiveMemberships.Registrar.bad_standing_date(period: period)
+      - date = (EffectiveMemberships.Registrar.bad_standing_date(period: period) rescue false)
 
       %p.text-muted
-        Members with outstanding renewal fees are automatically marked
-        not in good standing on #{date.strftime('%B %d')}.
-        The status is cleared when they pay their fees.
-        You can also mark a member as always not in good standing.
+        - if date.present?
+          Members with outstanding renewal fees are automatically marked
+          not in good standing on #{date.strftime('%B %d')}.
+          The status is cleared when they pay their fees.
+          You can also mark a member as always in bad standing.
 
       = f.static_field :current_action, label: 'Current Status' do
 

data/app/views/admin/registrar_actions/_form_reclassify.html.haml

@@ -7,9 +7,7 @@
       = f.hidden_field :owner_type
 
       - membership = f.object.owner.membership
-
       - period = EffectiveMemberships.Registrar.current_period
-      - date = EffectiveMemberships.Registrar.bad_standing_date(period: period)
 
       %p.text-muted
         Change a member's existing category and optionally create fees.
@@ -22,7 +20,8 @@
       = f.show_if :current_action, true do
         %p The member will keep their existing membership number: #{membership.number}.
 
-        - categories = EffectiveMemberships.Category.all.where.not(id: membership.category_id)
+        - categories = f.object.owner.registrar_action_categories(:reclassify) - membership.categories
+
         = f.select :category_id, categories, label: 'Reclassify to', required: true
 
         = f.check_box :skip_fees, label: 'Yes, skip creating fees and just set the category'

data/app/views/admin/registrar_actions/_form_register.html.haml

@@ -17,7 +17,7 @@
       = f.check_box :current_action, label: 'Yes, register to a membership'
 
       = f.show_if :current_action, true do
-        - categories = EffectiveMemberships.Category.all
+        - categories = f.object.owner.registrar_action_categories(:register)
         = f.select :category_id, categories, label: 'Register to'
 
         = f.text_field :membership_number, hint: "leave blank to assign the next number"

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

@@ -1,6 +1,4 @@
-- authorized = EffectiveResources.authorized?(self, :new, EffectiveMemberships.FeePayment)
-- datatable = EffectiveResources.best('EffectiveFeePaymentsDatatable').new(self)
-- in_progress = current_user.effective_memberships_owner.fee_payments.in_progress
+- datatable = EffectiveResources.best('EffectiveFeePaymentsDatatable').new(self, namespace: :effective)
 
 %h2 Fee Payments
 

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

@@ -2,19 +2,33 @@
 
   .card
     .card-body
-      %p Welcome #{current_user.effective_memberships_owner}!
+      - current_owner = current_user.current_fee_payment_owner
+
+      %p Welcome #{current_owner}!
 
       = render 'effective/fee_payments/content', resource: resource
 
-      - if resource.outstanding_fees.blank?
+      - if current_owner.membership_fees_paid?
         %p You have no fees due at this time.
         = link_to 'Home', root_path, class: 'btn btn-primary'
 
-      - if resource.outstanding_fees.present?
-        %p You have the following fees due at this time:
+      - else
+        - if resource.outstanding_fees.present?
+          %p You have the following fees due at this time:
+          = render_purchasables(resource.outstanding_fees)
+        - else
+          %p You have fees due. Please continue.
 
-        = render_purchasables(resource.outstanding_fees)
+        - resource.user = current_user
+        - resource.owner = current_owner
 
         = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
           = f.hidden_field :id
+
+          = f.hidden_field :owner_type
+          = f.hidden_field :owner_id
+
+          = f.hidden_field :user_type
+          = f.hidden_field :user_id
+
           = f.save 'Save and Continue'

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.1.5'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -282,6 +282,7 @@ files:
 - app/views/admin/fees/_form.html.haml
 - app/views/admin/memberships/_status.html.haml
 - app/views/admin/registrar_actions/_form.html.haml
+- app/views/admin/registrar_actions/_form_assign.html.haml
 - app/views/admin/registrar_actions/_form_bad_standing.html.haml
 - app/views/admin/registrar_actions/_form_fees_paid.html.haml
 - app/views/admin/registrar_actions/_form_reclassify.html.haml