effective_memberships 0.1.10 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2fa9825b98ff831e92982093f101688968d4a9de0e1b61bd40d30b4ecdc508a
-  data.tar.gz: 3099497fce47b55f6d47009e5637aac7fdc70990f2bccd4d5d08cd448b7982a3
+  metadata.gz: 75225933549d813b188349328bc0085c59300aaca562fbb1d1c446dead8af779
+  data.tar.gz: d03884209ed1744845b4da006b5c390a2b98f3de92229bdc0dc1142832a04879
 SHA512:
-  metadata.gz: 1ea91efb59aa3d7408a76fbc463febca221f0150f83964361a72aa2c79ae8f14071be1fd91ef6e060dcdd2d08d36edb74c369b6287d2698722000b80ffce02c6
-  data.tar.gz: 826d97b4c4f2fc50cd30dde0b0bbccf2eefdea7c2e1fc73c27e87916ae64a07a00d0d74e2b775cf41b8e2f55268403885a92e3fc932969ed350aa0fde1893737
+  metadata.gz: ea1277f6778c5520514608398fb6293e7db5be449bcd8fb84386dd6163ca091545f87964e0d71d2d328bbb365b4dd6887c2c5ec60d055bf146fb1e412f5e169e
+  data.tar.gz: 914e29624e5b40c7f169264b0e8bccf8aaebdb8fa9c4303f06b9318916e68bf59f82a2dd3a2df3e9841568d898e4df653c79cbf74f969ec7c5d84e3e76f8b5c2

data/app/controllers/admin/fee_payments_controller.rb

@@ -11,7 +11,7 @@ module Admin
     private
 
     def permitted_params
-      model = (params.key?(:effective_applicant) ? :effective_fee_payment : :fee_payment)
+      model = (params.key?(:effective_fee_payment) ? :effective_fee_payment : :fee_payment)
       params.require(model).permit!
     end
 

data/app/controllers/admin/memberships_controller.rb

@@ -0,0 +1,9 @@
+module Admin
+  class MembershipsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_memberships) }
+
+    include Effective::CrudController
+
+  end
+end

data/app/datatables/admin/effective_memberships_datatable.rb

@@ -0,0 +1,40 @@
+module Admin
+  class EffectiveMembershipsDatatable < Effective::Datatable
+
+    datatable do
+      order :id
+      col :id, visible: false
+
+      col :owner
+      col :categories
+
+      col :number
+      col :number_as_integer, visible: false
+
+      col :joined_on
+      col :registration_on
+
+      col :fees_paid_period, visible: false, label: 'Fees Paid'
+      col :fees_paid_through_period, label: 'Fees Paid Through'
+
+      col :bad_standing
+      col :bad_standing_admin, visible: false
+      col :bad_standing_reason, visible: false
+
+      actions_col
+    end
+
+    collection do
+      memberships = Effective::Membership.deep.all
+
+      raise('expected an owner_id, not user_id') if attributes[:user_id].present?
+
+      if attributes[:owner_id].present?
+        memberships = memberships.where(owner_id: attributes[:owner_id])
+      end
+
+      memberships
+    end
+
+  end
+end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -473,6 +473,8 @@ module EffectiveMembershipsApplicant
     # From Billing Step
     order.billing_address = owner.billing_address if owner.billing_address.present?
 
+    order.save
+
     order
   end
 

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -229,6 +229,8 @@ module EffectiveMembershipsFeePayment
 
     order.billing_address = owner.billing_address if owner.billing_address.present?
 
+    order.save
+
     order
   end
 

data/app/models/effective/fee.rb

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

data/app/models/effective/membership.rb

@@ -26,7 +26,7 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(owner: [:fees, :membership]) }
+    scope :deep, -> { includes(:membership_categories) }
     scope :sorted, -> { order(:id) }
 
     scope :with_paid_fees_through, -> (period = nil) {

data/config/routes.rb

@@ -27,6 +27,7 @@ EffectiveMemberships::Engine.routes.draw do
     resources :applicant_course_names, except: [:show]
 
     resources :fee_payments, only: [:index, :show]
+    resources :memberships, only: [:index]
     resources :registrar_actions, only: [:create]
   end
 

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.1.10'
+  VERSION = '0.1.14'
 end

data/lib/effective_memberships.rb

@@ -1,5 +1,4 @@
 require 'effective_resources'
-require 'effective_datatables'
 require 'effective_memberships/engine'
 require 'effective_memberships/version'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.14
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-28 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -216,6 +216,7 @@ files:
 - app/controllers/admin/categories_controller.rb
 - app/controllers/admin/fee_payments_controller.rb
 - app/controllers/admin/fees_controller.rb
+- app/controllers/admin/memberships_controller.rb
 - app/controllers/admin/registrar_actions_controller.rb
 - app/controllers/effective/applicant_references_controller.rb
 - app/controllers/effective/applicants_controller.rb
@@ -227,6 +228,7 @@ files:
 - app/datatables/admin/effective_fee_payments_datatable.rb
 - app/datatables/admin/effective_fees_datatable.rb
 - app/datatables/admin/effective_membership_histories_datatable.rb
+- app/datatables/admin/effective_memberships_datatable.rb
 - app/datatables/effective_applicant_courses_datatable.rb
 - app/datatables/effective_applicant_educations_datatable.rb
 - app/datatables/effective_applicant_experiences_datatable.rb