effective_memberships 0.1.14 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75225933549d813b188349328bc0085c59300aaca562fbb1d1c446dead8af779
-  data.tar.gz: d03884209ed1744845b4da006b5c390a2b98f3de92229bdc0dc1142832a04879
+  metadata.gz: ca7f69647fe281a0f8953227a7c0ecb2cea138de771e5b192a3168bf79c93f38
+  data.tar.gz: e1c66037d7175df0cf4f5c729a73242b52b14dcbe51c2aa82ca161ea5f10fb41
 SHA512:
-  metadata.gz: ea1277f6778c5520514608398fb6293e7db5be449bcd8fb84386dd6163ca091545f87964e0d71d2d328bbb365b4dd6887c2c5ec60d055bf146fb1e412f5e169e
-  data.tar.gz: 914e29624e5b40c7f169264b0e8bccf8aaebdb8fa9c4303f06b9318916e68bf59f82a2dd3a2df3e9841568d898e4df653c79cbf74f969ec7c5d84e3e76f8b5c2
+  metadata.gz: c70d4c0e95201a64ab9722000775145be07a9c0bbd267193e1a6a133b2330f1f6439d32651a0c7e6e3f6f18dc5bc6213e9090c06fbf90bab297302e74dedcef1
+  data.tar.gz: a1b3282710ab4c04bab435233a4a63f26d21d474da980fa66cfb3456b50108dd9d8ba94d76f27f9da09824456f5fc4f045df9853a4765b793f747674bc4213ba

data/app/datatables/admin/effective_fees_datatable.rb

@@ -13,6 +13,8 @@ module Admin
       col :created_at, visible: false
       col :id, visible: false
 
+      col :period, visible: false
+
       unless attributes[:owner_id] || attributes[:applicant_id] || attributes[:fee_payment_id]
         col :owner
       end

data/app/models/concerns/effective_memberships_registrar.rb

@@ -209,11 +209,11 @@ module EffectiveMembershipsRegistrar
     period_end_on = period_end_on(date: date)
 
     if owner.outstanding_fee_payment_fees.present?
-      fp = EffectiveMemberships.FeePayment.new(owner: owner)
-      fp.ready!
-      fp.submit_order.purchase!(skip_buyer_validations: true, email: false)
+      order = Effective::Order.new(items: owner.outstanding_fee_payment_fees, user: owner)
+      order.purchase!(skip_buyer_validations: true, email: false)
     end
 
+    owner.update_membership_status!
     owner.membership.update!(fees_paid_period: period, fees_paid_through_period: period_end_on)
   end
 
@@ -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/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.14'
+  VERSION = '0.1.18'
 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.18
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails