effective_memberships 0.2.6 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6edc66bd8a9a8c6b9d38fb90cb42c8041efde67d7e2d5b80b14169678e70e9ff
-  data.tar.gz: 928861f7ee7ee4a2e2f1f77f3e8209909948ba7470ad2894267cbe29084e1290
+  metadata.gz: 32415f21f0400cb757d09cb4779d18e0ba4462059d4c31410cd916ff7dc384eb
+  data.tar.gz: f5394ac52d43975b6a1b12386029936131ffce521226343d39e5d57267053a40
 SHA512:
-  metadata.gz: 9a928f4b12eead76fc74ebd7fe39838829484796b4dd017dbbc35236f9bdd16d0bdcf7cc74526fbb95dee1711c82157c817f084352aa6bcde3ce35c2306e5a59
-  data.tar.gz: b2dca432e504b87d57b88c2e36624cf857f3364c346828d355b58e28188b01a4ff38bdaece31b60cadc976075d9e62f4d7bf0530d260d63ecdd31b051702f014
+  metadata.gz: 573a3eafaedd539e47fababe8a253075ab3258e6bf8c5275838c80a4f1d96aa8ee9589d41e112415f530d7780b8f532c5a1cca40f3245b1c087ebf6576d80a03
+  data.tar.gz: aaeb899f86c0c4811729a1619583afc1100d579aacc65ba234b0cf623392359fea274f8f63a7d1805ec8a50d770552322c311eec114e9c72fc0ec282d7c2ecef

data/app/datatables/admin/effective_categories_datatable.rb

@@ -13,6 +13,9 @@ module Admin
       col :late_fee, as: :price
       col :rich_text_body, label: 'Body'
 
+      col :tax_exempt
+      col :qb_item_name, visible: false
+
       actions_col
     end
 

data/app/models/concerns/effective_memberships_applicant.rb

@@ -77,26 +77,26 @@ module EffectiveMembershipsApplicant
     belongs_to :category, polymorphic: true, optional: true
     belongs_to :from_category, polymorphic: true, optional: true
 
-    has_many :applicant_reviews, -> { order(:id) }, inverse_of: :applicant, dependent: :destroy
+    has_many :applicant_reviews, -> { order(:id) }, as: :applicant, inverse_of: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_reviews, reject_if: :all_blank, allow_destroy: true
 
     # Effective Namespace
-    has_many :applicant_courses, -> { order(:id) }, class_name: 'Effective::ApplicantCourse', inverse_of: :applicant, dependent: :destroy
+    has_many :applicant_courses, -> { order(:id) }, class_name: 'Effective::ApplicantCourse', as: :applicant, inverse_of: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_courses, reject_if: :all_blank, allow_destroy: true
 
-    has_many :applicant_educations, -> { order(:id) }, class_name: 'Effective::ApplicantEducation', inverse_of: :applicant, dependent: :destroy
+    has_many :applicant_educations, -> { order(:id) }, class_name: 'Effective::ApplicantEducation', as: :applicant, inverse_of: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_educations, reject_if: :all_blank, allow_destroy: true
 
-    has_many :applicant_experiences, -> { order(:id) }, class_name: 'Effective::ApplicantExperience', inverse_of: :applicant, dependent: :destroy
+    has_many :applicant_experiences, -> { order(:id) }, class_name: 'Effective::ApplicantExperience', as: :applicant, inverse_of: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_experiences, reject_if: :all_blank, allow_destroy: true
 
-    has_many :applicant_references, -> { order(:id) }, class_name: 'Effective::ApplicantReference', inverse_of: :applicant, dependent: :destroy
+    has_many :applicant_references, -> { order(:id) }, class_name: 'Effective::ApplicantReference', as: :applicant, inverse_of: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_references, reject_if: :all_blank, allow_destroy: true
 
-    has_many :fees, -> { order(:id) }, as: :parent, class_name: 'Effective::Fee', dependent: :nullify
+    has_many :fees, -> { order(:id) }, as: :parent, inverse_of: :parent, class_name: 'Effective::Fee', dependent: :nullify
     accepts_nested_attributes_for :fees, reject_if: :all_blank, allow_destroy: true
 
-    has_many :orders, -> { order(:id) }, as: :parent, class_name: 'Effective::Order', dependent: :nullify
+    has_many :orders, -> { order(:id) }, as: :parent, inverse_of: :parent, class_name: 'Effective::Order', dependent: :nullify
     accepts_nested_attributes_for :orders
 
     effective_resource do

data/app/models/effective/applicant_course.rb

@@ -4,8 +4,8 @@ module Effective
 
     belongs_to :applicant_course_area
 
+    belongs_to :applicant, polymorphic: true, optional: true
     belongs_to :applicant_course_name, optional: true
-    belongs_to :applicant, optional: true
 
     effective_resource do
       title          :string
@@ -17,7 +17,7 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:applicant_course_area, :applicant_course_name, :applicant) }
+    scope :deep, -> { includes(:applicant_course_area, :applicant_course_name) }
     scope :sorted, -> { order(:title) }
 
     before_validation(if: -> { applicant_course_name.present? }) do

data/app/models/effective/applicant_education.rb

@@ -1,6 +1,6 @@
 module Effective
   class ApplicantEducation < ActiveRecord::Base
-    belongs_to :applicant
+    belongs_to :applicant, polymorphic: true
 
     log_changes(to: :applicant) if respond_to?(:log_changes)
 
@@ -16,7 +16,7 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:applicant) }
+    scope :deep, -> { all }
 
     validates :start_on, presence: true
     validates :end_on, presence: true

data/app/models/effective/applicant_experience.rb

@@ -1,6 +1,6 @@
 module Effective
   class ApplicantExperience < ActiveRecord::Base
-    belongs_to :applicant
+    belongs_to :applicant, polymorphic: true
 
     log_changes(to: :applicant) if respond_to?(:log_changes)
 
@@ -25,7 +25,7 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:applicant) }
+    scope :deep, -> { all }
 
     before_validation(if: -> { start_on.present? && end_on.present? }) do
       self.months ||= ((end_on - start_on) / 1.month).to_i

data/app/models/effective/applicant_reference.rb

@@ -5,7 +5,7 @@ module Effective
     acts_as_statused :submitted, :completed
     log_changes(to: :applicant) if respond_to?(:log_changes)
 
-    belongs_to :applicant
+    belongs_to :applicant, polymorphic: true
 
     KNOWNS = ['6 months - 1 year', '1 year - 2 years', '2 - 5 years', '5 - 10 years', 'More than 10 years']
     RELATIONSHIPS = ['Supervisor', 'Employer', 'Colleague', 'Other']
@@ -38,7 +38,7 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:applicant) }
+    scope :deep, -> { all }
 
     # All step validations
     validates :applicant, presence: true

data/db/migrate/01_create_effective_memberships.rb.erb

@@ -172,6 +172,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     # Applicant Educations
     create_table :applicant_educations do |t|
       t.integer :applicant_id
+      t.string :applicant_type
 
       t.date :start_on
       t.date :end_on
@@ -191,6 +192,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     # Applicant Experiences
     create_table :applicant_experiences do |t|
       t.integer :applicant_id
+      t.string :applicant_type
 
       t.string :level
       t.integer :months
@@ -216,6 +218,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     # Applicant References
     create_table :applicant_references do |t|
       t.integer :applicant_id
+      t.string :applicant_type
 
       t.string :name
       t.string :email
@@ -264,7 +267,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     create_table :applicant_courses do |t|
       t.integer :applicant_course_area_id
       t.integer :applicant_course_name_id
+
       t.integer :applicant_id
+      t.string :applicant_type
 
       t.string  :title
       t.integer :amount
@@ -279,7 +284,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     # Applicant Reviews
     create_table :applicant_reviews do |t|
       t.string :token
+
       t.integer :applicant_id
+      t.string :applicant_type
 
       t.integer :reviewer_id
       t.string :reviewer_type

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.2.6'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails