effective_memberships 0.1.8 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '017428f74b7a9dd16e4d16a8a256ca2cbf510252266908134034cc56eb651c42'
-  data.tar.gz: be01e2eb2f76608ae46b1cfbed55225c3e32f035345e32912db4fcba901da1c4
+  metadata.gz: 9ea458f58ff630eeb58b9dbcb54a1f0be52e8bb0ce6e6b5fc7077acad2603a9a
+  data.tar.gz: 839ca3fd8147a2cd0008f741a1ab273698c31ba9a51a13922852bc81fe80ee3e
 SHA512:
-  metadata.gz: 84ccc24c2f09182b1288da31693dde5500478aa4eb9ba3fe58320a12fd85e113df9eaa7b7e954cf39fad473377ea72d855d2e959f89fdc7c5746f4314bdf9258
-  data.tar.gz: 15e78208b04cc08f90f09056b7fb5a5df92b3b1b55255734751501ca9fe3a2572ddf5448bf5f09139ee0c6b08f133451ed19a2232d8d3cbe5954ddcfddc20102
+  metadata.gz: 7510adce20ca23cbb8cb926f2f97f078535fb53fb5c5b7ac0f98daf475548ee7197cffdb3b1109ad59b60e0f0905567a8f161c01d16b74a342d715c79ee86a6e
+  data.tar.gz: 0f7e83c51b5065c69855b58b04dd69109352e5ca4b29655b156ef10cf580dd79e817544a3637f73647d6b0eb1fa3c2e37ed1654a77ebd271bb8bdf695acf7dd2

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

@@ -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
@@ -467,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

@@ -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 }
 
@@ -223,6 +229,8 @@ module EffectiveMembershipsFeePayment
 
     order.billing_address = owner.billing_address if owner.billing_address.present?
 
+    order.save
+
     order
   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/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_bad_standing.html.haml

@@ -14,7 +14,7 @@
       %p.text-muted
         - if date.present?
           Members with outstanding renewal fees are automatically marked
-          not in good standing on #{date.strftime('%B %d')}.
+          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.
 

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/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.8'
+  VERSION = '0.1.12'
 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.8
+  version: 0.1.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2022-01-04 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