effective_memberships 0.4.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 223d0bdf9ce08beacd79d4fdeb3e184878bb9e9cdb8b5964aa1c4ace9f1d2735
-  data.tar.gz: 158b570a8dc933b247245e450c74a78c63877ece8f35a59b1e400b0fdb017b43
+  metadata.gz: 1de9f1b37bb81729fcb68686af4113263a847742ef6c763679c74ad75e0633ca
+  data.tar.gz: 930ceb5ab018318e39331a02d9fbf725129b997c09d5019fc8a3bb03e7e916e4
 SHA512:
-  metadata.gz: b8e3fe9641f2826a4df557f1817163d719bb53112a835b3a5456ea7020283f360e4bcdc99d75c1a79256f6515b2fa05f5a2c0001b6eb1ecfa988dd09eba8eb5d
-  data.tar.gz: 013d39152828dce9d873e1eb1f1bb9f3a42aa83fc31105e020adbd47734f42902eec0659ff661b1fd4e8bd1983a389374848847221b6aec35dcbb8bfb5552661
+  metadata.gz: 3872b4f4e30ec2e6c2f5a3068cfcb2dc5fbcadd557cf1146942f95dfd6663b04d586cf6137990b2742e410e8eac6b36a0d6f05b15ed537ef0a7aec1328b68dcf
+  data.tar.gz: 8806de111fc454554070e6d93213ce3a6c0f2bb6db1dd0bf4b5d07f4f9d352014be9f1da1ae078d1a0f99653be5613834449fccadebe02e67b55bf1512162848

data/app/controllers/admin/membership_histories_controller.rb

@@ -0,0 +1,24 @@
+module Admin
+  class MembershipHistoriesController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_memberships) }
+
+    include Effective::CrudController
+
+    submit :save, 'Update History',
+      success: -> { "Membership history successfully updated. Please double check the history is correct." },
+      redirect: -> { admin_owners_path(resource) }
+
+    private
+
+    def permitted_params
+      model = (params.key?(:effective_membership_history) ? :effective_membership_history : :membership_history)
+      params.require(model).permit!
+    end
+
+    def admin_owners_path(resource)
+      Effective::Resource.new(resource.owner, namespace: :admin).action_path(:edit) + '?tab=membership'
+    end
+
+  end
+end

data/app/controllers/admin/memberships_controller.rb

@@ -5,5 +5,20 @@ module Admin
 
     include Effective::CrudController
 
+    submit :save, 'Update Membership',
+      success: -> { "#{resource.owner} has been successfully updated. Please double check the membership history is correct" },
+      redirect: -> { admin_owners_path(resource) }
+
+    private
+
+    def permitted_params
+      model = (params.key?(:effective_membership) ? :effective_membership : :membership)
+      params.require(model).permit!
+    end
+
+    def admin_owners_path(resource)
+      Effective::Resource.new(resource.owner, namespace: :admin).action_path(:edit) + '?tab=membership'
+    end
+
   end
 end

data/app/controllers/admin/organizations_controller.rb

@@ -6,7 +6,7 @@ module Admin
     include Effective::CrudController
 
     resource_scope -> { EffectiveMemberships.Organization.deep.all }
-    datatable -> { EffectiveResources.best('Admin::EffectiveMembershipsDatatable').new }
+    datatable -> { EffectiveResources.best('Admin::EffectiveOrganizationsDatatable').new }
 
     private
 

data/app/controllers/effective/applicant_references_controller.rb

@@ -25,7 +25,7 @@ module Effective
     def permitted_params
       permitted = params.require(:effective_applicant_reference).permit!.except(:token, :last_notified_at, :status, :status_steps)
 
-      if current_user && current_user.effective_memberships_owners.include?(resource.applicant&.owner)
+      if current_user && current_user.memberships_owners.include?(resource.applicant&.owner)
         permitted.except(:reservations, :reservations_reason, :work_history, :accept_declaration)
       else
         permitted

data/app/datatables/admin/effective_applicant_references_datatable.rb

@@ -1,31 +1,33 @@
-class Admin::EffectiveApplicantReferencesDatatable < Effective::Datatable
+module Admin
+  class EffectiveApplicantReferencesDatatable < Effective::Datatable
 
-  datatable do
-    order :name
+    datatable do
+      order :name
 
-    col :applicant
+      col :applicant
 
-    col :name
-    col :email
-    col :phone
+      col :name
+      col :email
+      col :phone
 
-    col :status do |reference|
-      if reference.submitted?
-        'Waiting on response'
-      elsif reference.completed?
-        'Completed'
+      col :status do |reference|
+        if reference.submitted?
+          'Waiting on response'
+        elsif reference.completed?
+          'Completed'
+        end
+      end
+
+      col :last_notified_at do |reference|
+        reference.last_notified_at&.strftime('%F') unless reference.completed?
       end
-    end
 
-    col :last_notified_at do |reference|
-      reference.last_notified_at&.strftime('%F') unless reference.completed?
+      actions_col
     end
 
-    actions_col
-  end
+    collection do
+      Effective::ApplicantReference.deep.all
+    end
 
-  collection do
-    Effective::ApplicantReference.deep.all
   end
-
 end

data/app/datatables/admin/effective_fees_datatable.rb

@@ -49,8 +49,8 @@ module Admin
 
       raise('expected an owner_id, not user_id') if attributes[:user_id].present?
 
-      if attributes[:owner_id]
-        scope = scope.where(owner_id: attributes[:owner_id])
+      if attributes[:owner_id] && attributes[:owner_type]
+        scope = scope.where(owner_id: attributes[:owner_id], owner_type: attributes[:owner_type])
       end
 
       if attributes[:applicant_id]

data/app/datatables/admin/effective_membership_histories_datatable.rb

@@ -12,8 +12,6 @@ module Admin
 
       col :owner
 
-      col :number
-
       col :categories, label: 'Category' do |history|
         history.categories.map.with_index do |category, index|
           category_id = history.category_ids[index]
@@ -23,6 +21,8 @@ module Admin
         end.join.html_safe
       end
 
+      col :number
+
       col :category_ids, visible: false
 
       col :bad_standing
@@ -35,7 +35,11 @@ module Admin
       raise('expected an owner_id, not user_id') if attributes[:user_id].present?
 
       scope = Effective::MembershipHistory.deep.all
-      scope = scope.where(owner_id: attributes[:owner_id]) if attributes[:owner_id]
+
+      if attributes[:owner_id] && attributes[:owner_type]
+        scope = scope.where(owner_id: attributes[:owner_id], owner_type: attributes[:owner_type])
+      end
+
       scope
     end
 

data/app/datatables/admin/effective_memberships_datatable.rb

@@ -69,8 +69,8 @@ module Admin
 
       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])
+      if attributes[:owner_id].present? && attributes[:owner_type].present?
+        memberships = memberships.where(owner_id: attributes[:owner_id], owner_type: attributes[:owner_type])
       end
 
       memberships

data/app/models/concerns/effective_memberships_owner.rb

@@ -265,4 +265,48 @@ module EffectiveMembershipsOwner
     membership_histories.find { |history| (history.start_on..history.end_on).cover?(date) } # Ruby 2.6 supports endless ranges
   end
 
+  # Point out busted data
+  def membership_history_errors
+    return unless membership.present?
+    return unless membership_histories.present?
+
+    errors = []
+    history = membership_histories.first
+    last_history = membership_histories.last
+
+    # Check membership joined on date matches first history start date
+    if membership.joined_on != history.start_on
+      errors << "The joined date #{membership.joined_on.strftime('%F')} does not match the first history start date of #{history.start_on.strftime('%F')}. Please change the first history start date to #{membership.joined_on.strftime('%F')} or update the joined date above."
+    end
+
+    # Check that there is a membership history row if the registered date is unique
+    if membership.joined_on != membership.registration_on && membership_histories.none? { |mh| mh.start_on == membership.registration_on }
+      errors << "The registered date #{membership.registration_on.strftime('%F')} is missing a history with this date. Please create a history with a start date of #{membership.registration_on.strftime('%F')} or update the registered date above."
+    end
+
+    # Check numbers
+    if membership.number.present? && membership_histories.none? { |history| history.number == membership.number }
+      errors << "The membership number ##{membership.number} is missing a history with this number. Please create a history with the #{membership.number} number or update the membership number above."
+    end
+
+    # Check that the last history does not have an end_on date
+
+    if last_history.end_on.present? && !last_history.removed?
+      errors << "The most recent history must have a blank end date. Please remove the end date of the most recent history entry or create another history."
+    elsif membership_histories.any? { |history| history.end_on.blank? && history != last_history }
+      errors << "The end date must be present for all past histories. Please add the end date to all histories, except the most recent history."
+    elsif !membership_history_continuous?
+      errors << "The start and end dates are overlapping or non-continuous. Please make sure each history start date has a matching history end date"
+    end
+
+    errors
+  end
+
+  def membership_history_continuous?
+    membership_histories.all? do |history|
+      history.end_on.blank? || (history.end_on.present? && history.removed?) || membership_histories.find { |h| h.start_on == history.end_on }.present?
+    end
+  end
+
+
 end

data/app/models/concerns/effective_memberships_registrar.rb

@@ -207,9 +207,10 @@ module EffectiveMembershipsRegistrar
     save!(owner, date: date)
   end
 
-  def fees_paid!(owner, date: nil)
+  def fees_paid!(owner, date: nil, order_attributes: nil)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('expected a member') unless owner.membership.present?
+    raise('expected a Hash of attributes') if order_attributes.present? && !order_attributes.kind_of?(Hash)
 
     # Date
     date ||= Time.zone.now
@@ -219,6 +220,7 @@ module EffectiveMembershipsRegistrar
 
     if owner.outstanding_fee_payment_fees.present?
       order = Effective::Order.new(items: owner.outstanding_fee_payment_fees, user: owner)
+      order.assign_attributes(order_attributes) if order_attributes.present?
       order.mark_as_purchased!
     end
 

data/app/models/effective/membership.rb

@@ -2,6 +2,8 @@ module Effective
   class Membership < ActiveRecord::Base
     belongs_to :owner, polymorphic: true
 
+    attr_accessor :current_action
+
     has_many :membership_categories, -> { order(:id) }, inverse_of: :membership, dependent: :delete_all
     accepts_nested_attributes_for :membership_categories
 
@@ -54,7 +56,10 @@ module Effective
 
     before_validation do
       self.registration_on ||= joined_on
-      self.number_as_integer ||= (Integer(number) rescue nil)
+    end
+
+    before_validation(if: -> { number_changed? }) do
+      self.number_as_integer = (Integer(number) rescue nil)
     end
 
     validates :number, presence: true, uniqueness: true
@@ -66,12 +71,29 @@ module Effective
       self.errors.add(:owner_id, 'must be a memberships owner') unless owner.class.effective_memberships_owner?
     end
 
+    validate(if: -> { registration_on.present? && joined_on.present? }) do
+      self.errors.add(:registration_on, 'must match or be greater than the joined date') if registration_on < joined_on
+    end
+
     def self.max_number
       maximum('number_as_integer') || 0
     end
 
     def to_s
-      'membership'
+      return 'membership' if owner.blank?
+
+      summary = [
+        owner.to_s,
+        'is',
+        (categories.to_sentence),
+        'member',
+        "##{number_was}",
+        "who joined #{joined_on&.strftime('%F') || '-'}",
+        ("and last registered #{registration_on.strftime('%F')}" if registration_on > joined_on),
+        (". Membership is Not In Good Standing because #{bad_standing_reason}" if bad_standing?)
+      ].compact.join(' ')
+
+      (summary + '.').html_safe
     end
 
     # We can't use the polymorphic has_many. So this is a helper.

data/app/models/effective/membership_history.rb

@@ -36,5 +36,20 @@ module Effective
       'membership history'
     end
 
+    # These two accessors are for the memberships history form.
+    # But we just assign categories and category_ids directly in registrar.
+    def membership_categories
+      category_ids.present? ? EffectiveMemberships.Category.where(id: category_ids) : []
+    end
+
+    def membership_category_ids
+      membership_categories.map(&:id)
+    end
+
+    def membership_category_ids=(ids)
+      categories = EffectiveMemberships.Category.where(id: ids)
+      assign_attributes(categories: categories.map(&:to_s), category_ids: categories.map(&:id))
+    end
+
   end
 end

data/app/models/effective/registrar_action.rb

@@ -20,6 +20,12 @@ module Effective
     # Assign
     attr_accessor :category_ids
 
+    # Mark Fees Paid - Order Attributes
+    attr_accessor :payment_provider
+    attr_accessor :payment_card
+    attr_accessor :note_to_buyer
+    attr_accessor :note_internal
+
     # All Action Validations
     validates :current_action, presence: true
     validates :current_user, presence: true
@@ -65,7 +71,7 @@ module Effective
 
     def fees_paid!
       update!(current_action: :fees_paid)
-      EffectiveMemberships.Registrar.fees_paid!(owner)
+      EffectiveMemberships.Registrar.fees_paid!(owner, order_attributes: order_attributes)
     end
 
     def remove!
@@ -103,6 +109,15 @@ module Effective
       EffectiveMemberships.Category.where(id: @category_ids) if @category_ids
     end
 
+    def order_attributes
+      {
+        payment_provider: @payment_provider.presence,
+        payment_card: @payment_card.presence,
+        note_to_buyer: @note_to_buyer.presence,
+        note_internal: @note_internal.presence
+      }.compact
+    end
+
     def skip_fees?
       EffectiveResources.truthy?(@skip_fees)
     end

data/app/views/admin/membership_histories/_form.html.haml

@@ -0,0 +1,19 @@
+= effective_form_with(model: [:admin, membership_history], engine: true) do |f|
+  - if inline_datatable?
+    = f.hidden_field :owner_id
+    = f.hidden_field :owner_type
+  - else
+    - raise('todo')
+    - collection = EffectiveMembershipsOwner.descendants.map { |d| [d.name.to_s, d.members.sorted] }.to_h
+    = f.select :owner_id, collection, polymorphic: true
+
+  = f.date_field :start_on, hint: 'The start date of this period in history. Must be present.'
+
+  = f.date_field :end_on, hint: 'The end date of this period in history. Must be present for all past histories. Must be blank in the most recent history, unless membership removed.'
+  = f.text_field :number, hint: 'The membership number'
+  = f.select :membership_category_ids, EffectiveMemberships.Category.all.sorted, label: 'Membership Categories', hint: 'The membership category or categories held during this period in history.'
+
+  = f.check_box :bad_standing, hint: 'Membership in bad standing'
+  = f.check_box :removed, hint: 'Membership removed'
+
+  = f.submit 'Update History', border: false, center: true, 'data-confirm': "Really update #{f.object.owner}?"

data/app/views/admin/membership_histories/_validation.html.haml

@@ -0,0 +1,7 @@
+- raise('expected a memberships owner with a membership') unless owner.present? && owner.try(:membership).present?
+
+- errors = owner.membership_history_errors
+
+- if errors.present?
+  - errors.each do |error|
+    .mb-2.alert.alert-warning= error

data/app/views/admin/memberships/_form.html.haml

@@ -0,0 +1,17 @@
+- membership ||= owner.membership
+- owner ||= membership.owner
+
+- if membership.present?
+  = card('Member Information') do
+    = render 'admin/memberships/form_membership', membership: membership
+
+  = card('History') do
+    = render 'admin/membership_histories/validation', owner: owner
+    = render_datatable(Admin::EffectiveMembershipHistoriesDatatable.new(owner: owner), inline: true, simple: true)
+
+- # Always render this one
+= render 'admin/registrar_actions/form', owner: owner
+
+- if membership.blank? && owner.membership_histories.present?
+  = card('History') do
+    = render_datatable(Admin::EffectiveMembershipHistoriesDatatable.new(owner: owner), inline: true, simple: true)

data/app/views/admin/memberships/_form_membership.html.haml

@@ -0,0 +1,22 @@
+= effective_form_with(model: [:admin, membership], engine: true) do |f|
+  = f.hidden_field :owner_id
+  = f.hidden_field :owner_type
+
+  %p.text-muted
+    Change a member's information.
+
+  - f.object.current_action = true if f.errors.present?
+
+  = f.static_field :current_action, label: 'Current Membership' do
+    = membership.to_s
+
+  = f.check_box :current_action, label: 'Yes, update membership information'
+
+  = f.show_if :current_action, true do
+    = f.date_field :joined_on, label: 'Joined', hint: 'When the member first received any membership category'
+    = f.date_field :registration_on, label: 'Registered', hint: 'When the membership category last changed'
+    = f.text_field :number, hint: 'The membership number. Must be unique.'
+
+    %p.text-muted To update the current membership categories, use the 'Assign' or 'Reclassify' actions below
+
+    = f.submit 'Update Membership', border: false, center: true, 'data-confirm': "Really update #{f.object.owner}?"

data/app/views/admin/registrar_actions/_form_fees_paid.html.haml

@@ -25,6 +25,22 @@
       = f.check_box :current_action, label: 'Yes, mark this members fees paid in full'
 
       = f.show_if :current_action, true do
+        - if fees.blank?
+          %p There are no outstanding fee payment fees, so no order will be created.
+        - else
+          %p An order will be created and marked as paid with the following information:
+
+          = f.select :payment_provider, EffectiveOrders.admin_payment_providers, required: true
+
+          = f.text_field :payment_card,
+            label: 'Payment card type, cheque or transaction number',
+            hint: 'Do not enter credit card numbers here, or anywhere.'
+
+          .row
+            .col
+              = f.text_area :note_to_buyer, hint: 'This message will be displayed to the buyer on the receipt.'
+            .col
+              = f.text_area :note_internal, hint: 'For or internal admin use only. This note will never be displayed to the buyer.'
 
         = f.submit 'Mark Fees Paid', border: false, center: true,
           'data-confirm': "Really mark #{f.object.owner} fees paid?"

data/app/views/effective/membership_cards/index.html.haml

@@ -1,4 +1,4 @@
-- owners = current_user.effective_memberships_owners
+- owners = current_user.memberships_owners
 
 - owners.each do |owner|
   - membership = owner.membership

data/config/routes.rb

@@ -43,7 +43,8 @@ EffectiveMemberships::Engine.routes.draw do
     resources :applicant_course_names, except: [:show]
 
     resources :fee_payments, only: [:index, :show]
-    resources :memberships, only: [:index]
+    resources :memberships, only: [:index, :update]
+    resources :membership_histories, except: [:show]
     resources :registrar_actions, only: [:create]
 
     resources :organizations, except: [:show] do

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.4.0'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -247,6 +247,7 @@ files:
 - app/controllers/admin/categories_controller.rb
 - app/controllers/admin/fee_payments_controller.rb
 - app/controllers/admin/fees_controller.rb
+- app/controllers/admin/membership_histories_controller.rb
 - app/controllers/admin/memberships_controller.rb
 - app/controllers/admin/organizations_controller.rb
 - app/controllers/admin/registrar_actions_controller.rb
@@ -334,6 +335,10 @@ files:
 - app/views/admin/fee_payments/_fee_payment.html.haml
 - app/views/admin/fees/_fee.html.haml
 - app/views/admin/fees/_form.html.haml
+- app/views/admin/membership_histories/_form.html.haml
+- app/views/admin/membership_histories/_validation.html.haml
+- app/views/admin/memberships/_form.html.haml
+- app/views/admin/memberships/_form_membership.html.haml
 - app/views/admin/memberships/_status.html.haml
 - app/views/admin/organizations/_fields.html.haml
 - app/views/admin/organizations/_form.html.haml