effective_memberships 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 070c1ddf76bc05b1659fe52e3dba9e940d2d1f22e61a106453e7f0ee319e58e1
-  data.tar.gz: 57e590916bacc7c0fc34482c7850ac2b2b9c30b8b9181ad65d553ff530bb78eb
+  metadata.gz: 7ba47cb79fdfe1d53bfa440e0c6ecd4b454f7da034a9035d25e0306e0b57a1d9
+  data.tar.gz: 7b342075e2d9aa6e51d7cecd34011e491f1c95ae7123606d26a23b128915e34d
 SHA512:
-  metadata.gz: 9c11227b561d087bf85a849200f930d3fa5cac68c8aa8f20aad25a84365548769e23ceec50c3a0cf583d8cf1b9542ce9cfa5fbc1cdc00726e0f941030f8d35a7
-  data.tar.gz: 794d3a8e16605ed198cf501f9810107c6ddb20efee9ef94996a9978312e2af5cc371699f18f13e3be32a114b78b926c8e7519e8cd315c85bdf784350e3e98576
+  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
@@ -763,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?
@@ -778,12 +792,13 @@ 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, from: from_status)
     else

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/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.6.9'
+  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.9
+  version: 0.6.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails