effective_memberships 0.12.3 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7b99c254dcb327566bd4de3e1893a6b94874e055f92b03f79a6f5ee156e48c6
-  data.tar.gz: 732a011869b5756269d5869b2465aec166b1cdaa8cafeb6f359114d8b544d382
+  metadata.gz: ef95cbbf40f72c47c5ca64efd70d28d1cb879e52431b22471f2d570ef759d495
+  data.tar.gz: a150c327ec0869e26822f7d484cdc99c414cd666679150e9ee0c83efc3b125aa
 SHA512:
-  metadata.gz: 0f1ebd7606208e5603b2039368623427b87ca92888f635f7593efb1b822d40e2821c6a4894df4d935a4cdc5ac9269ce80269e17fc99e772dd00bf1123ef04648
-  data.tar.gz: 299039b2e0ec8fce83317e9033e62cb6cc6688156ee78fbd6b296c15ccfb0e6ea75a36de48a32d782b539eb06188fb5d2929e547de44bc827deb026839fde6c8
+  metadata.gz: cc04a6003782b0c39e4b67d03c012dc3e2247c93b5f43bd38fd47a843da7ee0c9fa11e5a02d56672724f95c453e5cf266179ea22f9e06da851c1d484a583edd2
+  data.tar.gz: dc070be5820ad2f616c4320a745879ff26b8e153f24ddc99fb92913d753f96198c387b58b8656e443737cec8ea1b5417032faceb394eae2ea640c61efbb05cf4

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/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.0'
 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.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-03-16 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