effective_memberships 0.1.13 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85325bfcecbc3b898f17f1a1c4730444fa9ac8e6ec66541cb371be4b7f973b93
-  data.tar.gz: 1976fed9cc0b3a4cd9e1bc2b3660d5402d629f00d975dda8875988415bb194ad
+  metadata.gz: cd013eabe2088b6b7c6740146f8ee843a86e2a0979e8003b57541da3713dbeff
+  data.tar.gz: 0c4cf214989bd8915647aca851fb095ebbb205cca3dd880c2edceca2127cd826
 SHA512:
-  metadata.gz: 00702ddf38a7849b8464e08bd37a9c3904e5de3e44d7eb0d32c1583a2ebbaf6e8c3d110742d1a1ef2f0b5a55085f4d38b9b43725f96d98e9b2ee003d5c3bca18
-  data.tar.gz: 0552411b75063d00698c1707d5a6b04cb2bd7c89bd804a9ecc619598ee32ee63ddd99a40cb9cf6c3b368df49b5ac4d12e10e35c20a5be343841dfd561b3a43fd
+  metadata.gz: fc9fef9d1b5687fc5ea109fd819fd771adac2add632964d09bfa9d64235ebfd398cbab0be82b7747c95c4117d1fc0f17c4fca669df2f9d780035aae10188580d
+  data.tar.gz: c515f9644d45422845d5be92e1d6682e383a509da1539c317d2cd3717505239544d39fb82dd868f5ff0d68acea8f739cde14ec57006c5f7b76b375caf54600c2

data/app/models/concerns/effective_memberships_registrar.rb

@@ -253,6 +253,7 @@ module EffectiveMembershipsRegistrar
 
     # Create Renewal Fees
     Effective::Membership.create_renewal_fees(period).find_each do |membership|
+
       membership.categories.select(&:create_renewal_fees?).map do |category|
         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)

data/app/models/effective/fee.rb

@@ -131,7 +131,7 @@ module Effective
     end
 
     def default_qb_item_name
-      category.present? ? category.qb_item_name : "#{fee_type} Fee"
+      category&.qb_item_name.presence || "#{fee_type} Fee"
     end
 
     def default_tax_exempt

data/app/models/effective/membership.rb

@@ -39,21 +39,15 @@ module Effective
     }
 
     scope :create_renewal_fees, -> (period = nil) {
-      deep.with_unpaid_fees_through(period)
-        .where.not(fees_paid_period: nil) # Must have purchased a Prorated or Renewal Fee before
-        #.where(category_id: EffectiveMemberships.Category.create_renewal_fees)
+      deep.with_unpaid_fees_through(period).where.not(fees_paid_period: nil) # Must have purchased a Prorated or Renewal Fee before
     }
 
     scope :create_late_fees, -> (period = nil) {
-      deep.with_unpaid_fees_through(period)
-        .where.not(fees_paid_period: nil) # Must have purchased a Prorated or Renewal Fee before
-        #.where(category_id: EffectiveMemberships.Category.create_late_fees)
+      deep.with_unpaid_fees_through(period).where.not(fees_paid_period: nil) # Must have purchased a Prorated or Renewal Fee before
     }
 
     scope :create_bad_standing, -> (period = nil) {
-      deep.with_unpaid_fees_through(period)
-        .where.not(fees_paid_period: nil) # Must have purchased a Prorated or Renewal Fee before
-        #.where(category_id: EffectiveMemberships.Category.create_bad_standing)
+      deep.with_unpaid_fees_through(period).where.not(fees_paid_period: nil) # Must have purchased a Prorated or Renewal Fee before
     }
 
     before_validation do

data/app/models/effective/membership_category.rb

@@ -3,8 +3,10 @@ module Effective
     belongs_to :category, polymorphic: true
     belongs_to :membership, polymorphic: true
 
+    log_changes(to: :membership) if respond_to?(:log_changes)
+
     def to_s
-      'membership category'
+      category&.to_s || 'membership category'
     end
 
   end

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

@@ -7,8 +7,11 @@
     - collection = EffectiveMembershipsOwner.descendants.map { |d| [d.name.to_s, d.members.sorted] }.to_h
     = f.select :owner_id, collection, polymorphic: true
 
-  = f.select :fee_type , EffectiveMemberships.custom_fee_types
+  - if f.object.new_record?
+    = f.select :fee_type, EffectiveMemberships.custom_fee_types
+  - else
+    = f.static_field :fee_type
+
   = f.price_field :price
 
-  - if fee.new_record?
-    = effective_submit(f)
+  = effective_submit(f)

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.1.13'
+  VERSION = '0.1.17'
 end

data/lib/tasks/effective_memberships_tasks.rake

@@ -8,10 +8,14 @@ namespace :effective_memberships do
   # rake effective_memberships:create_fees
   desc 'Run daily to create Renewal and Late fees'
   task create_fees: :environment do
-    if ActiveRecord::Base.connection.table_exists?(:memberships)
-      EffectiveLogger.info "Running effective_memberships:create_fees scheduled task" if defined?(EffectiveLogger)
-      EffectiveMemberships.Registrar.create_fees!
+    begin
+      if ActiveRecord::Base.connection.table_exists?(:memberships)
+        EffectiveLogger.info "Running effective_memberships:create_fees scheduled task" if defined?(EffectiveLogger)
+        EffectiveMemberships.Registrar.create_fees!
+      end
+    rescue => e
+      ExceptionNotifier.notify_exception(e) if defined?(ExceptionNotifier)
+      puts "Error creating effective membership fees: #{e.errors.inspect}"
     end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.17
 platform: ruby
 authors:
 - Code and Effect