effective_memberships 0.12.3 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7b99c254dcb327566bd4de3e1893a6b94874e055f92b03f79a6f5ee156e48c6
-  data.tar.gz: 732a011869b5756269d5869b2465aec166b1cdaa8cafeb6f359114d8b544d382
+  metadata.gz: d060a4560ac81c9ca5ff85d01017de52a187f9c488999cc8d070e487ce06e919
+  data.tar.gz: 61ff798a1d3dcb6bb1bc6b524fb1572d009f36faa4ef75dbe8df99c47d607fab
 SHA512:
-  metadata.gz: 0f1ebd7606208e5603b2039368623427b87ca92888f635f7593efb1b822d40e2821c6a4894df4d935a4cdc5ac9269ce80269e17fc99e772dd00bf1123ef04648
-  data.tar.gz: 299039b2e0ec8fce83317e9033e62cb6cc6688156ee78fbd6b296c15ccfb0e6ea75a36de48a32d782b539eb06188fb5d2929e547de44bc827deb026839fde6c8
+  metadata.gz: e5d47c15f035b8fc63ed6ddcb99d18b3247093a01843b931c16f32822c278a637d3251c73091171c55e6f4bf43e11b0b012549f51b3ed4be9a6fb8fa6a37c851
+  data.tar.gz: 3a8cec75a97f6acb2188189c259cca502e6ae34c436246dcd3c4ea4cf11448b0fd44dea340656f016afa6a4525aeee9e75f0535b6e75583faeb4dc389d5e25c2

data/app/models/concerns/effective_memberships_directory.rb

@@ -23,6 +23,9 @@ module EffectiveMembershipsDirectory
     attr_accessor :first_name
     attr_accessor :last_name
 
+    # Memberships
+    attr_accessor :number
+
     # Organizations
     attr_accessor :title
 
@@ -47,7 +50,7 @@ module EffectiveMembershipsDirectory
   # Search Users and Organizations for only these fields. Passed into search_any. Return nil for all.
   # Should this include email?
   def search_any_columns
-    [:title, :name, :first_name, :middle_name, :last_name]
+    [:title, :name, :first_name, :middle_name, :last_name, :number]
   end
 
   def per_page
@@ -116,6 +119,11 @@ module EffectiveMembershipsDirectory
       memberships = memberships.with_category(EffectiveMemberships.Category.where(id: category))
     end
 
+    # Filter by number
+    if number.present?
+      memberships = memberships.where('number ILIKE ?', "%#{number}%")
+    end
+
     # Return an ActiveRecord::Relation of Effective::Memberships
     memberships
   end

data/app/models/concerns/effective_memberships_owner.rb

@@ -208,6 +208,7 @@ module EffectiveMembershipsOwner
     fee.assign_attributes(
       fee_type: 'Discount',
       category: category,
+      from_category: from,
       period: period,
       price: price,
       tax_exempt: category.tax_exempt,

data/app/models/effective/fee.rb

@@ -13,6 +13,9 @@ module Effective
     # The membership category for this fee, if there's only 1 membership.categories
     belongs_to :category, polymorphic: true, optional: true
 
+    # Only set on the Discount fee right now
+    belongs_to :from_category, polymorphic: true, optional: true
+
     # The membership status for this fee, if there's only 1 membership.statuses
     belongs_to :with_status, polymorphic: true, optional: true
 
@@ -149,7 +152,7 @@ module Effective
       [
         period.strftime('%Y'),
         category,
-        EffectiveResources.et("effective_memberships.fees.#{fee_type.downcase}")
+        EffectiveResources.et("effective_memberships.fees.#{fee_type.parameterize.underscore}")
       ].join(' ')
     end
 

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

@@ -0,0 +1,17 @@
+%h3 Fees
+%p The following fees will be created:
+- month = Time.zone.now.strftime('%B')
+
+%ul
+  - if applicant.apply_to_join?
+    %li A #{month} prorated fee
+
+  - if applicant.reclassification?
+    - if applicant.owner.outstanding_renewal_fees.present?
+      %li A renewal fee in their new category
+    - else
+      %li A #{month} prorated fee to the new category
+      %li A #{month} discount fee from their old category
+
+  - if applicant.reinstatement?
+    %li A #{month} prorated fee to their reinstatement category

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

@@ -22,23 +22,7 @@
   - if applicant.reinstatement? && reinstatement.present?
     %p The member will be reinstated with their previous status: #{badges(reinstatement.membership_statuses) || 'None'}.
 
-  %h3 Fees
-  %p The following fees will be created:
-  - month = Time.zone.now.strftime('%B')
-
-  %ul
-    - if applicant.apply_to_join?
-      %li A #{month} prorated fee
-
-    - if applicant.reclassification?
-      - if applicant.owner.outstanding_renewal_fees.present?
-        %li A renewal fee in their new category
-      - else
-        %li A #{month} prorated fee to the new category
-        %li A #{month} discount fee from their old category
-
-    - if applicant.reinstatement?
-      %li A #{month} prorated fee to their reinstatement category
+  = render('admin/applicants/fees_approve', f: f, applicant: applicant)
 
   %p The following unpurchased fees will be deleted:
   - outstanding_fee_payment_fees = applicant.owner.outstanding_fee_payment_fees

data/app/views/effective/membership_directory/_form.html.haml

@@ -9,6 +9,7 @@
   /= f.search_field :title
 
   = f.select :category, membership_directory.categories
+  = f.search_field :number
 
   = f.save('Search', class: 'btn btn-primary btn-search mr-3', name: nil)
   = link_to 'Reset filters', request.path

data/app/views/effective/membership_directory/_membership.html.haml

@@ -2,6 +2,7 @@
   %h6= membership.owner
   %p= membership.categories.map(&:membership_directory_title).to_sentence
   %p= membership.statuses.map(&:membership_directory_title).to_sentence
+  %p= membership.number
 
   - if membership.owner.try(:email).present?
     %p= reveal_mail_to(membership.owner.email)

data/app/views/effective/membership_directory/show.html.haml

@@ -4,6 +4,7 @@
     %h6= @membership.owner
     %p= @membership.categories.map(&:membership_directory_title).to_sentence
     %p= @membership.statuses.map(&:membership_directory_title).to_sentence
+    %p= @membership.number
 
     - if @membership.owner.respond_to?(:rich_text_body)
       .mb-4= @membership.owner.rich_text_body.to_s

data/db/migrate/01_create_effective_memberships.rb.erb

@@ -457,6 +457,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.integer :category_id
       t.string :category_type
 
+      t.integer :from_category_id
+      t.string :from_category_type
+
       t.integer :with_status_id
       t.string :with_status_type
 

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.12.3'
+  VERSION = '0.13.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.13.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -354,6 +354,7 @@ files:
 - app/views/admin/applicant_endorsements/_applicant_endorsement.html.haml
 - app/views/admin/applicant_references/_applicant_reference.html.haml
 - app/views/admin/applicant_reviews/_applicant_review.html.haml
+- app/views/admin/applicants/_fees_approve.html.haml
 - app/views/admin/applicants/_form.html.haml
 - app/views/admin/applicants/_form_applicant.html.haml
 - app/views/admin/applicants/_form_approve.html.haml