effective_memberships 0.1.2 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6e16095d62eababb9b14b78f65c13b45b744e15c16f92b79724b8e138b4b38d
-  data.tar.gz: e4a51731819350e85f49615a982614197fc05fcf3b4b5da4558a6a534eab1ea2
+  metadata.gz: 94c86611361e96c3285e00fde6075fcffa29463c30a7dd2b50eaec13b9932874
+  data.tar.gz: faaa7786c43295547b10febc3c6f55b1e4041235d693f6f7e02094c22780f5af
 SHA512:
-  metadata.gz: c333cb75909efad3f4400b0fead9397b5f3f89d3d4df9dc920e9b5867ad58223fa0baeb3170db00b0d652bbf41d48405832b103e3fb84b872ed042634a20a0a3
-  data.tar.gz: 859cea163d8380b4daf5e6dbc98f575a1b755fded7a27c3a227ddc36e1de61b1225304e091d44c9a4fa6096b1b464aeaf0f339013c57920ad5bd91e027575992
+  metadata.gz: b9c66aaa1fe570f885d5b36b83f733cf15f8b4d3e2a1968d5bd4db197cbddd33a91247405a60fde9ab5dbde210de04119d3f51594baf09946a7ebdcc8c29029d
+  data.tar.gz: 3b36dee1f865804437f63415680c49c131b9ee94a4ae7f8e31e2df789268ae413e43ea8db3ea8c8548e352a63cf33273b508832dcd1eb476ae877c19c8bcdc50

data/app/controllers/admin/fee_payments_controller.rb

@@ -0,0 +1,19 @@
+module Admin
+  class FeePaymentsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_memberships) }
+
+    include Effective::CrudController
+
+    resource_scope -> { EffectiveMemberships.FeePayment.deep.all }
+    datatable -> { Admin::EffectiveFeePaymentsDatatable.new }
+
+    private
+
+    def permitted_params
+      model = (params.key?(:effective_applicant) ? :effective_fee_payment : :fee_payment)
+      params.require(model).permit!
+    end
+
+  end
+end

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
@@ -20,8 +20,7 @@ module Effective
 
     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_fee_payments_datatable.rb

@@ -0,0 +1,51 @@
+module Admin
+  class EffectiveFeePaymentsDatatable < Effective::Datatable
+    filters do
+      scope :all
+      scope :in_progress, label: 'Open / Active'
+      scope :done, label: 'Done'
+    end
+
+    datatable do
+      order :id
+      col :id, visible: false
+
+      col :status
+
+      col :created_at, label: 'Created', as: :date, visible: false
+      col :updated_at, label: 'Updated', visible: false
+
+      col :period, visible: false
+      col :submitted_at, label: 'Submitted', visible: false, as: :date
+
+      col :owner
+
+      col :category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
+
+      col :orders, visible: false
+
+      actions_col
+    end
+
+    collection do
+      fee_payments = EffectiveMemberships.FeePayment.deep.all
+
+      raise('expected an owner_id, not user_id') if attributes[:user_id].present?
+
+      if fee_payments == :in_progress && attributes[:owner_id].blank?
+        fee_payments = fee_payments.where.not(status: :draft)
+      end
+
+      if attributes[:owner_id].present?
+        fee_payments = fee_payments.where(owner_id: attributes[:owner_id])
+      end
+
+      if attributes[:except_id].present?
+        fee_payments = fee_payments.where.not(id: attributes[:except_id])
+      end
+
+      fee_payments
+    end
+
+  end
+end

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

@@ -0,0 +1,24 @@
+# Dashboard Fee Payments
+class EffectiveFeePaymentsDatatable < Effective::Datatable
+  datatable do
+    order :created_at
+
+    col :token, visible: false
+    col :created_at, visible: false
+
+    col :owner
+    col :status, visible: false
+    col :submitted_at, label: 'Submitted', as: :date
+    col :period, visible: false
+
+    col :orders, action: :show
+
+    actions_col(new: false)
+  end
+
+  collection do
+    EffectiveMemberships.FeePayment.deep.done
+      .where(owner: current_user.effective_memberships_owners)
+  end
+
+end

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -50,10 +50,16 @@ module EffectiveMembershipsFeePayment
     attr_accessor :declare_code_of_ethics
     attr_accessor :declare_truth
 
+    # Throwaway
+    attr_accessor :upgrade, :downgrade
+
     # Application Namespace
     belongs_to :owner, polymorphic: true
     accepts_nested_attributes_for :owner
 
+    belongs_to :user, polymorphic: true, optional: true
+    accepts_nested_attributes_for :user
+
     # Like maybe optionally it makes sense.
     belongs_to :category, polymorphic: true, optional: true
 
@@ -153,6 +159,41 @@ module EffectiveMembershipsFeePayment
     owner&.outstanding_fee_payment_fees
   end
 
+  def select!
+    reset!
+  end
+
+  def reset!
+    assign_attributes(wizard_steps: wizard_steps.slice(:start))
+    save!
+  end
+
+  # Work with effective_organizations
+  def organization!
+    if upgrade_individual_to_organization?
+      save!
+      update!(owner: owner.representatives.first.organization)
+    elsif downgrade_organization_to_individual?
+      save!
+      update!(owner: current_user)
+    else
+      save!
+    end
+  end
+
+  def upgrade_individual_to_organization?
+    return false unless EffectiveResources.truthy?(upgrade)
+    return false unless owner.class.respond_to?(:effective_organizations_user?)
+    owner.representatives.any?(&:new_record?)
+  end
+
+  def downgrade_organization_to_individual?
+    return false unless EffectiveResources.truthy?(downgrade)
+    return false unless owner.class.respond_to?(:effective_organizations_organization?)
+    return false if current_user.blank?
+    owner.representatives.any?(&:marked_for_destruction?)
+  end
+
   # All Fees and Orders
   def submit_fees
     fees
@@ -203,7 +244,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

@@ -22,8 +22,8 @@ module EffectiveMembershipsOwner
 
   included do
     # App scoped
-    has_many :applicants, as: :owner
-    has_many :fee_payments, as: :owner
+    has_many :applicants, -> { order(:id) }, inverse_of: :owner, as: :owner
+    has_many :fee_payments, -> { order(:id) }, inverse_of: :owner, as: :owner
 
     # Effective scoped
     has_many :fees, -> { order(:id) }, inverse_of: :owner, as: :owner, class_name: 'Effective::Fee', dependent: :nullify
@@ -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

data/app/models/effective/membership_history.rb

@@ -27,8 +27,8 @@ module Effective
 
     validates :owner, presence: true
 
-    validates :categories, presence: true, unless: -> { removed? }
-    validates :category_ids, presence: true, unless: -> { removed? }
+    # validates :categories, presence: true, unless: -> { removed? }
+    # validates :category_ids, presence: true, unless: -> { removed? }
 
     validates :start_on, presence: true
 

data/app/views/admin/fee_payments/_fee_payment.html.haml

@@ -0,0 +1 @@
+= render 'effective/fee_payments/fee_payment', fee_payment: fee_payment

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

@@ -0,0 +1,8 @@
+- datatable = EffectiveResources.best('EffectiveFeePaymentsDatatable').new(self, namespace: :effective)
+
+%h2 Fee Payments
+
+- if datatable.present?
+  = render_simple_datatable(datatable)
+- else
+  %p You have no past fee payments. When you do, we'll show them here.

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

@@ -3,4 +3,4 @@
   - steps = fee_payment.required_steps - blacklist
 
   - steps.select { |step| fee_payment.has_completed_step?(step) }.each do |partial|
-    = render "effective/fee_payments/#{partial}", fee_payment: fee_payment, step: partial
+    = render "effective/fee_payments/#{partial}", fee_payment: fee_payment, resource: fee_payment, step: partial

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/config/routes.rb

@@ -26,6 +26,7 @@ EffectiveMemberships::Engine.routes.draw do
     resources :applicant_course_areas, except: [:show]
     resources :applicant_course_names, except: [:show]
 
+    resources :fee_payments, only: [:index, :show]
     resources :registrar_actions, only: [:create]
   end
 

data/db/migrate/01_create_effective_memberships.rb.erb

@@ -353,6 +353,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.integer :owner_id
       t.string :owner_type
 
+      t.integer :user_id
+      t.string :user_type
+
       t.integer :category_id
       t.string :category_type
 

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.1.2'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -214,6 +214,7 @@ files:
 - app/controllers/admin/applicant_course_names_controller.rb
 - app/controllers/admin/applicants_controller.rb
 - app/controllers/admin/categories_controller.rb
+- app/controllers/admin/fee_payments_controller.rb
 - app/controllers/admin/fees_controller.rb
 - app/controllers/admin/registrar_actions_controller.rb
 - app/controllers/effective/applicant_references_controller.rb
@@ -223,6 +224,7 @@ files:
 - app/datatables/admin/effective_applicant_course_names_datatable.rb
 - app/datatables/admin/effective_applicants_datatable.rb
 - app/datatables/admin/effective_categories_datatable.rb
+- app/datatables/admin/effective_fee_payments_datatable.rb
 - app/datatables/admin/effective_fees_datatable.rb
 - app/datatables/admin/effective_membership_histories_datatable.rb
 - app/datatables/effective_applicant_courses_datatable.rb
@@ -230,6 +232,7 @@ files:
 - app/datatables/effective_applicant_experiences_datatable.rb
 - app/datatables/effective_applicant_references_datatable.rb
 - app/datatables/effective_applicants_datatable.rb
+- app/datatables/effective_fee_payments_datatable.rb
 - app/helpers/effective_memberships_helper.rb
 - app/mailers/effective/memberships_mailer.rb
 - app/models/concerns/effective_memberships_applicant.rb
@@ -274,6 +277,7 @@ files:
 - app/views/admin/categories/_form_fee_payment_content.html.haml
 - app/views/admin/categories/_form_fee_payment_steps.html.haml
 - app/views/admin/categories/_form_renewals.html.haml
+- app/views/admin/fee_payments/_fee_payment.html.haml
 - app/views/admin/fees/_fee.html.haml
 - app/views/admin/fees/_form.html.haml
 - app/views/admin/memberships/_status.html.haml
@@ -318,6 +322,7 @@ files:
 - app/views/effective/applicants/submitted.html.haml
 - app/views/effective/applicants/summary.html.haml
 - app/views/effective/fee_payments/_content.html.haml
+- app/views/effective/fee_payments/_dashboard.html.haml
 - app/views/effective/fee_payments/_declarations.html.haml
 - app/views/effective/fee_payments/_demographics.html.haml
 - app/views/effective/fee_payments/_demographics_fields.html.haml