effective_memberships 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3972d4221b4931ed7f157f87ef8a7d9c9a1ad785679599a13c3d38e37fd48e56
-  data.tar.gz: 4a19e5c29db9c7ee41fd67177cda71197adb743f1f4eaaf97116192af82c562b
+  metadata.gz: a205c16844097a8874a4f40bda0465c96bd75cbda0ca7505cd74222180891323
+  data.tar.gz: f0edcff046181395c697a0c1ce386188dd28d419c7f3c5b9c466f6f9c51b972c
 SHA512:
-  metadata.gz: 9b5b013d0f0c7eddfbef6ed4b75c93169bfd4a48eebb07af26bb768d39f57285efb725266b26f6a75f05b14657ddb1ba9490594568b0deb65126caef3b873f99
-  data.tar.gz: cd37dded19f0ef05190120efe7749a6c0c3e71c5c53b53690c5d5e7e234a8b2b00e12db26480ee3e9f49617c505ca52499254d37b4ebd03c7e0918866e7af6d4
+  metadata.gz: d2abc588db28def44fbebc89138443c1de6e4cfba9654b2e0b93d2d399eca177b3ce0da51a0a62ac50dea6585518459609bc3a7749061719f9ea5f2c3572dfd2
+  data.tar.gz: 37e0ca136d376fba18e6d84eba56289a81c17c7da9268aaab10c415b78aecc5f83c256dd1a9eb43a4d4c362491b8deaf0223a711fcdf957007ccca463728c1d0

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/fees/_dashboard.html.haml

@@ -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 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.1'
 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.1
 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