effective_memberships 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99f08d66833ddda5de88911b43a3bdbeec7a3c8471a8018612dad529c577d8bd
-  data.tar.gz: 0de87e5740113cde0a6dc6447eae0d53341637b6eeac1787ec233dceeab5b50c
+  metadata.gz: 94c86611361e96c3285e00fde6075fcffa29463c30a7dd2b50eaec13b9932874
+  data.tar.gz: faaa7786c43295547b10febc3c6f55b1e4041235d693f6f7e02094c22780f5af
 SHA512:
-  metadata.gz: 4e7dbbdfccb1c6dc0f0c30f15c58fa04a82a556cf00d9ad00e252fcfd99c29c5b74a973a694c9447f19cf1b114d15a59decc1ac52049fc3019425c252938f7b7
-  data.tar.gz: '0683eee612f3d51e1024c118813cce613a3f5715c2959ac09b7cbea1cb000e9c17e3acfced1deaf28c717a6398b0d1a26622394018a2ff3f4f3225de7fb58c90'
+  metadata.gz: b9c66aaa1fe570f885d5b36b83f733cf15f8b4d3e2a1968d5bd4db197cbddd33a91247405a60fde9ab5dbde210de04119d3f51594baf09946a7ebdcc8c29029d
+  data.tar.gz: 3b36dee1f865804437f63415680c49c131b9ee94a4ae7f8e31e2df789268ae413e43ea8db3ea8c8548e352a63cf33273b508832dcd1eb476ae877c19c8bcdc50

data/app/controllers/effective/applicant_references_controller.rb

@@ -24,8 +24,9 @@ module Effective
 
     def permitted_params
       permitted = params.require(:effective_applicant_reference).permit!.except(:token, :last_notified_at, :status, :status_steps)
+      authorized = current_user.effective_memberships_owners.include?(resource.applicant.owner) == false
 
-      if resource.submitted? && resource.applicant.was_submitted? && (resource.applicant.owner != current_user.effective_memberships_owner)
+      if resource.submitted? && resource.applicant.was_submitted? && authorized
         permitted
       else
         permitted.except(:reservations, :reservations_reason, :work_history, :accept_declaration)

data/app/controllers/effective/applicants_controller.rb

@@ -4,7 +4,7 @@ module Effective
 
     include Effective::WizardController
 
-    resource_scope -> { EffectiveMemberships.Applicant.deep.where(owner: current_user.effective_memberships_owner) }
+    resource_scope -> { EffectiveMemberships.Applicant.deep.where(owner: current_user.effective_memberships_owners) }
 
     # Allow only 1 in-progress application at a time
     before_action(only: [:new, :show], unless: -> { resource&.done? }) do

data/app/controllers/effective/fee_payments_controller.rb

@@ -4,7 +4,7 @@ module Effective
 
     include Effective::WizardController
 
-    resource_scope -> { EffectiveMemberships.FeePayment.deep.where(owner: current_user.effective_memberships_owner) }
+    resource_scope -> { EffectiveMemberships.FeePayment.deep.where(owner: current_user.effective_memberships_owners) }
 
     # Allow only 1 in-progress fee payment at a time
     before_action(only: [:new, :show], unless: -> { resource&.done? }) do
@@ -20,8 +20,7 @@ module Effective
 
     def permitted_params
       params.require(:fee_payment).permit!.except(
-        :owner_id, :owner_type, :status, :status_steps, :wizard_steps,
-        :submitted_at
+        :status, :status_steps, :wizard_steps, :submitted_at
       )
     end
 

data/app/datatables/effective_applicants_datatable.rb

@@ -28,7 +28,7 @@ class EffectiveApplicantsDatatable < Effective::Datatable
   end
 
   collection do
-    EffectiveMemberships.Applicant.deep.where(owner: current_user.effective_memberships_owner)
+    EffectiveMemberships.Applicant.deep.where(owner: current_user.effective_memberships_owners)
   end
 
 end

data/app/datatables/effective_fee_payments_datatable.rb

@@ -6,24 +6,19 @@ class EffectiveFeePaymentsDatatable < Effective::Datatable
     col :token, visible: false
     col :created_at, visible: false
 
-    col :status
-    col :period, visible: false
+    col :owner
+    col :status, visible: false
     col :submitted_at, label: 'Submitted', as: :date
+    col :period, visible: false
 
-    col :orders
+    col :orders, action: :show
 
-    actions_col(show: false) do |fee_payment|
-      if fee_payment.draft?
-        dropdown_link_to('Continue', effective_memberships.fee_payment_build_path(fee_payment, fee_payment.next_step), 'data-turbolinks' => false)
-        dropdown_link_to('Delete', effective_memberships.fee_payment_path(fee_payment), 'data-confirm': "Really delete #{fee_payment}?", 'data-method': :delete)
-      else
-        dropdown_link_to('Show', effective_memberships.fee_payment_path(fee_payment))
-      end
-    end
+    actions_col(new: false)
   end
 
   collection do
-    EffectiveMemberships.FeePayment.deep.where(owner: current_user.effective_memberships_owner)
+    EffectiveMemberships.FeePayment.deep.done
+      .where(owner: current_user.effective_memberships_owners)
   end
 
 end

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -244,7 +244,6 @@ module EffectiveMembershipsFeePayment
     save!
   end
 
-
   # Called automatically via after_purchase hook above
   def submit_purchased!
     return false if was_submitted?

data/app/models/concerns/effective_memberships_owner.rb

@@ -46,7 +46,23 @@ module EffectiveMembershipsOwner
   end
 
   def effective_memberships_owner
-    self
+    raise('expected singular usage but there are more than one owner') if effective_memberships_owners.length > 1
+    effective_memberships_owners.first
+  end
+
+  def effective_memberships_owners
+    owners = users if respond_to?(:users) && users.any? { |user| user.class.respond_to?(:effective_memberships_owner?) }
+    owners = organizations if respond_to?(:organizations) && organizations.any? { |organization| organization.class.respond_to?(:effective_memberships_owner?) }
+
+    owners || [self]
+  end
+
+  def outstanding_fee_payment_owners
+    effective_memberships_owners.select { |owner| !owner.membership_fees_paid? }
+  end
+
+  def current_fee_payment_owner
+    outstanding_fee_payment_owners.first || self
   end
 
   def owner_label

data/app/views/effective/fee_payments/_dashboard.html.haml

@@ -1,6 +1,4 @@
-- authorized = EffectiveResources.authorized?(self, :new, EffectiveMemberships.FeePayment)
-- datatable = EffectiveResources.best('EffectiveFeePaymentsDatatable').new(self)
-- in_progress = current_user.effective_memberships_owner.fee_payments.in_progress
+- datatable = EffectiveResources.best('EffectiveFeePaymentsDatatable').new(self, namespace: :effective)
 
 %h2 Fee Payments
 

data/app/views/effective/fee_payments/start.html.haml

@@ -2,19 +2,33 @@
 
   .card
     .card-body
-      %p Welcome #{current_user.effective_memberships_owner}!
+      - current_owner = current_user.current_fee_payment_owner
+
+      %p Welcome #{current_owner}!
 
       = render 'effective/fee_payments/content', resource: resource
 
-      - if resource.outstanding_fees.blank?
+      - if current_owner.membership_fees_paid?
         %p You have no fees due at this time.
         = link_to 'Home', root_path, class: 'btn btn-primary'
 
-      - if resource.outstanding_fees.present?
-        %p You have the following fees due at this time:
+      - else
+        - if resource.outstanding_fees.present?
+          %p You have the following fees due at this time:
+          = render_purchasables(resource.outstanding_fees)
+        - else
+          %p You have fees due. Please continue.
 
-        = render_purchasables(resource.outstanding_fees)
+        - resource.user = current_user
+        - resource.owner = current_owner
 
         = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
           = f.hidden_field :id
+
+          = f.hidden_field :owner_type
+          = f.hidden_field :owner_id
+
+          = f.hidden_field :user_type
+          = f.hidden_field :user_id
+
           = f.save 'Save and Continue'

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails