effective_memberships 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 541315ace60a5bc7727f069d36afa0a6c0c520b2be2744f7f9485d1e4a327b02
-  data.tar.gz: 8f3fadb661ec2591b61df8ccb66e4df0291c16a07d3ab347a8fea44d329a87be
+  metadata.gz: be186a54404ee8564606cdbeb991f89eac977c24da038bcdd7e8d066a07135d5
+  data.tar.gz: b45bbf9c7f8c581c7497455fc9a6d50254f08526c9bb1372bb2c6bea46c99fb3
 SHA512:
-  metadata.gz: a0d8040eca6bbe1e88eccd5a457ac735d61d151b891b6a94b21c3e4d3a2abfc29bc82af41fdd64e23435bbe5d4a12bbbf169d6d223855cd5c6eefd55e295ba18
-  data.tar.gz: a429ccfe8d26cbaa94dbd0170fd4a442e04f140c138caf1edb5300b33f9367a96422eb68c5fcf17e66d0ca6ded772355e6acc136fc91c8ef674a01a99a4d5455
+  metadata.gz: 1b5abcc5857d2c2b445e7d89d98452f60b9654458242bfdb0f3a2a63e27997e41c586ab0ea526a260f345e1145a920b16e2e0527d154546afc129c02b3e8d136
+  data.tar.gz: 9efdc2ec2ef92d21aac19b70eaca29d1a3d0221f6d0fc593ed3982885984da2c409f519b98d9d2b60ae01ee00fc43e7c01d074efadb0b5234698b8bab7fde59c

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/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_fee_payments_datatable.rb

@@ -0,0 +1,29 @@
+# Dashboard Fee Payments
+class EffectiveFeePaymentsDatatable < Effective::Datatable
+  datatable do
+    order :created_at
+
+    col :token, visible: false
+    col :created_at, visible: false
+
+    col :status
+    col :period, visible: false
+    col :submitted_at, label: 'Submitted', as: :date
+
+    col :orders
+
+    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
+  end
+
+  collection do
+    EffectiveMemberships.FeePayment.deep.where(owner: current_user.effective_memberships_owner)
+  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
+
     # 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
 

data/app/models/concerns/effective_memberships_owner.rb

@@ -22,17 +22,15 @@ 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
     accepts_nested_attributes_for :fees, reject_if: :all_blank, allow_destroy: true
 
     has_many :orders, -> { order(:id) }, inverse_of: :user, as: :user, class_name: 'Effective::Order', dependent: :nullify
-    # Do not accepts nested attributes
-
-    #accepts_nested_attributes_for :orders, reject_if: :all_blank, allow_destroy: true
+    accepts_nested_attributes_for :orders, reject_if: :all_blank, allow_destroy: true
 
     has_one :membership, inverse_of: :owner, as: :owner, class_name: 'Effective::Membership'
     accepts_nested_attributes_for :membership

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,10 @@
+- authorized = EffectiveResources.authorized?(self, :new, EffectiveMemberships.FeePayment)
+- datatable = EffectiveResources.best('EffectiveFeePaymentsDatatable').new(self)
+- in_progress = current_user.effective_memberships_owner.fee_payments.in_progress
+
+%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/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.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2021-12-20 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