effective_memberships 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3972d4221b4931ed7f157f87ef8a7d9c9a1ad785679599a13c3d38e37fd48e56
-  data.tar.gz: 4a19e5c29db9c7ee41fd67177cda71197adb743f1f4eaaf97116192af82c562b
+  metadata.gz: 85036ca2aa1362333f21d1da76e3ce330607f39922e8a9200f33794e01d326db
+  data.tar.gz: a266929f23d85a651aa70b353b70041088f442a46c576a28458674bf1959b286
 SHA512:
-  metadata.gz: 9b5b013d0f0c7eddfbef6ed4b75c93169bfd4a48eebb07af26bb768d39f57285efb725266b26f6a75f05b14657ddb1ba9490594568b0deb65126caef3b873f99
-  data.tar.gz: cd37dded19f0ef05190120efe7749a6c0c3e71c5c53b53690c5d5e7e234a8b2b00e12db26480ee3e9f49617c505ca52499254d37b4ebd03c7e0918866e7af6d4
+  metadata.gz: b054a795fd94aadadb7d6986b1a4c9b2e7e375f7db63b94b3c3ce9e39ec7c6d1e035030db076777724e3d8a7bb47b33acbdd7dec3c81fbd2f01237d35bff2709
+  data.tar.gz: 38e7942eb0fcae97c12153442b390dc8d239c2ad26a8981287be8fb30d01808d263d6019445af11eb0a6e5f6676b8b0f167140b8ab0a13658d2e82327082d137

data/app/datatables/admin/effective_applicants_datatable.rb

@@ -8,7 +8,8 @@ module Admin
     end
 
     datatable do
-      order :id
+      order :updated_at
+
       col :id, visible: false
 
       col :status, search: effective_memberships_status_collection()
@@ -27,7 +28,7 @@ module Admin
       col :approved_at, label: 'Approved', visible: false, as: :date
 
       col :user
-      col :organization
+      col :organization, visible: false
 
       col :applicant_type
       col :category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }

data/app/datatables/effective_applicants_datatable.rb

@@ -8,7 +8,9 @@ class EffectiveApplicantsDatatable < Effective::Datatable
     col :category, label: 'Category'
     col :status, search: effective_memberships_status_collection()
 
-    col :created_at, label: 'Created', as: :date
+    col :orders
+
+    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
@@ -16,13 +18,11 @@ class EffectiveApplicantsDatatable < Effective::Datatable
     col :missing_info_at, label: 'Missing Info', as: :date, visible: false
 
     if EffectiveMemberships.applicant_reviews?
-      col :reviewed_at, label: 'Reviewed', as: :date
+      col :reviewed_at, label: 'Reviewed', as: :date, visible: false
     end
 
     col :approved_at, label: 'Approved', as: :date
 
-    col :orders
-
     actions_col(show: false) do |applicant|
       if applicant.draft?
         dropdown_link_to('Continue', effective_memberships.applicant_build_path(applicant, applicant.next_step), 'data-turbolinks' => false)

data/app/mailers/effective/memberships_mailer.rb

@@ -4,11 +4,21 @@ module Effective
     include EffectiveMailer
     include EffectiveEmailTemplatesMailer if EffectiveMemberships.use_effective_email_templates
 
+    def applicant_submitted(resource, opts = {})
+      @assigns = assigns_for(resource)
+      @applicant = resource
+
+      subject = subject_for(__method__, "Applicant Submitted - #{resource}", resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.user.email, subject: subject, **headers)
+    end
+
     def applicant_completed(resource, opts = {})
       @assigns = assigns_for(resource)
       @applicant = resource
 
-      subject = subject_for(__method__, 'Applicant Completed', resource, opts)
+      subject = subject_for(__method__, "Applicant Completed - #{resource}", resource, opts)
       headers = headers_for(resource, opts)
 
       mail(to: resource.user.email, subject: subject, **headers)
@@ -18,7 +28,7 @@ module Effective
       @assigns = assigns_for(resource)
       @applicant = resource
 
-      subject = subject_for(__method__, 'Applicant Missing Info', resource, opts)
+      subject = subject_for(__method__, "Applicant Missing Info - #{resource}", resource, opts)
       headers = headers_for(resource, opts)
 
       mail(to: resource.user.email, subject: subject, **headers)
@@ -28,7 +38,7 @@ module Effective
       @assigns = assigns_for(resource)
       @applicant = resource
 
-      subject = subject_for(__method__, 'Applicant Approved', resource, opts)
+      subject = subject_for(__method__, "Applicant Approved - #{resource}", resource, opts)
       headers = headers_for(resource, opts)
 
       mail(to: resource.user.email, subject: subject, **headers)
@@ -38,7 +48,7 @@ module Effective
       @assigns = assigns_for(resource)
       @applicant = resource
 
-      subject = subject_for(__method__, 'Applicant Declined', resource, opts)
+      subject = subject_for(__method__, "Applicant Declined - #{resource}", resource, opts)
       headers = headers_for(resource, opts)
 
       mail(to: resource.user.email, subject: subject, **headers)
@@ -69,7 +79,7 @@ module Effective
       @applicant_review = resource
       @applicant = resource.applicant
 
-      subject = subject_for(__method__, "Applicant Review for #{resource.applicant} submitted", resource, opts)
+      subject = subject_for(__method__, "Applicant Review Submitted - #{resource.applicant}", resource, opts)
       headers = headers_for(resource, opts)
 
       mail(to: mailer_admin, subject: subject, **headers)

data/app/models/concerns/effective_memberships_applicant.rb

@@ -490,6 +490,8 @@ module EffectiveMembershipsApplicant
       stamps.each { |stamp| stamp.submit! }
 
       after_commit do
+        send_email(:applicant_submitted)
+
         applicant_endorsements.each { |endorsement| endorsement.notify! if endorsement.submitted? }
         applicant_references.each { |reference| reference.notify! if reference.submitted? }
       end
@@ -571,7 +573,7 @@ module EffectiveMembershipsApplicant
     when 'reviewed'
       "This application has been reviewed and is now ready for an admin to approve or decline it. If approved, prorated fees will be generated."
     when 'approved'
-      "The application has been approved! All done!"
+      "The application has been approved. All done."
     when 'declined'
       "This application has been declined."
     else

data/app/models/concerns/effective_memberships_owner.rb

@@ -43,6 +43,11 @@ module EffectiveMembershipsOwner
       without_role(:member).where(id: removed.select(:owner_id))
     }
 
+    scope :membership_good_standing, -> {
+      bad_standing = Effective::Membership.where(bad_standing: false).where(owner_type: name)
+      where(id: bad_standing.select(:owner_id))
+    }
+
     scope :membership_bad_standing, -> {
       bad_standing = Effective::Membership.where(bad_standing: true).where(owner_type: name)
       where(id: bad_standing.select(:owner_id))
@@ -71,6 +76,20 @@ module EffectiveMembershipsOwner
       where(id: memberships.where(owner_type: name).select(:owner_id))
     }
 
+    scope :membership_joined_before, -> (date) {
+      raise('expected a date') unless date.respond_to?(:strftime)
+
+      joined_before = Effective::Membership.joined_before(date).where(owner_type: name)
+      where(id: joined_before.select(:owner_id))
+    }
+
+    scope :membership_joined_after, -> (date) {
+      raise('expected a date') unless date.respond_to?(:strftime)
+
+      joined_after = Effective::Membership.joined_after(date).where(owner_type: name)
+      where(id: joined_after.select(:owner_id))
+    }
+
   end
 
   def assign_member_role

data/app/models/effective/membership.rb

@@ -36,6 +36,9 @@ module Effective
 
     scope :good_standing, -> { where(bad_standing: [nil, false]) }
 
+    scope :joined_before, -> (date) { where(arel_table[:joined_on].lt(date)) }
+    scope :joined_after, -> (date) { where(arel_table[:joined_on].gteq(date)) }
+
     scope :with_paid_fees_through, -> (period = nil) {
       where(arel_table[:fees_paid_period].gteq(period || EffectiveMemberships.Registrar.current_period))
     }

data/app/views/effective/applicant_endorsements/complete.html.haml

@@ -1,2 +1,2 @@
 = card do
-  %p Thank you! The confidential endorsement has been completed.
+  %p Thank you. The confidential endorsement has been completed.

data/app/views/effective/applicant_references/complete.html.haml

@@ -1,2 +1,2 @@
 = card do
-  %p Thank you! The confidential reference has been completed.
+  %p Thank you. The confidential reference has been completed.

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

@@ -2,7 +2,7 @@
   = render 'effective/applicant_reviews/content', resource: resource
 
   = card do
-    %p Welcome #{current_user}!
+    %p Welcome #{current_user}
 
     %p You are starting an applicant review for #{resource.applicant}.
 

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

@@ -31,7 +31,7 @@
             - if membership.reregistered?
               and last changed on #{membership.registration_on.strftime('%F')}
 
-            = collapse('show more', card_class: '') do
+            = collapse('show membership history', card_class: '') do
               %p #{applicant.owner} membership history
               = render_datatable(Admin::EffectiveMembershipHistoriesDatatable.new(owner: applicant.owner, actions: false), simple: true)
 

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

@@ -1,4 +1,4 @@
-%h2 Fees
+%h2 Fees and Dues
 
 - memberships = current_user.memberships
 - outstanding_owners = current_user.memberships_owners.select { |owner| owner.outstanding_fee_payment_fees.present? }
@@ -6,7 +6,7 @@
 - if memberships.present?
   - if memberships.any? { |membership| membership.category.create_renewal_fees? }
     - date = EffectiveMemberships.Registrar.renewal_fee_date(date: Time.zone.now)
-    %p Annual fees become available for purchase on #{date.strftime('%B %e')} of each year.
+    %p Annual dues become available for purchase on #{date.strftime('%B %e')} of each year.
 
   - if memberships.any? { |membership| membership.category.create_late_fees? }
     - date = EffectiveMemberships.Registrar.late_fee_date(date: Time.zone.now)
@@ -14,10 +14,10 @@
 
   - if memberships.any? { |membership| membership.category.create_bad_standing? }
     - date = EffectiveMemberships.Registrar.bad_standing_date(date: Time.zone.now)
-    %p Memberships with unpaid fees will be marked in bad standing on #{date.strftime('%B %e')}.
+    %p Memberships with unpaid fees or dues will be marked in bad standing on #{date.strftime('%B %e')}.
 
 - if outstanding_owners.present?
-  .alert.alert-warning.mb-3 You have outstanding fees ready to purchase.
+  .alert.alert-warning.mb-3 You have outstanding fees or dues ready to purchase.
 
   %ul
     - outstanding_owners.each do |owner|
@@ -31,4 +31,4 @@
   %p= link_to 'Pay Fees', effective_memberships.new_fee_payment_path, class: 'btn btn-primary'
 
 - else
-  %p You have no outstanding fees at this time. Thank you!
+  %p You have no outstanding fees or dues at this time. Thank you.

data/app/views/effective/memberships_mailer/applicant_approved.liquid

@@ -1,10 +1,10 @@
 ---
-subject: 'Your application was approved!'
+subject: 'Your application was approved'
 from: 'admin@example.com'
 ---
 Hello {{ user.name }},
 
-Your application for {{ applicant.to_category }} was approved!
+Your application for {{ applicant.to_category }} was approved.
 
 Please log in and purchase any outstanding fees.
 

data/app/views/effective/memberships_mailer/applicant_completed.liquid

@@ -1,5 +1,5 @@
 ---
-subject: 'Your application was marked as completed!'
+subject: 'Your application was marked as completed'
 from: 'admin@example.com'
 ---
 Hello {{ user.name }},

data/app/views/effective/memberships_mailer/applicant_review_submitted.liquid

@@ -16,4 +16,4 @@ For more details please visit
 
 Thanks,
 
-Have a great day!
+Have a great day

data/app/views/effective/memberships_mailer/applicant_submitted.liquid

@@ -0,0 +1,15 @@
+---
+subject: 'Your application was successfully submitted'
+from: 'admin@example.com'
+---
+Hello {{ user.name }},
+
+We have received your application for {{ applicant.to_category }} #{{ applicant.to_status }}
+
+For more details please visit
+
+{{ applicant.url }}
+
+Thank you.
+
+Please contact us for assistance.

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.7.0'
+  VERSION = '0.7.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Code and Effect
@@ -487,6 +487,7 @@ files:
 - app/views/effective/memberships_mailer/applicant_missing_info.liquid
 - app/views/effective/memberships_mailer/applicant_reference_notification.liquid
 - app/views/effective/memberships_mailer/applicant_review_submitted.liquid
+- app/views/effective/memberships_mailer/applicant_submitted.liquid
 - app/views/effective/organizations/_dashboard.html.haml
 - app/views/effective/organizations/_form.html.haml
 - app/views/effective/organizations/_form_organization.html.haml