effective_memberships 0.4.5 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 940bfa04e965ae36e054add85ac673260b5fa11f2ff3939ec0f00a3732b6bba1
-  data.tar.gz: c3d94b16860a507b64e75bc7b156e6ce96f79845e5561a25a52ae48c57f3951b
+  metadata.gz: 52711c835dc479a8bc52e2c523d295999270b98eac479cfa8af855d12452466e
+  data.tar.gz: d5368da347ce46759fc6858b4c231788f91a0baf4ba70a8a8c9104c10e991c1d
 SHA512:
-  metadata.gz: 81ba80b0314968331c9bc85a2a021be327780daf44854379f52f4f9f64d8e6c0a3b816871129610b953d2b6d29f8eca22aa4699cc5fc5aceee3fbf86b72e87e2
-  data.tar.gz: 7671e32ba29f5540b90bbd250e5f78503033af257702a01caccfb93064c5e8a111e95cff7212f64c7b0ef2d0d8872131b76cef7ee10a800700f157fd3e8258d1
+  metadata.gz: 7a62bf9547cd039f6f9035c0e075328db83455173709a0dbd672db63be2a6c92cf10551d43962deddcafca76c828c53ff0df2cf374ebf26a8e960d443b71586b
+  data.tar.gz: 7d57abebdaffccdf19af9a1220e20cd244054f04e8807da1e2dc3a45bb40a6010758e4e8676ded2e6321f14d59e4ca488dd05ac391514403c0315464b21c5c86

data/app/controllers/admin/memberships_controller.rb

@@ -5,7 +5,7 @@ module Admin
 
     include Effective::CrudController
 
-    submit :save, 'Update Membership',
+    submit :revise, 'Update Membership',
       success: -> { "#{resource.owner} has been successfully updated. Please double check the membership history is correct" },
       redirect: -> { admin_owners_path(resource) }
 

data/app/datatables/admin/effective_organizations_datatable.rb

@@ -1,7 +1,12 @@
 module Admin
   class EffectiveOrganizationsDatatable < Effective::Datatable
-    datatable do
+    filters do
+      scope :unarchived, label: 'All'
+      scope :members
+      scope :archived
+    end
 
+    datatable do
       col :updated_at, visible: false
       col :created_at, visible: false
 
@@ -11,16 +16,54 @@ module Admin
         col :category, search: categories
       end
 
-      col :title
+      col(:to_s, label: 'Organization', sql_column: true, action: :edit)
+      .search do |collection, term|
+        collection.where(id: effective_resource.search_any(term))
+      end.sort do |collection, direction|
+        collection.order(title: direction)
+      end
+
+      col :title, visible: false
+
+      col 'membership.joined_on'
+      col 'membership.fees_paid_through_period', label: 'Fees Paid Through'
+      col 'membership.categories'
 
       col :representatives_count
       col :representatives
 
+      col :email, visible: false
+
+      col :address1, visible: false do |organization|
+        organization.billing_address&.address1
+      end
+      col :address2, visible: false do |organization|
+        organization.billing_address&.address2
+      end
+      col :city, visible: false do |organization|
+        organization.billing_address&.city
+      end
+      col :state_code, label: 'Prov', visible: false do |organization|
+        organization.billing_address&.state_code
+      end
+      col :postal_code, label: 'Postal', visible: false do |organization|
+        organization.billing_address&.postal_code
+      end
+      col :country_code, label: 'Country', visible: false do |organization|
+        organization.billing_address&.country_code
+      end
+
+      col :phone, visible: false
+      col :fax, visible: false
+      col :website, visible: false
+      col :category, visible: false
+      col :notes, visible: false
+
       actions_col
     end
 
     collection do
-      EffectiveMemberships.Organization.deep.all
+      EffectiveMemberships.Organization.deep.left_joins(:membership).includes(:addresses, membership: :membership_categories)
     end
 
     def categories

data/app/models/concerns/effective_memberships_organization.rb

@@ -23,6 +23,7 @@ module EffectiveMembershipsOrganization
     effective_memberships_owner
 
     acts_as_addressable :billing # effective_addresses
+    acts_as_archived unless respond_to?(:acts_as_archived?)
     log_changes(except: [:representatives, :users]) if respond_to?(:log_changes)
 
     # rich_text_body

data/app/models/concerns/effective_memberships_owner.rb

@@ -181,8 +181,8 @@ module EffectiveMembershipsOwner
     # Build the renewal fee
     fee ||= fees.build()
 
-    late_on ||= EffectiveMemberships.Registrar.late_fee_date(period: period)
-    bad_standing_on ||= EffectiveMemberships.Registrar.bad_standing_date(period: period)
+    late_on ||= EffectiveMemberships.Registrar.late_fee_date(period: period) if category.create_late_fees?
+    bad_standing_on ||= EffectiveMemberships.Registrar.bad_standing_date(period: period) if category.create_bad_standing?
 
     fee.assign_attributes(
       fee_type: 'Renewal',

data/app/models/concerns/effective_memberships_registrar.rb

@@ -284,52 +284,53 @@ module EffectiveMembershipsRegistrar
     retval
   end
 
-
   # This is intended to be run once per day in a rake task
   # rake effective_memberships:create_fees
   # Create Renewal and Late fees
-  def create_fees!(period: nil, late_on: nil, bad_standing_on: nil)
-    # The current period, based on Time.zone.now
+  def create_fees!(period: nil)
     period ||= current_period
-    late_on ||= late_fee_date(period: period)
-    bad_standing_on ||= bad_standing_date(period: period)
+    memberships = Effective::Membership.deep.with_unpaid_fees_through(period)
 
     # Create Renewal Fees
-    Effective::Membership.deep.with_unpaid_fees_through(period).find_each do |membership|
-      membership.categories.select(&:create_renewal_fees?).map do |category|
-        existing = membership.owner.membership_period_fee(category: category, period: period, except: 'Renewal')
-        next if existing.present? # This might be an existing Prorated fee
+    memberships.find_each { |membership| create_renewal_fees!(membership, period: period) }
+    GC.start
 
-        fee = membership.owner.build_renewal_fee(category: category, period: period, late_on: late_on, bad_standing_on: bad_standing_on)
-        raise("expected build_renewal_fee to return a fee for period #{period}") unless fee.kind_of?(Effective::Fee)
-        next if fee.purchased?
+    # Create Late Fees
+    memberships.find_each { |membership| create_late_fees!(membership, period: period) }
+    GC.start
 
-        puts("Created renewal fee for #{membership.owner}") if fee.new_record? && !Rails.env.test?
+    # Update Membership Status - Assign In Bad Standing
+    memberships.find_each { |membership| update_membership_status!(membership, period: period) }
+    GC.start
 
-        fee.save!
-      end
-    end
+    true
+  end
 
-    GC.start
+  def create_renewal_fees!(membership, period:)
+    membership.categories.select(&:create_renewal_fees?).map do |category|
+      existing = membership.owner.membership_period_fee(category: category, period: period, except: 'Renewal')
+      next if existing.present? # This might be an existing Prorated fee
 
-    # Create Late Fees
-    Effective::Membership.deep.with_unpaid_fees_through(period).find_each do |membership|
-      membership.categories.select(&:create_late_fees?).map do |category|
-        fee = membership.owner.build_late_fee(category: category, period: period)
-        next if fee.blank? || fee.purchased?
+      fee = membership.owner.build_renewal_fee(category: category, period: period)
+      raise("expected build_renewal_fee to return a fee for period #{period}") unless fee.kind_of?(Effective::Fee)
+      next if fee.purchased?
 
-        fee.save!
-      end
-    end
+      puts("Created renewal fee for #{membership.owner}") if fee.new_record? && !Rails.env.test?
 
-    GC.start
+      fee.save!
+    end
+  end
 
-    # Update Membership Status - Assign In Bad Standing
-    Effective::Membership.deep.with_unpaid_fees_through(period).find_each do |membership|
-      membership.owner.update_membership_status!
+  def create_late_fees!(membership, period:)
+    membership.categories.select(&:create_late_fees?).map do |category|
+      fee = membership.owner.build_late_fee(category: category, period: period)
+      next if fee.blank? || fee.purchased?
+      fee.save!
     end
+  end
 
-    true
+  def update_membership_status!(membership, period: nil)
+    membership.owner.update_membership_status!
   end
 
   # Called in the after_purchase of fee payment

data/app/models/effective/membership.rb

@@ -38,8 +38,9 @@ module Effective
     }
 
     scope :with_unpaid_fees_through, -> (period = nil) {
-      where(arel_table[:fees_paid_period].lt(period || EffectiveMemberships.Registrar.current_period))
-      .or(where(fees_paid_period: nil))
+      joined = where(arel_table[:joined_on].lt(period || EffectiveMemberships.Registrar.current_period))
+      unpaid = where(arel_table[:fees_paid_period].lt(period || EffectiveMemberships.Registrar.current_period)).or(where(fees_paid_period: nil))
+      joined.merge(unpaid)
     }
 
     before_validation do
@@ -119,7 +120,24 @@ module Effective
     end
 
     def fees_paid?
-      fees_paid_period == EffectiveMemberships.Registrar.current_period
+      paid_fees_through?(EffectiveMemberships.Registrar.current_period)
+    end
+
+    def paid_fees_through?(period = nil)
+      period ||= EffectiveMemberships.Registrar.current_period
+
+      return false if fees_paid_period.blank?
+      fees_paid_period >= period
+    end
+
+    def unpaid_fees_through?(period = nil)
+      period ||= EffectiveMemberships.Registrar.current_period
+
+      return false if joined_on.blank?
+      return false unless joined_on < period
+
+      return true if fees_paid_period.blank?
+      fees_paid_period < period
     end
 
     def change_fees_paid_period
@@ -127,6 +145,10 @@ module Effective
     end
 
     def change_fees_paid_period=(date)
+      if date.blank?
+        return assign_attributes(fees_paid_period: nil, fees_paid_through_period: nil)
+      end
+
       date = (date.respond_to?(:strftime) ? date : Date.parse(date))
 
       period = EffectiveMemberships.Registrar.period(date: date)
@@ -135,5 +157,20 @@ module Effective
       assign_attributes(fees_paid_period: period, fees_paid_through_period: period_end_on)
     end
 
+    # Admin updating membership info
+    def revise!
+      save!
+
+      period = EffectiveMemberships.Registrar.current_period
+      return true if paid_fees_through?(period)
+
+      # Otherwise build fees right now
+      EffectiveMemberships.Registrar.create_renewal_fees!(self, period: period)
+      EffectiveMemberships.Registrar.create_late_fees!(self, period: period)
+      EffectiveMemberships.Registrar.update_membership_status!(self, period: period)
+
+      true
+    end
+
   end
 end

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

@@ -21,7 +21,7 @@
     - periods = registrar.periods(from: f.object.joined_on)
     - collection = periods.reverse.map { |period| [registrar.period_end_on(date: period), period] }
 
-    = f.select :change_fees_paid_period, collection, label: 'Fees Paid Through', hint: 'Which period this user has fees paid through. Can change how renewal fees are created.'
+    = f.select :change_fees_paid_period, collection, label: 'Fees Paid Through', hint: 'Which period this user has fees paid through. Determines which renewal fees should be created. Setting this to a past or blank period may create a renewal fee in the current period.'
 
     %p.text-muted To update the current membership categories, use the 'Assign' or 'Reclassify' actions below
 

data/app/views/admin/organizations/_fields.html.haml

@@ -2,5 +2,3 @@
 
 - if categories.present?
   = f.select :category, categories, required: true
-
-= f.text_field :title

data/app/views/admin/organizations/_form.html.haml

@@ -5,7 +5,7 @@
   - if organization.persisted?
     - if can?(:index, Effective::Membership)
       = tab 'Membership' do
-        = render 'admin/registrar_actions/form', owner: organization
+        = render 'admin/memberships/form', owner: organization
 
     = tab 'Representatives' do
       = render_datatable(Admin::EffectiveRepresentativesDatatable.new(organization: organization), inline: true, namespace: :admin)
@@ -18,10 +18,6 @@
       = tab 'Fee Payments' do
         = render_inline_datatable(Admin::EffectiveFeePaymentsDatatable.new(organization: organization))
 
-    - if can?(:index, Effective::MembershipHistory)
-      = tab 'History' do
-        = render_datatable(Admin::EffectiveMembershipHistoriesDatatable.new(owner: organization))
-
     - if can?(:index, Effective::Order)
       = tab 'Orders' do
         = render_datatable(Admin::EffectiveOrdersDatatable.new(user: organization))

data/app/views/admin/organizations/_form_organization.html.haml

@@ -3,9 +3,7 @@
     .col-sm-6
       %h2 Demographics
       = render 'admin/organizations/fields', f: f
-
-      %h2 Billing Address
-      = effective_address_fields(f, :billing)
+      = render 'organizations/fields_demographics', f: f
 
     .col-sm-6
       %h2 Membership

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.4.5'
+  VERSION = '0.4.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_test_bot
   requirement: !ruby/object:Gem::Requirement