effective_memberships 0.6.7 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 994cc88bc7e75f8660b8af1a9930175493759241323675edc72da9ab53640ab5
-  data.tar.gz: e29658115f728da1b3b33f5776fc24e461f6abe5ac9cb8d1362834153598a96e
+  metadata.gz: 7ba47cb79fdfe1d53bfa440e0c6ecd4b454f7da034a9035d25e0306e0b57a1d9
+  data.tar.gz: 7b342075e2d9aa6e51d7cecd34011e491f1c95ae7123606d26a23b128915e34d
 SHA512:
-  metadata.gz: 9b2a8938998de7838aef913e2e4f2262a0cde28fc04de5fb0d74816a1ff9ddc23db3000985aceca51b4578339553c9be2c39b0ca0df11c6bbecd7a620101e17f
-  data.tar.gz: 95f6268d44cc10e4dabe9c4208f5d42ae669533f31876643aa2b31749414dc5cbf68e8368c062c5997cc61261579e6bec5decfb446020c5497fe74cc02a29640
+  metadata.gz: 4033eb84334a81fe60aa6b67248f34feec629ca3a83bb6f0725ef2bb013dce6344b629eefd9f940f8a6f2b3a7dbdf35360b4027b925c5785d7e1ab7d359b0dcd
+  data.tar.gz: 59978379131bfb1a4e9988fdeda03e8e792ec37011c1c2a7338072c73c743dd1cd33999be0d1cbb41142e60ca43e1c15e8fe053b56a7ac9ffcc96e9e6ed6aa6d

data/app/mailers/effective/memberships_mailer.rb

@@ -68,7 +68,7 @@ module Effective
 
     def assigns_for(resource)
       if resource.class.respond_to?(:effective_memberships_applicant?)
-        return applicant_assigns(resource).merge(owner_assigns(resource.owner))
+        return applicant_assigns(resource).merge(owner_assigns(resource.owner)).merge(membership_assigns(resource.owner.membership))
       end
 
       if resource.kind_of?(Effective::ApplicantEndorsement)
@@ -87,6 +87,7 @@ module Effective
 
       values = {
         date: (applicant.submitted_at || Time.zone.now).strftime('%F'),
+        approved_at: (applicant.approved_at&.strftime('%F') || 'not approved'),
 
         to_category: applicant.category.to_s,
         from_category: applicant.from_category.to_s,
@@ -102,6 +103,19 @@ module Effective
       { applicant: values }
     end
 
+    def membership_assigns(membership)
+      return {} if membership.blank?
+      raise('expected a membership') unless membership.kind_of?(Effective::Membership)
+
+      values = {
+        number: (membership.number || 'no membership number'),
+        joined_on: (membership.joined_on&.strftime('%F') || 'unknown'),
+        registration_on: (membership.registration_on.strftime('%F') || 'unknown')
+      }
+
+      { membership: values }
+    end
+
     def endorsement_assigns(applicant_endorsement)
       raise('expected a endorsement') unless applicant_endorsement.kind_of?(Effective::ApplicantEndorsement)
 

data/app/models/concerns/effective_memberships_applicant.rb

@@ -87,6 +87,7 @@ module EffectiveMembershipsApplicant
     # Admin Approve Step
     attr_accessor :approved_membership_number
     attr_accessor :approved_membership_date
+    attr_accessor :approved_email_action
 
     # Application Namespace
     belongs_to :user, polymorphic: true
@@ -194,8 +195,14 @@ module EffectiveMembershipsApplicant
     # Set Apply to Join or Reclassification
     before_validation(if: -> { (new_record? || current_step == :select) && owner.present? }) do
       self.applicant_type ||= can_apply_applicant_types_collection().first
-      self.from_category = owner.membership&.category
-      self.from_status = owner.membership&.status if reinstatement?
+
+      if owner.membership.present?
+        self.from_category = owner.membership.categories.first
+      end
+
+      if owner.membership.present? && reinstatement?
+        self.from_status = owner.membership.statuses.find { |status| status.reinstatable? }
+      end
     end
 
     before_validation(if: -> { current_step == :experience }) do
@@ -757,6 +764,19 @@ module EffectiveMembershipsApplicant
     reviewed!
   end
 
+  def approve_email_templates
+    raise('expected EffectiveEmailTemplates') unless defined?(EffectiveEmailTemplates)
+    Effective::EmailTemplate.where('template_name ILIKE ?', 'applicant_approve%').order(:template_name)
+  end
+
+  def to_category
+    category
+  end
+
+  def to_status
+    nil
+  end
+
   # Admin approves an applicant. Registers the owner. Sends an email.
   def approve!
     raise('already approved') if was_approved?
@@ -772,14 +792,15 @@ module EffectiveMembershipsApplicant
     if apply_to_join?
       EffectiveMemberships.Registrar.register!(
         owner,
-        to: category,
+        to: to_category,
+        status: to_status,
         date: approved_membership_date.presence,       # Set by the Admin Process form, or nil
         number: approved_membership_number.presence    # Set by the Admin Process form, or nil
       )
     elsif reclassification?
-      EffectiveMemberships.Registrar.reclassify!(owner, to: category)
+      EffectiveMemberships.Registrar.reclassify!(owner, to: to_category, status: to_status)
     elsif reinstatement?
-      EffectiveMemberships.Registrar.reinstate!(owner)
+      EffectiveMemberships.Registrar.reinstate!(owner, from: from_status)
     else
       raise('unsupported approval applicant_type')
     end

data/app/models/concerns/effective_memberships_registrar.rb

@@ -186,17 +186,18 @@ module EffectiveMembershipsRegistrar
     save!(owner, date: date)
   end
 
-  def reinstate!(owner, date: nil, skip_fees: false)
+  def reinstate!(owner, from:, date: nil, skip_fees: false)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('owner must have an existing membership. use register! instead') if owner.membership.blank?
 
-    from = owner.membership.status
-    raise('expecting a from memberships status') if from.present? && !from.class.respond_to?(:effective_memberships_status?)
+    raise('expecting a from') if from.blank?
+    raise('expected a from status or category') unless from.class.respond_to?(:effective_memberships_status?) || from.class.respond_to?(:effective_memberships_category?)
 
     date ||= Time.zone.now
 
     membership = owner.membership
-    membership.membership_status(status: from).mark_for_destruction if from.present?
+    membership.membership_status(status: from).mark_for_destruction if from.class.respond_to?(:effective_memberships_status?)
+    membership.membership_category(category: from).mark_for_destruction if from.class.respond_to?(:effective_memberships_category?)
 
     unless skip_fees
       fee = owner.build_prorated_fee(date: date)

data/app/views/admin/applicants/_form_approve.html.haml

@@ -9,7 +9,11 @@
       The member will keep their existing membership number: #{applicant.owner.membership.number}.
     - else
       - number = EffectiveMemberships.Registrar.next_membership_number(applicant.owner, to: applicant.category)
-      = f.text_field :approved_membership_number, hint: "leave blank to assign the next number: #{number}."
+
+      - if number.present?
+        = f.text_field :approved_membership_number, hint: "leave blank to assign the next number: #{number || 'none'}."
+      - else
+        No membership number will be assigned.
 
   %h3 Fees
   %p The following fee(s) will be created:
@@ -24,7 +28,27 @@
       %li A #{month} discount fee from their old category
 
   %h3 Email to send
-  %p The following email will be sent:
-  = email_form_fields(f, :applicant_approved)
+  - email_templates = applicant.approve_email_templates
+
+  - f.object.approved_email_action ||= email_templates.first&.id
+  = f.hidden_field :approved_email_action
+
+  - if email_templates.length == 0
+    %p The following email will be sent:
+    = email_form_fields(f, :applicant_approve)
+
+  - if email_templates.length == 1
+    - template = email_templates.first
+    %p The following #{link_to(template, effective_email_templates.edit_admin_email_template_path(template), target: '_blank')} email will be sent:
+    = email_form_fields(f, template)
+
+  - if email_templates.length > 1
+    - collection = email_templates.map { |et| [et.to_s.titleize.sub('Applicant ', '') + " (#{et})", et.id] }
+    = f.select :approved_email_action, collection
+
+    - email_templates.each do |template|
+      = f.show_if(:approved_email_action, template.id) do
+        %p The following #{link_to(template, effective_email_templates.edit_admin_email_template_path(template), target: '_blank')} email will be sent:
+        = email_form_fields(f, template)
 
   = f.submit 'Approve Applicant', border: false, center: true, 'data-confirm': "Approve #{f.object.owner}?"

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

@@ -3,11 +3,7 @@
     = render 'admin/categories/form_category', category: category
 
     - if category.persisted?
-      = render 'admin/categories/form_applicant_eligibility', category: category
-
-      = render 'admin/categories/form_applicant_fees', category: category
-      = render 'admin/categories/form_renewals', category: category
-
+      = render 'admin/categories/form_fees', category: category
 
   - if category.persisted?
     = tab 'Content - Applicants' do
@@ -18,14 +14,9 @@
 
     = tab 'Wizards' do
       .row
-        .col
-          = render 'admin/categories/form_applicant_steps', category: category
-
-        .col
-          = render 'admin/categories/form_fee_payment_steps', category: category
+        .col= render 'admin/categories/form_applicant_steps', category: category
+        .col= render 'admin/categories/form_fee_payment_steps', category: category
 
     - if category.respond_to?(:log_changes_datatable)
       = tab 'Logs' do
         = render_inline_datatable(category.log_changes_datatable)
-
-

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

@@ -4,10 +4,11 @@
       = f.article_editor "rich_text_applicant_all_steps_content", label: false, hint: "displayed on all steps"
     - else
       = f.rich_text_area "rich_text_applicant_all_steps_content", label: false, hint: "displayed on all steps"
-  - enabled = f.object.applicant_wizard_steps
+
+  - enabled_steps = f.object.applicant_wizard_steps
 
   - EffectiveMemberships.Applicant::WIZARD_STEPS.each do |step, title|
-    - next unless enabled.include?(step)
+    - next unless enabled_steps.include?(step)
 
     = card("#{title}") do
       - if defined?(EffectiveArticleEditor)

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

@@ -1,6 +1,7 @@
 = effective_form_with(model: [:admin, category], engine: true) do |f|
   .row
-    .col= f.text_field :title, label: 'Category title'
+    .col
+      = f.text_field :title, label: 'Category title'
 
     .col
       = f.select :category_type, f.object.class.category_types,
@@ -14,4 +15,13 @@
   - else
     = f.rich_text_area :rich_text_body, label: 'Description shown in the Application to Join wizard'
 
-  = f.submit
+  %h3 Applicant Eligibility
+  = f.check_box :can_apply_new, label: 'Anyone may apply for this category'
+  = f.check_box :can_apply_existing, label: 'Any current member may apply to join'
+  = f.check_box :can_apply_restricted, label: 'Only some current members may apply to join'
+
+  = f.show_if(:can_apply_restricted, true) do
+    - categories = f.object.class.where.not(id: f.object)
+    = f.select :can_apply_restricted_ids, categories, label: 'Existing member categories'
+
+  = effective_submit(f)

data/app/views/admin/categories/{_form_renewals.html.haml → _form_fees.html.haml}

@@ -1,4 +1,28 @@
 = effective_form_with(model: [:admin, category], engine: true) do |f|
+  %h3 Applicant Fees
+  .row
+    .col= f.price_field :applicant_fee
+    .col= f.text_field :qb_item_name, label: "Quickbooks Item Name"
+
+  %h3 Pro-rated fees based on date of approval
+  .row
+    .col-lg-3
+      = f.price_field :prorated_jan, label: "January"
+      = f.price_field :prorated_feb, label: "February"
+      = f.price_field :prorated_mar, label: "March"
+    .col-lg-3
+      = f.price_field :prorated_apr, label: "April"
+      = f.price_field :prorated_may, label: "May"
+      = f.price_field :prorated_jun, label: "June"
+    .col-lg-3
+      = f.price_field :prorated_jul, label: "July"
+      = f.price_field :prorated_aug, label: "August"
+      = f.price_field :prorated_sep, label: "September"
+    .col-lg-3
+      = f.price_field :prorated_oct, label: "October"
+      = f.price_field :prorated_nov, label: "November"
+      = f.price_field :prorated_dec, label: "December"
+
   %h3 Renewal Fees
   = f.check_box :create_renewal_fees, label: 'Yes, annual renewal fees should be created'
 
@@ -6,7 +30,8 @@
     - date = EffectiveMemberships.Registrar.renewal_fee_date(date: Time.zone.now)
 
     %p Charged to members, every #{date.strftime('%B %e')}, to renew their dues.
-    = f.price_field :renewal_fee
+    .row
+      .col-3= f.price_field :renewal_fee
 
   %h3 Late Fees
   = f.check_box :create_late_fees, label: 'Yes, late fees should be created'
@@ -16,7 +41,8 @@
     - date = EffectiveMemberships.Registrar.late_fee_date(period: period)
 
     %p Charged to members, on #{date.strftime('%B %e')}, with outstanding renewal fees
-    = f.price_field :late_fee
+    .row
+      .col-3= f.price_field :late_fee
 
   %h3 Bad Standing
   = f.check_box :create_bad_standing, label: 'Yes, bad standing status should be applied'
@@ -27,4 +53,4 @@
 
     %p Members with outstanding fees, on #{date.strftime('%B %e')}, will automatically be marked in bad standing.
 
-  = effective_submit(f)
+  = f.submit

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

@@ -22,7 +22,11 @@
           - else
             None
 
-    - if applicant.from_category.present?
+    - if applicant.from_status.present?
+      %tr
+        %th From Status
+        %td= applicant.from_status
+    - elsif applicant.from_category.present?
       %tr
         %th From Category
         %td= applicant.from_category

data/app/views/effective/applicants/select/_apply_for_reinstatement.html.haml

@@ -1,3 +1,3 @@
 - membership = f.object.owner.membership
 
-%p Apply for reinstatement from #{membership.status || membership.category}.
+%p Apply for reinstatement from #{badges(f.object.from_status || f.object.from_category)}.

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.6.7'
+  VERSION = '0.6.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -353,13 +353,11 @@ files:
 - app/views/admin/applicants/_status.html.haml
 - app/views/admin/categories/_form.html.haml
 - app/views/admin/categories/_form_applicant_content.html.haml
-- app/views/admin/categories/_form_applicant_eligibility.html.haml
-- app/views/admin/categories/_form_applicant_fees.html.haml
 - app/views/admin/categories/_form_applicant_steps.html.haml
 - app/views/admin/categories/_form_category.html.haml
 - 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/categories/_form_fees.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

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

@@ -1,9 +0,0 @@
-= effective_form_with(model: [:admin, category], engine: true) do |f|
-  %h3 Applicant Eligibility
-  = f.check_box :can_apply_new, label: 'Anyone may apply for this category'
-  = f.check_box :can_apply_existing, label: 'Any current member may apply to join'
-  = f.check_box :can_apply_restricted, label: 'Only some current members may apply to join'
-
-  = f.show_if(:can_apply_restricted, true) do
-    - categories = f.object.class.where.not(id: f.object)
-    = f.select :can_apply_restricted_ids, categories, label: 'Existing member categories'

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

@@ -1,24 +0,0 @@
-= effective_form_with(model: [:admin, category], engine: true) do |f|
-  %h3 Applicant Fees
-  .row
-    .col= f.price_field :applicant_fee
-    .col= f.text_field :qb_item_name, label: "Quickbooks Item Name"
-
-  %h3 Pro-rated fees based on date of approval
-  .row
-    .col-lg-3
-      = f.price_field :prorated_jan, label: "January"
-      = f.price_field :prorated_feb, label: "February"
-      = f.price_field :prorated_mar, label: "March"
-    .col-lg-3
-      = f.price_field :prorated_apr, label: "April"
-      = f.price_field :prorated_may, label: "May"
-      = f.price_field :prorated_jun, label: "June"
-    .col-lg-3
-      = f.price_field :prorated_jul, label: "July"
-      = f.price_field :prorated_aug, label: "August"
-      = f.price_field :prorated_sep, label: "September"
-    .col-lg-3
-      = f.price_field :prorated_oct, label: "October"
-      = f.price_field :prorated_nov, label: "November"
-      = f.price_field :prorated_dec, label: "December"