effective_memberships 0.8.4 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f9d47f303cc8f5ebcf269093828d5369969b288673007f98fa7589bd92f3c78
-  data.tar.gz: 2b2c1d4f6b31e31cc3e45dfe05a6a6666935a542623b85c2a6072460f7969f96
+  metadata.gz: a1dfaa3991cff1f364a78cf6ebc761797942473f4f7c743cbc5269cddf1d3761
+  data.tar.gz: 636a525c3ceaa90e4de0ca185abfee8ac9002ddab428cd5c2e26391426e201dc
 SHA512:
-  metadata.gz: b7e4b227ffb1bf4798e8d87f7651a14c9d40ba0107c3a58501249380f66475e0ba883d46036958528b077d325722602c69bee535d2a7e90fd0e8714c31f94c07
-  data.tar.gz: 64007536a52a3ac533f5b69c122889b3fc804a908da5d7633e1a47bbae6c754cecdb36ea6568abfdefc174a55706134c0aa714c92910bf82154a901aea2730be
+  metadata.gz: 9b37e54dde35b655fa57a70b3e36a7c1d2751f6e6c6c191660a7ad749adfcd1f8fdaa383e8568102d93efe44de744b7e3169ee00e117546dad097c612a6ff9a1
+  data.tar.gz: 793da30a1927080c85d33efc01e8ec17da98325a9ffaadbc1cc531dfcaf956189531f99d8b3ba7770b601e031fd782a5b972f9590868bc98f641866189ba3d53

data/app/datatables/admin/effective_memberships_datatable.rb

@@ -22,7 +22,7 @@ module Admin
       col :number_as_integer, visible: false
 
       col :joined_on
-      col :registration_on
+      col :registration_on, label: 'Last changed'
 
       col :fees_paid_period, visible: false, label: 'Fees Paid'
       col :fees_paid_through_period, label: 'Fees Paid Through'

data/app/models/concerns/effective_memberships_applicant.rb

@@ -440,7 +440,16 @@ module EffectiveMembershipsApplicant
 
     def applicant_fee_price
       return category.applicant_reinstatement_fee if reinstatement?
-      category.applicant_fee
+      applicant_fee_category.applicant_fee
+    end
+
+    def applicant_fee_tax_exempt
+      applicant_fee_category.applicant_fee_tax_exempt
+    end
+
+    def applicant_fee_qb_item_name(fee = nil)
+      raise('expected an Effective::Fee') if fee && !fee.kind_of?(Effective::Fee)
+      applicant_fee_category.applicant_fee_qb_item_name
     end
 
     # All Fees and Orders
@@ -459,8 +468,8 @@ module EffectiveMembershipsApplicant
           fee_type: applicant_fee_type,
           category: applicant_fee_category,
           price: applicant_fee_price,
-          tax_exempt: applicant_fee_category.applicant_fee_tax_exempt,
-          qb_item_name: applicant_fee_category.applicant_fee_qb_item_name
+          tax_exempt: applicant_fee_tax_exempt,
+          qb_item_name: applicant_fee_qb_item_name
         )
       end
 

data/app/models/concerns/effective_memberships_category.rb

@@ -157,6 +157,10 @@ module EffectiveMembershipsCategory
     title.presence || 'New Membership Category'
   end
 
+  def membership_directory_title
+    to_s
+  end
+
   def can_apply?
     can_apply_new? || can_apply_existing? || can_apply_restricted?
   end

data/app/models/concerns/effective_memberships_owner.rb

@@ -129,6 +129,10 @@ module EffectiveMembershipsOwner
     EffectiveMemberships.Status.sorted.all.where.not(id: EffectiveMemberships.Registrar.not_in_good_standing_status)
   end
 
+  def after_build_fee(fee)
+    # Nothing to do. Hook to adjust fee.
+  end
+
   # Instance Methods
   def build_prorated_fee(date: nil)
     raise('must have an existing membership') unless membership.present?
@@ -150,6 +154,8 @@ module EffectiveMembershipsOwner
       qb_item_name: category.qb_item_name
     )
 
+    after_build_fee(fee)
+
     fee
   end
 
@@ -174,6 +180,8 @@ module EffectiveMembershipsOwner
       qb_item_name: category.qb_item_name
     )
 
+    after_build_fee(fee)
+
     fee
   end
 
@@ -199,6 +207,8 @@ module EffectiveMembershipsOwner
       qb_item_name: qb_item_name
     )
 
+    after_build_fee(fee)
+
     fee
   end
 
@@ -237,6 +247,8 @@ module EffectiveMembershipsOwner
       not_in_good_standing_on: not_in_good_standing_on,
     )
 
+    after_build_fee(fee)
+
     fee
   end
 
@@ -263,6 +275,8 @@ module EffectiveMembershipsOwner
       qb_item_name: category.qb_item_name
     )
 
+    after_build_fee(fee)
+
     fee
   end
 
@@ -342,7 +356,7 @@ module EffectiveMembershipsOwner
 
     # Check that there is a membership history row if the registered date is unique
     if membership.joined_on != membership.registration_on && membership_histories.none? { |mh| mh.start_on == membership.registration_on }
-      errors << "The registered date #{membership.registration_on.strftime('%F')} is missing a history with this date. Please create a history with a start date of #{membership.registration_on.strftime('%F')} or update the registered date above."
+      errors << "The last changed date #{membership.registration_on.strftime('%F')} is missing a history with this date. Please create a history with a start date of #{membership.registration_on.strftime('%F')} or update the last changed date above."
     end
 
     # Check numbers

data/app/models/concerns/effective_memberships_status.rb

@@ -60,6 +60,10 @@ module EffectiveMembershipsStatus
     title.presence || 'New Membership Status'
   end
 
+  def membership_directory_title
+    to_s
+  end
+
   def individual?
     status_type == 'Individual'
   end

data/app/models/effective/membership.rb

@@ -116,7 +116,7 @@ module Effective
         'member',
         ("##{number_was}" if number_was.present?),
         "who joined #{joined_on&.strftime('%F') || '-'}",
-        ("and last registered #{registration_on.strftime('%F')}" if registration_on > joined_on)
+        ("and last changed on #{registration_on.strftime('%F')}" if registration_on > joined_on)
       ].compact.join(' ')
 
       (summary + '.').html_safe

data/app/views/admin/memberships/_form_membership.html.haml

@@ -14,7 +14,7 @@
 
   = f.show_if :current_action, true do
     = f.date_field :joined_on, label: 'Joined', hint: 'When the member first received any membership category'
-    = f.date_field :registration_on, label: 'Registered', hint: 'When the membership category last changed'
+    = f.date_field :registration_on, label: 'Last changed', hint: 'When the membership category or status last changed'
     = f.text_field :number, hint: 'The membership number. Must be unique.'
 
     - registrar = EffectiveMemberships.Registrar

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

@@ -1,4 +1,7 @@
 = card do
   %h6= owner
-  %p= membership.categories.to_sentence
-  %p= membership.statuses.to_sentence
+  %p= membership.categories.map(&:membership_directory_title).to_sentence
+  %p= membership.statuses.map(&:membership_directory_title).to_sentence
+
+  - if owner.try(:email).present?
+    %p= reveal_mail_to(owner.email)

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

@@ -28,7 +28,7 @@
     %p You joined on #{membership.joined_on.strftime('%F')} and have not been assigned a membership number.
 
   - if membership.registration_on > membership.joined_on
-    %p You last changed categories on #{membership.registration_on.strftime('%F')}.
+    %p Your last category or status change was on #{membership.registration_on.strftime('%F')}.
 
   - if membership.not_in_good_standing?
     %p Your membership is Not In Good Standing because of unpurchased fees or dues. Please purchase these dues or contact us.

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

@@ -5,7 +5,7 @@
       %td= membership.joined_on.strftime('%F')
 
     %tr
-      %th Registered
+      %th Last Changed
       %td= membership.registration_on.strftime('%F')
 
     - if membership.categories.length == 0

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.8.4'
+  VERSION = '0.8.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails