effective_memberships 0.1.6 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94c86611361e96c3285e00fde6075fcffa29463c30a7dd2b50eaec13b9932874
-  data.tar.gz: faaa7786c43295547b10febc3c6f55b1e4041235d693f6f7e02094c22780f5af
+  metadata.gz: f2fa9825b98ff831e92982093f101688968d4a9de0e1b61bd40d30b4ecdc508a
+  data.tar.gz: 3099497fce47b55f6d47009e5637aac7fdc70990f2bccd4d5d08cd448b7982a3
 SHA512:
-  metadata.gz: b9c66aaa1fe570f885d5b36b83f733cf15f8b4d3e2a1968d5bd4db197cbddd33a91247405a60fde9ab5dbde210de04119d3f51594baf09946a7ebdcc8c29029d
-  data.tar.gz: 3b36dee1f865804437f63415680c49c131b9ee94a4ae7f8e31e2df789268ae413e43ea8db3ea8c8548e352a63cf33273b508832dcd1eb476ae877c19c8bcdc50
+  metadata.gz: 1ea91efb59aa3d7408a76fbc463febca221f0150f83964361a72aa2c79ae8f14071be1fd91ef6e060dcdd2d08d36edb74c369b6287d2698722000b80ffce02c6
+  data.tar.gz: 826d97b4c4f2fc50cd30dde0b0bbccf2eefdea7c2e1fc73c27e87916ae64a07a00d0d74e2b775cf41b8e2f55268403885a92e3fc932969ed350aa0fde1893737

data/app/controllers/admin/registrar_actions_controller.rb

@@ -14,6 +14,10 @@ module Admin
       success: -> { "#{resource.owner} has been reclassified to #{resource.owner.membership.category}" },
       redirect: -> { admin_owners_path(resource) }
 
+    submit :assign, 'Assign',
+      success: -> { "#{resource.owner} has been assigned to #{resource.owner.membership.categories.to_sentence}" },
+      redirect: -> { admin_owners_path(resource) }
+
     submit :remove, 'Remove',
       success: -> { "#{resource.owner} has been removed" },
       redirect: -> { admin_owners_path(resource) }

data/app/controllers/effective/fee_payments_controller.rb

@@ -16,6 +16,10 @@ module Effective
       end
     end
 
+    after_save do
+      flash.now[:success] = ''
+    end
+
     private
 
     def permitted_params

data/app/datatables/admin/effective_membership_histories_datatable.rb

@@ -14,7 +14,15 @@ module Admin
 
       col :number
 
-      col :categories, label: 'Category'
+      col :categories, label: 'Category' do |history|
+        history.categories.map.with_index do |category, index|
+          category_id = history.category_ids[index]
+          link = link_to(category, effective_memberships.edit_admin_category_path(category_id))
+
+          content_tag(:div, link, class: 'col-resource_item')
+        end.join.html_safe
+      end
+
       col :category_ids, visible: false
 
       col :bad_standing

data/app/models/concerns/effective_memberships_applicant.rb

@@ -247,6 +247,12 @@ module EffectiveMembershipsApplicant
       validates :declare_truth, acceptance: true
     end
 
+    # Billing Step
+    validate(if: -> { current_step == :billing && owner.present? }) do
+      self.errors.add(:base, "must have a billing address") unless owner.billing_address.present?
+      self.errors.add(:base, "must have an email") unless owner.email.present?
+    end
+
     # Admin Approve
     validate(if: -> { approved_membership_date.present? }) do
       if approved_membership_date.to_date > Time.zone.now.to_date
@@ -453,12 +459,17 @@ module EffectiveMembershipsApplicant
 
   def find_or_build_submit_order
     order = submit_order || orders.build(user: owner)
+    fees = submit_fees()
 
     # Adds fees, but does not overwrite any existing price.
-    submit_fees.each do |fee|
+    fees.each do |fee|
       order.add(fee) unless order.purchasables.include?(fee)
     end
 
+    order.purchasables.each do |purchasable|
+      order.remove(purchasable) unless fees.include?(purchasable)
+    end
+
     # From Billing Step
     order.billing_address = owner.billing_address if owner.billing_address.present?
 

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -110,6 +110,12 @@ module EffectiveMembershipsFeePayment
       validates :declare_truth, acceptance: true
     end
 
+    # Billing Step
+    validate(if: -> { current_step == :billing && owner.present? }) do
+      self.errors.add(:base, "must have a billing address") unless owner.billing_address.present?
+      self.errors.add(:base, "must have an email") unless owner.email.present?
+    end
+
     # Clear required steps memoization
     after_save { @_required_steps = nil }
 
@@ -205,17 +211,22 @@ module EffectiveMembershipsFeePayment
 
   # We take over the owner's outstanding fees.
   def find_or_build_submit_fees
-    Array(outstanding_fees).each { |fee| fees << fee }
+    Array(outstanding_fees).each { |fee| fees << fee unless fees.include?(fee) }
     submit_fees
   end
 
   def find_or_build_submit_order
     order = submit_order || orders.build(user: owner)
+    fees = submit_fees()
 
-    submit_fees.each do |fee|
+    fees.each do |fee|
       order.add(fee) unless order.purchasables.include?(fee)
     end
 
+    order.purchasables.each do |purchasable|
+      order.remove(purchasable) unless fees.include?(purchasable)
+    end
+
     order.billing_address = owner.billing_address if owner.billing_address.present?
 
     order

data/app/models/concerns/effective_memberships_owner.rb

@@ -103,6 +103,10 @@ module EffectiveMembershipsOwner
     membership_histories.find { |history| history.removed? }.start_on
   end
 
+  def registrar_action_categories(action)
+    EffectiveMemberships.Category.sorted.all
+  end
+
   # Instance Methods
   def additional_fee_attributes(fee)
     raise('expected an Effective::Fee') unless fee.kind_of?(Effective::Fee)
@@ -177,6 +181,8 @@ module EffectiveMembershipsOwner
       late_on: nil,
       bad_standing_on: nil
     )
+
+    fee
   end
 
   def build_renewal_fee(category:, period:, late_on:, bad_standing_on:)

data/app/models/effective/registrar_action.rb

@@ -17,6 +17,9 @@ module Effective
     attr_accessor :membership_number
     attr_accessor :skip_fees
 
+    # Assign
+    attr_accessor :category_ids
+
     # All Action Validations
     validates :current_action, presence: true
     validates :current_user, presence: true
@@ -29,10 +32,27 @@ module Effective
     validates :category_id, presence: true,
       if: -> { current_action == :reclassify || current_action == :register }
 
+    validates :category_ids, presence: true, if: -> { current_action == :assign }
+
     def to_s
       'action'
     end
 
+    def register!
+      update!(current_action: :register)
+      EffectiveMemberships.Registrar.register!(owner, to: category, number: membership_number.presence, skip_fees: skip_fees?)
+    end
+
+    def reclassify!
+      update!(current_action: :reclassify)
+      EffectiveMemberships.Registrar.reclassify!(owner, to: category, skip_fees: skip_fees?)
+    end
+
+    def assign!
+      update!(current_action: :assign)
+      EffectiveMemberships.Registrar.assign!(owner, categories: categories, number: membership_number.presence)
+    end
+
     def good_standing!
       update!(current_action: :good_standing)
       EffectiveMemberships.Registrar.good_standing!(owner)
@@ -43,11 +63,6 @@ module Effective
       EffectiveMemberships.Registrar.bad_standing!(owner, reason: bad_standing_reason)
     end
 
-    def reclassify!
-      update!(current_action: :reclassify)
-      EffectiveMemberships.Registrar.reclassify!(owner, to: category, skip_fees: skip_fees?)
-    end
-
     def fees_paid!
       update!(current_action: :fees_paid)
       EffectiveMemberships.Registrar.fees_paid!(owner)
@@ -58,11 +73,6 @@ module Effective
       EffectiveMemberships.Registrar.remove!(owner)
     end
 
-    def register!
-      update!(current_action: :register)
-      EffectiveMemberships.Registrar.register!(owner, to: category, number: membership_number.presence, skip_fees: skip_fees?)
-    end
-
     def update!(atts)
       assign_attributes(atts); save!
     end
@@ -89,6 +99,10 @@ module Effective
       EffectiveMemberships.Category.find(@category_id) if @category_id
     end
 
+    def categories
+      EffectiveMemberships.Category.where(id: @category_ids) if @category_ids
+    end
+
     def skip_fees?
       EffectiveResources.truthy?(@skip_fees)
     end

data/app/views/admin/categories/_form_renewals.html.haml

@@ -7,7 +7,7 @@
   = f.show_if(:create_renewal_fees, true) do
     - date = EffectiveMemberships.Registrar.renewal_fee_date(date: Time.zone.now)
 
-    %p Charged to members, every #{date.strftime('%B %d')}, to renew their dues.
+    %p Charged to members, every #{date.strftime('%B %e')}, to renew their dues.
     = f.price_field :renewal_fee
 
   %h3 Late Fees
@@ -17,7 +17,7 @@
     - period = EffectiveMemberships.Registrar.current_period
     - date = EffectiveMemberships.Registrar.late_fee_date(period: period)
 
-    %p Charged to members, on #{date.strftime('%B %d')}, with outstanding renewal fees
+    %p Charged to members, on #{date.strftime('%B %e')}, with outstanding renewal fees
     = f.price_field :late_fee
 
   %h3 Bad Standing
@@ -27,6 +27,6 @@
     - period = EffectiveMemberships.Registrar.current_period
     - date = EffectiveMemberships.Registrar.bad_standing_date(period: period)
 
-    %p Members with outstanding fees, on #{date.strftime('%B %d')}, will automatically be marked in bad standing.
+    %p Members with outstanding fees, on #{date.strftime('%B %e')}, will automatically be marked in bad standing.
 
   = effective_submit(f)

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

@@ -0,0 +1,34 @@
+.card
+  .card-body
+    %h5.card-title Assign
+
+    = effective_form_with(model: [:admin, registrar_action], url: effective_memberships.admin_registrar_actions_path) do |f|
+      = f.hidden_field :owner_id
+      = f.hidden_field :owner_type
+
+      - membership = f.object.owner.membership
+
+      %p.text-muted
+        Assign to one or more categories.
+
+      = f.static_field :current_action, label: 'Current Categories' do
+        - Array(membership&.categories).each do |category|
+          %div= link_to(category, effective_memberships.edit_admin_category_path(category))
+
+        - if membership.blank?
+          None
+
+      = f.check_box :current_action, label: 'Yes, assign this member to categories'
+
+      = f.show_if :current_action, true do
+        - categories = f.object.owner.registrar_action_categories(:assign)
+        = f.select :category_ids, categories, label: 'Assign to', required: true, multiple: true
+
+        - if membership.present?
+          %p The member will keep their existing membership number: #{membership.number}.
+        - else
+          = f.text_field :membership_number, hint: "leave blank to assign the next number"
+
+        %p No fees will be created
+
+        = f.submit 'Assign', border: false, center: true, 'data-confirm': "Really assign #{f.object.owner}?"

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

@@ -9,13 +9,14 @@
       - membership = f.object.owner.membership
 
       - period = EffectiveMemberships.Registrar.current_period
-      - date = EffectiveMemberships.Registrar.bad_standing_date(period: period)
+      - date = (EffectiveMemberships.Registrar.bad_standing_date(period: period) rescue false)
 
       %p.text-muted
-        Members with outstanding renewal fees are automatically marked
-        not in good standing on #{date.strftime('%B %d')}.
-        The status is cleared when they pay their fees.
-        You can also mark a member as always not in good standing.
+        - if date.present?
+          Members with outstanding renewal fees are automatically marked
+          not in good standing on #{date.strftime('%B %e')}.
+          The status is cleared when they pay their fees.
+          You can also mark a member as always in bad standing.
 
       = f.static_field :current_action, label: 'Current Status' do
 

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

@@ -7,9 +7,7 @@
       = f.hidden_field :owner_type
 
       - membership = f.object.owner.membership
-
       - period = EffectiveMemberships.Registrar.current_period
-      - date = EffectiveMemberships.Registrar.bad_standing_date(period: period)
 
       %p.text-muted
         Change a member's existing category and optionally create fees.
@@ -22,7 +20,8 @@
       = f.show_if :current_action, true do
         %p The member will keep their existing membership number: #{membership.number}.
 
-        - categories = EffectiveMemberships.Category.all.where.not(id: membership.category_id)
+        - categories = f.object.owner.registrar_action_categories(:reclassify) - membership.categories
+
         = f.select :category_id, categories, label: 'Reclassify to', required: true
 
         = f.check_box :skip_fees, label: 'Yes, skip creating fees and just set the category'

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

@@ -17,7 +17,7 @@
       = f.check_box :current_action, label: 'Yes, register to a membership'
 
       = f.show_if :current_action, true do
-        - categories = EffectiveMemberships.Category.all
+        - categories = f.object.owner.registrar_action_categories(:register)
         = f.select :category_id, categories, label: 'Register to'
 
         = f.text_field :membership_number, hint: "leave blank to assign the next number"

data/app/views/effective/applicants/_layout.html.haml

@@ -1,3 +1,3 @@
 .row
-  .col-lg-3= render_wizard_sidebar(resource)
+  .col-lg-3.mb-3= render_wizard_sidebar(resource)
   .col-lg-9= yield

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

@@ -1,3 +1,3 @@
 .row
-  .col-lg-3= render_wizard_sidebar(resource)
+  .col-lg-3.mb-3= render_wizard_sidebar(resource)
   .col-lg-9= yield

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

@@ -4,11 +4,12 @@
   - raise('expected a submitted fee_payment') unless resource.was_submitted?
   - raise('expected a purchased fee_payment submit_order') unless resource.submit_order&.purchased?
 
-  .alert.alert-success.mb-4
-    Fee successfully paid on
-    = resource.submit_order.purchased_at.strftime('%F')
+  .alert.alert-warning.mb-4
+    Successfully paid on #{resource.submit_order.purchased_at.strftime('%F')}.
+
+  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
 
   = render 'effective/fee_payments/fee_payment', fee_payment: resource
   = render 'effective/fee_payments/orders', fee_payment: resource
 
-  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary btn-block'
+  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary'

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

@@ -7,11 +7,11 @@
 - if membership.present?
   - if membership.category.create_renewal_fees?
     - date = EffectiveMemberships.Registrar.renewal_fee_date(date: Time.zone.now)
-    %p Annual fees become available for purchase on #{date.strftime('%B %d')} of each year.
+    %p Annual fees become available for purchase on #{date.strftime('%B %e')} of each year.
 
   - if membership.category.create_late_fees?
     - date = EffectiveMemberships.Registrar.late_fee_date(date: Time.zone.now)
-    %p Late fees will be applied on #{date.strftime('%B %d')}.
+    %p Late fees will be applied on #{date.strftime('%B %e')}.
 
 - if fees.present?
   .alert.alert-warning.mb-3 You have #{pluralize(fees.length , 'outstanding fee')}.

data/lib/effective_memberships/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2021-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -282,6 +282,7 @@ files:
 - app/views/admin/fees/_form.html.haml
 - app/views/admin/memberships/_status.html.haml
 - app/views/admin/registrar_actions/_form.html.haml
+- app/views/admin/registrar_actions/_form_assign.html.haml
 - app/views/admin/registrar_actions/_form_bad_standing.html.haml
 - app/views/admin/registrar_actions/_form_fees_paid.html.haml
 - app/views/admin/registrar_actions/_form_reclassify.html.haml