effective_memberships 0.9.3 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f57ff3c095107ed08c1fb5d61bdb0a942199a18401a35f5a4eb58628ada269e3
-  data.tar.gz: c73dd52a349cc82ef354d022fe896d4b6ede70e8e0f049f4b37027e4042a9c71
+  metadata.gz: bea643081128f664a7c004dbc49a3e8e06f940781267f85f63c7c6d4e69fe6d1
+  data.tar.gz: a769c9c7216ccdc090fc8a3e6107d654e49eeca2b20a171c48769b46d27a0cb0
 SHA512:
-  metadata.gz: 976725ff16f1b3cf32613f0a5ac941e28fdb26ba417dd70e1d4f11518ac76417de00a769839c65d849ea746f8bbddf5ff95e381ede4c5b03a978f4af0eb28033
-  data.tar.gz: de46c665dbe1985743eeddafd51e9b56b67bd06bd301140111c238953e903f0abf69ee50e52a4cd409be9d28a77e5adb923096930b481fd301be119fc1d41185
+  metadata.gz: 4553d6b65132b346f36882658baac0ae47ec8945f2f592c19fac705b2e5414d1f4597e5473d2209cdb6a6c0528768a4aa65fe75b59b9712f14ffccdc6c5203ca
+  data.tar.gz: f6c02642c63397a2484fb0d9cd4b3fd471767b9c1b8449528e720ac2f73946a86520094ba39bd0b7056df0544e230a0f1a3bd60ddeb64ba689431664d9c3938b

data/app/datatables/admin/effective_fees_datatable.rb

@@ -21,6 +21,13 @@ module Admin
 
       col :fee_type, search: EffectiveMemberships.fee_types
 
+      col :period, search: { collection: EffectiveMemberships.Registrar.periods_collection } do |fee|
+        EffectiveMemberships.Registrar.period_end_on(date: fee.period)
+      end
+
+      col :category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
+      col :title
+
       col :price, as: :price
       col :qb_item_name, label: 'Quickbooks Item Name'
       col :tax_exempt, visible: false
@@ -31,9 +38,8 @@ module Admin
         col :parent, search: :string, visible: false
       end
 
-      col :purchased_order, visible: false
+      col :purchased_order
 
-      col :category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
       col :checkout_type, search: Effective::Fee::CHECKOUT_TYPES, visible: false
 
       unless attributes[:total] == false

data/app/datatables/effective_applicant_reviews_datatable.rb

@@ -6,15 +6,21 @@ class EffectiveApplicantReviewsDatatable < Effective::Datatable
     col :created_at, visible: false
     col :id, visible: false
 
-    col :applicant
+    val :applicant, search: :string
     col :reviewer, visible: false
 
     col :submitted_at, label: 'Reviewed', as: :date
+
+    col :reviews do |applicant_review|
+      pluralize(applicant_review.applicant.applicant_reviews.count { |review| review.submitted? }, 'review')
+    end
+
     col :recommendation
     col :comments
 
     actions_col(show: false) do |applicant_review|
       dropdown_link_to('Show', effective_memberships.applicant_applicant_review_path(applicant_review.applicant, applicant_review))
+      dropdown_link_to('Review Again', effective_memberships.new_applicant_applicant_review_path(applicant_review.applicant))
     end
   end
 

data/app/datatables/effective_available_applicant_reviews_datatable.rb

@@ -7,15 +7,18 @@ class EffectiveAvailableApplicantReviewsDatatable < Effective::Datatable
 
     col :created_at, label: 'Created', as: :date, visible: false
     col :updated_at, label: 'Updated', as: :date, visible: false
-    col :submitted_at, label: 'Submitted', as: :date, visible: false
 
     # This is when they become available for review
-    col :completed_at, label: 'Date', as: :date
+    col :submitted_at, label: 'Submitted', as: :date
 
     col :user
     col :category, label: 'Category'
     col :to_status, label: 'Status'
 
+    col :reviews do |applicant|
+      pluralize(applicant.applicant_reviews.count { |review| review.submitted? }, 'review')
+    end
+
     actions_col(show: false) do |applicant|
       applicant_review = applicant.applicant_review(reviewer: current_user)
 

data/app/models/concerns/effective_memberships_applicant.rb

@@ -187,7 +187,7 @@ module EffectiveMembershipsApplicant
 
     scope :not_draft, -> { where.not(status: :draft) }
 
-    scope :reviewable, -> { where(status: :completed) }
+    scope :reviewable, -> { where.not(status: [:draft, :declined, :approved]) }
 
     scope :for, -> (user) {
       raise('expected a effective memberships user') unless user.class.try(:effective_memberships_user?)
@@ -623,6 +623,7 @@ module EffectiveMembershipsApplicant
     category_ids = user.membership.category_ids
 
     categories.select do |cat|
+      cat.can_apply_new? ||
       cat.can_apply_existing? ||
       (cat.can_apply_restricted? && (category_ids & cat.can_apply_restricted_ids).present?)
     end

data/app/models/concerns/effective_memberships_applicant_review.rb

@@ -59,7 +59,7 @@ module EffectiveMembershipsApplicantReview
       timestamps
     end
 
-    scope :deep, -> { includes(:reviewer, applicant: :user) }
+    scope :deep, -> { includes(:reviewer, applicant: [:user, :applicant_reviews]) }
 
     scope :for, -> (user) {
       raise('expected a effective memberships user') unless user.class.try(:effective_memberships_user?)

data/app/models/concerns/effective_memberships_registrar.rb

@@ -375,6 +375,11 @@ module EffectiveMembershipsRegistrar
     retval
   end
 
+  def periods_collection(from: nil, to: nil)
+    from ||= Time.zone.now - 10.years
+    periods(from: from, to: to).reverse.map { |period| [period_end_on(date: period), period] }
+  end
+
   # This is intended to be run once per day in a rake task
   # rake effective_memberships:create_fees
   # Create Renewal and Late fees

data/app/models/effective/fee.rb

@@ -44,9 +44,13 @@ module Effective
       self.with_status ||= owner.membership.statuses.first if owner.membership.statuses.length == 1
     end
 
+    before_validation(if: -> { changes['title'].blank? && (changes.keys & ['period', 'category_id', 'fee_type']).present? }) do
+      self.title = default_title()
+    end
+
     before_validation do
       self.period ||= EffectiveMemberships.Registrar.current_period
-      self.title ||= default_title()
+      self.title = default_title() if self.title.blank?
     end
 
     before_validation(if: -> { fee_type == 'Renewal' && category.present? && period.present? }) do

data/app/views/admin/fees/_form.html.haml

@@ -6,45 +6,38 @@
     - collection = { 'Users' => current_user.class.sorted, 'Organizations' => EffectiveMemberships.Organization.sorted }
     = f.select :owner, collection, polymorphic: true
 
+  - registrar = EffectiveMemberships.Registrar
   - fee_types = EffectiveMemberships.fee_types
   - membership_period_fee_types = fee_types.select { |fee_type| Effective::Fee.new(fee_type: fee_type).membership_period_fee? }
 
-  - if f.object.new_record?
-    = f.select :fee_type, fee_types
-  - else
-    = f.static_field :fee_type
-
-  = f.show_if_any(:fee_type, membership_period_fee_types) do
-    = card do
-      %p This is a membership period fee. It will advance the membership fees paid through period when purchased.
-      %p Only one membership period fee -- Prorated or Renewal -- is expected to exist per membership period.
-
-      - registrar = EffectiveMemberships.Registrar
-      - periods = registrar.periods(from: Time.zone.now - 10.years)
-      - collection = periods.reverse.map { |period| [registrar.period_end_on(date: period), period] }
+  - f.object.period ||= registrar.current_period
+  - f.object.checkout_type ||= 'Default'
 
-      - f.object.period ||= registrar.current_period
-      = f.select :period, collection, label: 'Membership period', hint: 'When purchased, set the membership fees paid through period to this period'
+  - f.object.category_id ||= f.object.owner&.membership&.categories&.first&.id
+  - f.object.category ||= f.object.owner&.membership&.categories&.first
 
-      - # Renewal Fees Only
-      - if f.object.persisted? && f.object.renewal_fee?
-        - if f.object.category.create_late_fees?
-          = f.date_field :late_on, hint: 'A late fee will be applied on this date unless purchased'
+  = f.select :period, registrar.periods_collection, label: 'Membership period'
+  = f.select :fee_type, fee_types
+  = f.select :category_id, EffectiveMemberships.Category.all
 
-        - if f.object.category.create_not_in_good_standing?
-          = f.date_field :not_in_good_standing_on, hint: 'The membership will be marked NIGS on this date unless purchased'
+  = f.show_if_any(:fee_type, membership_period_fee_types) do
+    %p.text-muted
+      This is a membership period fee. It will advance the membership fees paid through period when purchased.
+      %br
+      Only one membership period fee -- Prorated or Renewal -- is expected to exist per membership period.
 
-  - f.object.category_id = f.object.owner&.membership&.categories&.first&.id
-  = f.select :category_id, EffectiveMemberships.Category.all
+  - if f.object.category.present?
+    = f.show_if(:fee_type, 'Renewal') do
+      - if f.object.category.create_late_fees?
+        = f.date_field :late_on, hint: 'A late fee will be applied on this date unless purchased. Leave blank to assign the default.'
 
-  - if f.object.parent.blank?
-    - f.object.checkout_type ||= 'Default'
+      - if f.object.category.create_not_in_good_standing?
+        = f.date_field :not_in_good_standing_on, hint: 'The membership will be marked NIGS on this date unless purchased. Leave blank to assign the default.'
 
-    = f.radios :checkout_type, Effective::Fee::CHECKOUT_TYPES, inline: true, label: 'Checkout wizard',
-      hint: 'When default, Applicant and Reinstatement fees will be charged from the applicant wizard, and all other fee types from the fee payment wizard'
-  - else
-    = f.static_field :parent
+  = f.radios :checkout_type, Effective::Fee::CHECKOUT_TYPES, inline: true, label: 'Checkout wizard',
+    hint: 'When default, Applicant and Reinstatement fees will be charged from the applicant wizard, and all other fee types from the fee payment wizard'
 
+  = f.text_field :title, hint: 'Leave blank to assign the default', required: false
   = f.price_field :price
   = f.text_field :qb_item_name, label: 'Quickbooks Item Name'
   = f.check_box :tax_exempt, label: 'Yes, this fee is tax exempt'

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

@@ -26,11 +26,11 @@
 - if available.present?
   %p The following applicants are available for your review:
 
-  = render_simple_datatable(available)
+  = render_datatable(available, simple: true)
 - else
   %p There are no applicants available for your review. When there are, we'll show them here.
 
 - if datatable.present?
   .mt-4
     %h2 Review History
-    = render_datatable(datatable, simple: true)
+    = render_datatable(datatable)

data/app/views/effective/applicant_reviews/_other_reviews.html.haml

@@ -0,0 +1,7 @@
+- other_reviews = applicant_review.applicant.applicant_reviews.select { |review| review != applicant_review }
+
+- if other_reviews.present?
+  .mb-4
+    = collapse('Show other reviews') do
+      - other_reviews.each do |applicant_review|
+        = render('effective/applicant_reviews/applicant_review', applicant_review: applicant_review)

data/app/views/effective/applicant_reviews/recommendation.html.haml

@@ -8,6 +8,8 @@
     = collapse('Show application...', card_class: 'my-2') do
       = render 'effective/applicants/applicant', applicant: resource.applicant
 
+  = render 'effective/applicant_reviews/other_reviews', applicant_review: resource
+
   = card('Recommendation') do
 
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|

data/app/views/effective/applicant_reviews/review.html.haml

@@ -5,6 +5,8 @@
     = render 'effective/applicants/summary', applicant: resource.applicant
     = render 'effective/applicants/applicant', applicant: resource.applicant
 
+  = render 'effective/applicant_reviews/other_reviews', applicant_review: resource
+
   = card do
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id

data/app/views/effective/applicant_reviews/submitted.html.haml

@@ -10,6 +10,8 @@
     = collapse('Show application...', card_class: 'my-2') do
       = render 'effective/applicants/applicant', applicant: resource.applicant
 
+  = render 'effective/applicant_reviews/other_reviews', applicant_review: resource
+
   = render 'effective/applicant_reviews/applicant_review', applicant_review: resource
 
-  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary btn-block'
+  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'

data/app/views/effective/applicants/submitted.html.haml

@@ -39,4 +39,4 @@
     = collapse('Show orders...', card_class: 'my-2') do
       = render 'effective/applicants/orders', applicant: resource
 
-  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary btn-block'
+  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'

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

@@ -7,7 +7,7 @@
   .alert.alert-warning.mb-4
     Successfully paid on #{resource.submit_order.purchased_at.strftime('%F')}.
 
-  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
+  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'
 
   = card do
     = render 'effective/fee_payments/summary', fee_payment: resource
@@ -20,4 +20,4 @@
     = collapse('Show orders...', card_class: 'my-2') do
       = render 'effective/fee_payments/orders', fee_payment: resource
 
-  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary'
+  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'

data/config/routes.rb

@@ -52,7 +52,7 @@ EffectiveMemberships::Engine.routes.draw do
 
     resources :applicant_reviews, only: [:index, :show]
 
-    resources :fees
+    resources :fees, except: [:show]
     resources :categories, only: [:index, :edit, :update]
 
     resources :applicant_course_areas, except: [:show]

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.9.3'
+  VERSION = '0.9.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -407,6 +407,7 @@ files:
 - app/views/effective/applicant_reviews/_content.html.haml
 - app/views/effective/applicant_reviews/_dashboard.html.haml
 - app/views/effective/applicant_reviews/_layout.html.haml
+- app/views/effective/applicant_reviews/_other_reviews.html.haml
 - app/views/effective/applicant_reviews/_recommendation.html.haml
 - app/views/effective/applicant_reviews/_review.html.haml
 - app/views/effective/applicant_reviews/recommendation.html.haml