effective_memberships 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63bc67558cecd231d4c28c0622ed24c8ad22a59377a783d29bd7f020d3a8af00
-  data.tar.gz: 9ffbb0be52b89c109cc52a81a66ca97fdaac70ad32eb9d94a64e79cfec68846a
+  metadata.gz: 735da58a1a6df3aed501dc23f1d03f01aad80b53c6e90d912a7e3ca245c31145
+  data.tar.gz: d8d83e2200d6b9e1f707bc157ef4338b94da585373473517912605eb2b2939cd
 SHA512:
-  metadata.gz: e2ec3baf0a8d981571e4f0d9dc56bedbd0fe636fc396f2f93d8d5ed4d86e2b4945f3e5d600cdbe963e4a9728d825775ff6674ee0fad3eb301faf88e8f5edcd04
-  data.tar.gz: 7d6848dc7fc893c432d24cafb18a3f235591cd67d0585a5c7ed617e7986542c1ebf4f7e9bbee8c8ae2551b50b060f0ca03352c9e37a162b8e76f02573186d985
+  metadata.gz: 472f5e747d7a7ebcacb8fbf1a3072ee82e158c2672482e0f404e4165b62dc8cafb7f66a380d5e0d625fec7b7cb25de970789332ebfd3d4aa832b269b134172e3
+  data.tar.gz: 69ade19ab5f49b8218795cefdc8b09fa53a4f53a2726907b5ed361d581f0fab6d2fe2e4ed17a69d202ad461208062a4fee6c4628ea88f94cbe9cc7063cb13c36

data/app/models/concerns/effective_memberships_applicant.rb

@@ -301,6 +301,7 @@ module EffectiveMembershipsApplicant
         fee_type: 'Applicant',
         category: category,
         price: category.applicant_fee,
+        tax_exempt: category.tax_exempt,
         qb_item_name: submit_fee_qb_item_name()
       )
 

data/app/models/concerns/effective_memberships_category.rb

@@ -110,6 +110,7 @@ module EffectiveMembershipsCategory
     scope :create_bad_standing, -> { where(create_bad_standing: true) }
 
     validates :title, presence: true, uniqueness: true
+
     validates :position, presence: true
 
     after_initialize(if: -> { new_record? }) do
@@ -138,6 +139,9 @@ module EffectiveMembershipsCategory
       validates :prorated_oct, presence: true, numericality: { greater_than_or_equal_to: 0 }
       validates :prorated_nov, presence: true, numericality: { greater_than_or_equal_to: 0 }
       validates :prorated_dec, presence: true, numericality: { greater_than_or_equal_to: 0 }
+
+      validates :qb_item_name, presence: true
+      validates :tax_exempt, inclusion: { in: [true, false] }
     end
   end
 

data/app/models/concerns/effective_memberships_owner.rb

@@ -137,11 +137,6 @@ module EffectiveMembershipsOwner
   end
 
   # Instance Methods
-  def additional_fee_attributes(fee)
-    raise('expected an Effective::Fee') unless fee.kind_of?(Effective::Fee)
-    {}
-  end
-
   def build_prorated_fee(date: nil)
     raise('must have an existing membership') unless membership.present?
 
@@ -156,8 +151,10 @@ module EffectiveMembershipsOwner
     fee.assign_attributes(
       fee_type: 'Prorated',
       category: category,
+      period: period,
       price: price,
-      period: period
+      tax_exempt: category.tax_exempt,
+      qb_item_name: category.qb_item_name
     )
 
     fee
@@ -178,16 +175,17 @@ module EffectiveMembershipsOwner
     fee.assign_attributes(
       fee_type: 'Discount',
       category: category,
+      period: period,
       price: price,
-      period: period
+      tax_exempt: category.tax_exempt,
+      qb_item_name: category.qb_item_name
     )
 
     fee
   end
 
-  def build_title_fee(period:, title:, fee_type: nil, category: nil, price: nil, qb_item_name: nil, tax_exempt: nil)
-    fee_type ||= 'Renewal'
-
+  # Only thing optional is category, late_on and bad_standing_on
+  def build_title_fee(title:, fee_type:, period:, price:, tax_exempt:, qb_item_name:, category: nil)
     fee = fees.find do |fee|
       fee.fee_type == fee_type && fee.period == period && fee.title == title &&
       (category.blank? || fee.category_id == category.id && fee.category_type == category.class.name)
@@ -197,24 +195,21 @@ module EffectiveMembershipsOwner
 
     # Build the title fee
     fee ||= fees.build()
-    price ||= (category.renewal_fee.to_i if category.present? && fee_type == 'Renewal')
 
     fee.assign_attributes(
-      fee_type: fee_type,
       title: title,
+      fee_type: fee_type,
       category: category,
-      price: price,
       period: period,
-      qb_item_name: qb_item_name,
+      price: price,
       tax_exempt: tax_exempt,
-      late_on: nil,
-      bad_standing_on: nil
+      qb_item_name: qb_item_name
     )
 
     fee
   end
 
-  def build_renewal_fee(category:, period:, late_on:, bad_standing_on:)
+  def build_renewal_fee(category:, period:, late_on: nil, bad_standing_on: nil)
     raise('must have an existing membership') unless membership.present?
 
     fee = fees.find { |fee| fee.fee_type == 'Renewal' && fee.period == period && fee.category_id == category.id && fee.category_type == category.class.name }
@@ -223,13 +218,18 @@ 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)
+
     fee.assign_attributes(
       fee_type: 'Renewal',
       category: category,
-      price: category.renewal_fee.to_i,
       period: period,
+      price: category.renewal_fee.to_i,
+      tax_exempt: category.tax_exempt,
+      qb_item_name: category.qb_item_name,
       late_on: late_on,
-      bad_standing_on: bad_standing_on
+      bad_standing_on: bad_standing_on,
     )
 
     fee
@@ -252,8 +252,10 @@ module EffectiveMembershipsOwner
     fee.assign_attributes(
       fee_type: 'Late',
       category: category,
-      price: category.late_fee.to_i,
       period: period,
+      price: category.late_fee.to_i,
+      tax_exempt: category.tax_exempt,
+      qb_item_name: category.qb_item_name
     )
 
     fee

data/app/models/effective/fee.rb

@@ -14,11 +14,11 @@ module Effective
     belongs_to :category, polymorphic: true, optional: true
 
     effective_resource do
-      fee_type      :string
+      fee_type          :string
 
-      title         :string
+      title             :string
 
-      period        :date
+      period            :date
 
       late_on           :date
       bad_standing_on   :date
@@ -33,32 +33,22 @@ module Effective
     scope :sorted, -> { order(:id) }
     scope :deep, -> { includes(:owner, :parent, :category) }
 
-    before_validation(if: -> { owner.present? }) do
-      additional = owner.additional_fee_attributes(self)
-      raise('expected a Hash of attributes') unless additional.kind_of?(Hash)
-      assign_attributes(additional)
-    end
-
     before_validation(if: -> { owner && owner.membership }) do
       self.category ||= owner.membership.categories.first if owner.membership.categories.length == 1
     end
 
     before_validation do
-      self.period ||= default_period()
-      self.late_on ||= default_late_on()
-      self.bad_standing_on ||= default_bad_standing_on()
-
-      self.qb_item_name ||= default_qb_item_name()
-      self.tax_exempt = default_tax_exempt() if tax_exempt.nil?
-
+      self.period ||= EffectiveMemberships.Registrar.current_period
       self.title ||= default_title()
     end
 
     validates :fee_type, presence: true
-    validates :price, presence: true
 
     validates :title, presence: true
     validates :period, presence: true
+
+    validates :price, presence: true
+    validates :tax_exempt, inclusion: { in: [true, false] }
     validates :qb_item_name, presence: true
 
     validate(if: -> { fee_type.present? }) do
@@ -107,33 +97,8 @@ module Effective
       EffectiveMemberships.custom_fee_types.include?(fee_type)
     end
 
-    def default_period
-      EffectiveMemberships.Registrar.current_period
-    end
-
-    def default_late_on
-      nil
-    end
-
-    def default_bad_standing_on
-      nil
-    end
-
     def default_title
-      [
-        period&.strftime('%Y').presence,
-        category.to_s.presence,
-        fee_type.presence,
-        'Fee'
-      ].join(' ')
-    end
-
-    def default_qb_item_name
-      category&.qb_item_name.presence || "#{fee_type}"
-    end
-
-    def default_tax_exempt
-      category.present? ? category.tax_exempt : false
+      [period&.strftime('%Y'), category, fee_type, 'Fee'].compact.join(' ')
     end
 
   end

data/db/seeds.rb

@@ -21,7 +21,9 @@ member = Effective::Category.create!(
   renewal_fee: 250_00,
   late_fee: 50_00,
   prorated_jan: 120_00, prorated_feb: 110_00, prorated_mar: 100_00, prorated_apr: 90_00, prorated_may: 80_00, prorated_jun: 70_00,
-  prorated_jul: 60_00, prorated_aug: 50_00, prorated_sep: 40_00, prorated_oct: 30_00, prorated_nov: 20_00, prorated_dec: 10_00
+  prorated_jul: 60_00, prorated_aug: 50_00, prorated_sep: 40_00, prorated_oct: 30_00, prorated_nov: 20_00, prorated_dec: 10_00,
+  qb_item_name: 'Full Member Quickbooks Name',
+  tax_exempt: false
 )
 
 student = Effective::Category.create!(
@@ -35,7 +37,9 @@ student = Effective::Category.create!(
   renewal_fee: 125_00,
   late_fee: 25_00,
   prorated_jan: 120_00, prorated_feb: 110_00, prorated_mar: 100_00, prorated_apr: 90_00, prorated_may: 80_00, prorated_jun: 70_00,
-  prorated_jul: 60_00, prorated_aug: 50_00, prorated_sep: 40_00, prorated_oct: 30_00, prorated_nov: 20_00, prorated_dec: 10_00
+  prorated_jul: 60_00, prorated_aug: 50_00, prorated_sep: 40_00, prorated_oct: 30_00, prorated_nov: 20_00, prorated_dec: 10_00,
+  qb_item_name: 'Student Quickbooks Name',
+  tax_exempt: false
 )
 
 retired = Effective::Category.create!(
@@ -47,7 +51,9 @@ retired = Effective::Category.create!(
   applicant_fee: 0,
   renewal_fee: 0,
   prorated_jan: 120_00, prorated_feb: 110_00, prorated_mar: 100_00, prorated_apr: 90_00, prorated_may: 80_00, prorated_jun: 70_00,
-  prorated_jul: 60_00, prorated_aug: 50_00, prorated_sep: 40_00, prorated_oct: 30_00, prorated_nov: 20_00, prorated_dec: 10_00
+  prorated_jul: 60_00, prorated_aug: 50_00, prorated_sep: 40_00, prorated_oct: 30_00, prorated_nov: 20_00, prorated_dec: 10_00,
+  qb_item_name: 'Retired Quickbooks Name',
+  tax_exempt: false
 )
 
 area = Effective::ApplicantCourseArea.create!(title: 'Science')

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

metadata

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