effective_memberships 0.3.5 → 0.3.9

data/app/assets/stylesheets/effective_memberships/base.scss

@@ -1,5 +1,4 @@
 .table-courses .form-group { margin-bottom: 0; }
 .table-courses th,
 .table-courses td { vertical-align: middle; ;}
-
 .table-courses-course-name { text-align: right; width: 15rem; }

data/app/controllers/effective/membership_cards_controller.rb

@@ -0,0 +1,19 @@
+module Effective
+  class MembershipCardsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+
+    include Effective::CrudController
+
+    resource_scope -> { EffectiveMemberships.MembershipCard }
+
+    def show
+      membership = Effective::Membership.find(params[:id])
+      card = resource_scope.new(membership: membership)
+
+      EffectiveResources.authorize!(self, :show, card)
+
+      send_data(card.to_pdf, filename: card.filename, type: card.content_type, disposition: 'attachment')
+    end
+
+  end
+end

data/app/datatables/admin/effective_applicants_datatable.rb

@@ -1,9 +1,10 @@
 module Admin
   class EffectiveApplicantsDatatable < Effective::Datatable
     filters do
-      scope :all
+      scope :not_draft, label: 'All'
       scope :in_progress, label: 'Open / Active'
       scope :done, label: 'Done'
+      scope :draft
     end
 
     datatable do

data/app/datatables/admin/effective_categories_datatable.rb

@@ -12,7 +12,6 @@ module Admin
       col :renewal_fee, as: :price
       col :late_fee, as: :price
       col :rich_text_body, label: 'Body'
-
       col :tax_exempt
       col :qb_item_name, visible: false
 

data/app/datatables/admin/effective_fees_datatable.rb

@@ -25,6 +25,9 @@ module Admin
 
       col :fee_type, search: EffectiveMemberships.fee_types
       col :price, as: :price
+      col :tax_exempt, visible: false
+      col :qb_item_name, visible: false
+
       col :purchased?, as: :boolean
       col :purchased_order, visible: false
 

data/app/models/concerns/effective_memberships_applicant.rb

@@ -49,6 +49,7 @@ module EffectiveMembershipsApplicant
       experience: 'Work Experience',
       references: 'References',
       files: 'Attach Files',
+      stamp: 'Professional Stamp',
       declarations: 'Declarations',
       summary: 'Review',
       billing: 'Billing Address',
@@ -93,10 +94,14 @@ module EffectiveMembershipsApplicant
     has_many :applicant_references, -> { order(:id) }, class_name: 'Effective::ApplicantReference', as: :applicant, inverse_of: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_references, reject_if: :all_blank, allow_destroy: true
 
-    has_many :fees, -> { order(:id) }, as: :parent, inverse_of: :parent, class_name: 'Effective::Fee', dependent: :nullify
+    has_many :stamps, -> { order(:id) }, class_name: 'Effective::Stamp', as: :applicant, inverse_of: :applicant, dependent: :destroy
+    accepts_nested_attributes_for :stamps, reject_if: :all_blank, allow_destroy: true
+
+    # Effective Namespace polymorphic
+    has_many :fees, -> { order(:id) }, class_name: 'Effective::Fee', as: :parent, inverse_of: :parent, dependent: :destroy
     accepts_nested_attributes_for :fees, reject_if: :all_blank, allow_destroy: true
 
-    has_many :orders, -> { order(:id) }, as: :parent, inverse_of: :parent, class_name: 'Effective::Order', dependent: :nullify
+    has_many :orders, -> { order(:id) }, class_name: 'Effective::Order', as: :parent, inverse_of: :parent, dependent: :destroy
     accepts_nested_attributes_for :orders
 
     effective_resource do
@@ -138,6 +143,8 @@ module EffectiveMembershipsApplicant
     scope :in_progress, -> { where.not(status: [:approved, :declined]) }
     scope :done, -> { where(status: [:approved, :declined]) }
 
+    scope :not_draft, -> { where.not(status: :draft) }
+
     # Set Apply to Join or Reclassification
     before_validation(if: -> { new_record? && owner.present? }) do
       self.applicant_type ||= (owner.membership.blank? ? 'Apply to Join' : 'Apply to Reclassify')
@@ -274,6 +281,9 @@ module EffectiveMembershipsApplicant
 
         applicant_steps = Array(category&.applicant_wizard_steps)
 
+        # Special logic for stamp step
+        applicant_steps.delete(:stamp) unless apply_to_join?
+
         wizard_steps.select do |step|
           required_steps.include?(step) || category.blank? || applicant_steps.include?(step)
         end
@@ -282,29 +292,30 @@ module EffectiveMembershipsApplicant
 
     # All Fees and Orders
     def submit_fees
-      fees.select { |fee| fee.applicant_submit_fee? }
-    end
-
-    def submit_order
-      orders.find { |order| order.purchasables.any?(&:applicant_submit_fee?) }
-    end
-
-    def submit_fee_qb_item_name
-      'Applicant'
-    end
+      # Find or build submit fee
+      fee = fees.first || fees.build(owner: owner, fee_type: 'Applicant')
+
+      unless fee.purchased?
+        fee.assign_attributes(
+          category: category,
+          price: category.applicant_fee,
+          tax_exempt: category.applicant_fee_tax_exempt,
+          qb_item_name: category.applicant_fee_qb_item_name
+        )
+      end
 
-    def find_or_build_submit_fees
-      return submit_fees if submit_fees.present?
+      # Update stamp price
+      stamp = stamps.first
 
-      fees.build(
-        owner: owner,
-        fee_type: 'Applicant',
-        category: category,
-        price: category.applicant_fee,
-        qb_item_name: submit_fee_qb_item_name()
-      )
+      if stamp.present? && !stamp.purchased?
+        stamp.assign_attributes(
+          price: category.stamp_fee,
+          tax_exempt: category.stamp_fee_tax_exempt,
+          qb_item_name: category.stamp_fee_qb_item_name
+        )
+      end
 
-      submit_fees
+      (fees + stamps)
     end
 
     # Draft -> Submitted requirements
@@ -314,7 +325,9 @@ module EffectiveMembershipsApplicant
 
       wizard_steps[:checkout] ||= Time.zone.now
       wizard_steps[:submitted] = Time.zone.now
+
       submitted!
+      stamps.each { |stamp| stamp.submit! }
 
       after_commit do
         applicant_references.each { |reference| reference.notify! if reference.submitted? }
@@ -409,10 +422,6 @@ module EffectiveMembershipsApplicant
     # Reset the progress so far. They have to click through screens again.
     assign_attributes(wizard_steps: wizard_steps.slice(:start, :select))
 
-    # Delete any fees and orders. Keep all other data.
-    submit_fees.each { |fee| fee.mark_for_destruction }
-    submit_order.mark_for_destruction if submit_order
-
     save!
   end
 
@@ -462,6 +471,16 @@ module EffectiveMembershipsApplicant
     category&.min_applicant_files.to_i
   end
 
+  # Stamps step
+  def stamp
+    stamps.first || stamps.build(
+      owner: owner,
+      name: owner.to_s,
+      shipping_address: (owner.try(:shipping_address) || owner.try(:billing_address)),
+      price: 0
+    )
+  end
+
   # The submit! method used to be here
   # But it needs to be inside the included do block
   # So see above. Sorry.

data/app/models/concerns/effective_memberships_card.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+# EffectiveMembershipsCard
+# Mark your card model with include EffectiveMembershipsCard to get all the includes
+
+module EffectiveMembershipsCard
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def effective_memberships_card?; true; end
+  end
+
+  included do
+    include ActiveModel::Model
+
+    attr_accessor :membership
+    validates :membership, presence: true
+  end
+
+  # Instance Methods
+  def owner
+    membership&.owner
+  end
+
+  def content_type
+    'application/pdf'
+  end
+
+  def filename
+    "#{self.class.name.split('::').first.downcase}-membership-card-#{Time.zone.now.strftime('%F')}.pdf"
+  end
+
+  def to_pdf
+    raise('is invalid') unless valid?
+
+    return pdf.render() if pdf.respond_to?(:render) # Prawn
+    return pdf.to_pdf() if pdf.respond_to?(:to_pdf) # CombinePdf
+
+    pdf
+  end
+
+  def pdf
+    @pdf ||= build_pdf()
+  end
+
+  private
+
+  def build_pdf()
+    raise('to be implemented')
+
+    # pdf = Prawn::Document.new
+    # pdf.text("Membership Card for #{membership.owner} Number #{membership.number}")
+    # pdf
+  end
+
+end

data/app/models/concerns/effective_memberships_category.rb

@@ -110,6 +110,7 @@ module EffectiveMembershipsCategory
     scope :create_bad_standing, -> { where(create_bad_standing: true) }
 
     validates :title, presence: true, uniqueness: true
+
     validates :position, presence: true
 
     after_initialize(if: -> { new_record? }) do
@@ -138,6 +139,9 @@ module EffectiveMembershipsCategory
       validates :prorated_oct, presence: true, numericality: { greater_than_or_equal_to: 0 }
       validates :prorated_nov, presence: true, numericality: { greater_than_or_equal_to: 0 }
       validates :prorated_dec, presence: true, numericality: { greater_than_or_equal_to: 0 }
+
+      validates :qb_item_name, presence: true
+      validates :tax_exempt, inclusion: { in: [true, false] }
     end
   end
 
@@ -176,7 +180,7 @@ module EffectiveMembershipsCategory
   end
 
   def applicant_wizard_steps_collection
-    wizard_steps = EffectiveMemberships.Applicant.all_wizard_steps
+    wizard_steps = EffectiveMemberships.Applicant.wizard_steps_hash
     required_steps = EffectiveMemberships.Applicant.required_wizard_steps
 
     wizard_steps.map do |step, title|
@@ -185,7 +189,7 @@ module EffectiveMembershipsCategory
   end
 
   def fee_payment_wizard_steps_collection
-    wizard_steps = EffectiveMemberships.FeePayment.all_wizard_steps
+    wizard_steps = EffectiveMemberships.FeePayment.wizard_steps_hash
     required_steps = EffectiveMemberships.FeePayment.required_wizard_steps
 
     wizard_steps.map do |step, title|
@@ -193,4 +197,24 @@ module EffectiveMembershipsCategory
     end
   end
 
+  def applicant_fee_qb_item_name
+    'Applicant'
+  end
+
+  def applicant_fee_tax_exempt
+    tax_exempt
+  end
+
+  def stamp_fee
+    0
+  end
+
+  def stamp_fee_qb_item_name
+    qb_item_name
+  end
+
+  def stamp_fee_tax_exempt
+    tax_exempt
+  end
+
 end

data/app/models/concerns/effective_memberships_owner.rb

@@ -137,11 +137,6 @@ module EffectiveMembershipsOwner
   end
 
   # Instance Methods
-  def additional_fee_attributes(fee)
-    raise('expected an Effective::Fee') unless fee.kind_of?(Effective::Fee)
-    {}
-  end
-
   def build_prorated_fee(date: nil)
     raise('must have an existing membership') unless membership.present?
 
@@ -156,8 +151,10 @@ module EffectiveMembershipsOwner
     fee.assign_attributes(
       fee_type: 'Prorated',
       category: category,
+      period: period,
       price: price,
-      period: period
+      tax_exempt: category.tax_exempt,
+      qb_item_name: category.qb_item_name
     )
 
     fee
@@ -178,16 +175,17 @@ module EffectiveMembershipsOwner
     fee.assign_attributes(
       fee_type: 'Discount',
       category: category,
+      period: period,
       price: price,
-      period: period
+      tax_exempt: category.tax_exempt,
+      qb_item_name: category.qb_item_name
     )
 
     fee
   end
 
-  def build_title_fee(period:, title:, fee_type: nil, category: nil, price: nil, qb_item_name: nil, tax_exempt: nil)
-    fee_type ||= 'Renewal'
-
+  # Only thing optional is category, late_on and bad_standing_on
+  def build_title_fee(title:, fee_type:, period:, price:, tax_exempt:, qb_item_name:, category: nil)
     fee = fees.find do |fee|
       fee.fee_type == fee_type && fee.period == period && fee.title == title &&
       (category.blank? || fee.category_id == category.id && fee.category_type == category.class.name)
@@ -197,24 +195,21 @@ module EffectiveMembershipsOwner
 
     # Build the title fee
     fee ||= fees.build()
-    price ||= (category.renewal_fee.to_i if category.present? && fee_type == 'Renewal')
 
     fee.assign_attributes(
-      fee_type: fee_type,
       title: title,
+      fee_type: fee_type,
       category: category,
-      price: price,
       period: period,
-      qb_item_name: qb_item_name,
+      price: price,
       tax_exempt: tax_exempt,
-      late_on: nil,
-      bad_standing_on: nil
+      qb_item_name: qb_item_name
     )
 
     fee
   end
 
-  def build_renewal_fee(category:, period:, late_on:, bad_standing_on:)
+  def build_renewal_fee(category:, period:, late_on: nil, bad_standing_on: nil)
     raise('must have an existing membership') unless membership.present?
 
     fee = fees.find { |fee| fee.fee_type == 'Renewal' && fee.period == period && fee.category_id == category.id && fee.category_type == category.class.name }
@@ -223,13 +218,18 @@ module EffectiveMembershipsOwner
     # Build the renewal fee
     fee ||= fees.build()
 
+    late_on ||= EffectiveMemberships.Registrar.late_fee_date(period: period)
+    bad_standing_on ||= EffectiveMemberships.Registrar.bad_standing_date(period: period)
+
     fee.assign_attributes(
       fee_type: 'Renewal',
       category: category,
-      price: category.renewal_fee.to_i,
       period: period,
+      price: category.renewal_fee.to_i,
+      tax_exempt: category.tax_exempt,
+      qb_item_name: category.qb_item_name,
       late_on: late_on,
-      bad_standing_on: bad_standing_on
+      bad_standing_on: bad_standing_on,
     )
 
     fee
@@ -252,8 +252,10 @@ module EffectiveMembershipsOwner
     fee.assign_attributes(
       fee_type: 'Late',
       category: category,
-      price: category.late_fee.to_i,
       period: period,
+      price: category.late_fee.to_i,
+      tax_exempt: category.tax_exempt,
+      qb_item_name: category.qb_item_name
     )
 
     fee

data/app/models/concerns/effective_memberships_registrar.rb

@@ -219,7 +219,7 @@ module EffectiveMembershipsRegistrar
 
     if owner.outstanding_fee_payment_fees.present?
       order = Effective::Order.new(items: owner.outstanding_fee_payment_fees, user: owner)
-      order.purchase!(skip_buyer_validations: true, email: false)
+      order.mark_as_purchased!
     end
 
     owner.update_membership_status!

data/app/models/effective/applicant_reference.rb

@@ -2,7 +2,12 @@ module Effective
   class ApplicantReference < ActiveRecord::Base
     acts_as_tokened
     acts_as_addressable :reference
-    acts_as_statused :submitted, :completed
+
+    acts_as_statused(
+      :submitted, # Was submitted by the applicant
+      :completed # Was completed by the reference.
+    )
+
     log_changes(to: :applicant) if respond_to?(:log_changes)
 
     belongs_to :applicant, polymorphic: true

data/app/models/effective/fee.rb

@@ -14,11 +14,11 @@ module Effective
     belongs_to :category, polymorphic: true, optional: true
 
     effective_resource do
-      fee_type      :string
+      fee_type          :string
 
-      title         :string
+      title             :string
 
-      period        :date
+      period            :date
 
       late_on           :date
       bad_standing_on   :date
@@ -33,32 +33,22 @@ module Effective
     scope :sorted, -> { order(:id) }
     scope :deep, -> { includes(:owner, :parent, :category) }
 
-    before_validation(if: -> { owner.present? }) do
-      additional = owner.additional_fee_attributes(self)
-      raise('expected a Hash of attributes') unless additional.kind_of?(Hash)
-      assign_attributes(additional)
-    end
-
     before_validation(if: -> { owner && owner.membership }) do
       self.category ||= owner.membership.categories.first if owner.membership.categories.length == 1
     end
 
     before_validation do
-      self.period ||= default_period()
-      self.late_on ||= default_late_on()
-      self.bad_standing_on ||= default_bad_standing_on()
-
-      self.qb_item_name ||= default_qb_item_name()
-      self.tax_exempt = default_tax_exempt() if tax_exempt.nil?
-
+      self.period ||= EffectiveMemberships.Registrar.current_period
       self.title ||= default_title()
     end
 
     validates :fee_type, presence: true
-    validates :price, presence: true
 
     validates :title, presence: true
     validates :period, presence: true
+
+    validates :price, presence: true
+    validates :tax_exempt, inclusion: { in: [true, false] }
     validates :qb_item_name, presence: true
 
     validate(if: -> { fee_type.present? }) do
@@ -107,33 +97,8 @@ module Effective
       EffectiveMemberships.custom_fee_types.include?(fee_type)
     end
 
-    def default_period
-      EffectiveMemberships.Registrar.current_period
-    end
-
-    def default_late_on
-      nil
-    end
-
-    def default_bad_standing_on
-      nil
-    end
-
     def default_title
-      [
-        period&.strftime('%Y').presence,
-        category.to_s.presence,
-        fee_type.presence,
-        'Fee'
-      ].join(' ')
-    end
-
-    def default_qb_item_name
-      category&.qb_item_name.presence || "#{fee_type}"
-    end
-
-    def default_tax_exempt
-      category.present? ? category.tax_exempt : false
+      [period&.strftime('%Y'), category, fee_type, 'Fee'].compact.join(' ')
     end
 
   end

data/app/models/effective/membership_card.rb

@@ -0,0 +1,7 @@
+module Effective
+  class MembershipCard
+
+    include EffectiveMembershipsCard
+
+  end
+end

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

@@ -35,7 +35,7 @@
 
   - if applicant.owner.applicants.any? { |other| other.was_submitted? && other.id != applicant.id }
     = tab 'Other Applications' do
-      = render_datatable(Admin::EffectiveApplicantsDatatable.new(owner_id: applicant.owner_id, except_id: applicant.id))
+      = render_datatable(Admin::EffectiveApplicantsDatatable.new(owner: applicant.owner, except_id: applicant.id))
 
   - if applicant.persisted? && applicant.respond_to?(:log_changes_datatable)
     = tab 'Logs' do

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

@@ -8,7 +8,7 @@
 
 
     - applicant.applicant_course_areas_collection.each do |area|
-      - datatable = EffectiveApplicantCoursesDatatable.new(applicant_id: applicant.id, applicant_course_area_id: area.id)
+      - datatable = EffectiveApplicantCoursesDatatable.new(applicant: applicant, applicant_course_area_id: area.id)
 
       .mb-4
         %h6= area

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

@@ -6,7 +6,7 @@
       .col-sm-auto.text-right
         = link_to('Edit', wizard_path(:education)) if edit_effective_wizard?
 
-    - datatable = EffectiveApplicantEducationsDatatable.new(applicant_id: applicant.id)
+    - datatable = EffectiveApplicantEducationsDatatable.new(applicant: applicant)
     .mb-4= render_simple_datatable(datatable)
 
     - if applicant.applicant_educations_details.present?

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

@@ -20,7 +20,7 @@
           %th Total Months
           %td= applicant.applicant_experiences_months
 
-    - datatable = EffectiveApplicantExperiencesDatatable.new(applicant_id: applicant.id)
+    - datatable = EffectiveApplicantExperiencesDatatable.new(applicant: applicant)
     .mb-4= render_simple_datatable(datatable)
 
     - if applicant.applicant_experiences_details.present?

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

@@ -0,0 +1,36 @@
+.card
+  .card-body
+    .row
+      .col-sm
+        %h5.card-title= applicant.wizard_step_title(:stamp)
+      .col-sm-auto.text-right
+        = link_to('Edit', wizard_path(:stamp)) if edit_effective_wizard?
+
+    - applicant.stamps.each do |stamp|
+      %table.table.table-sm
+        %tbody
+          %tr
+            %th Name
+            %td= stamp.name
+
+          %tr
+            %th Name Confirmation
+            %td= stamp.name_confirmation
+
+          %tr
+            %th Category
+            %td= stamp.category
+
+          - if stamp.shipping_address.present?
+            %tr
+              %th Shipping Address
+              %td= stamp.shipping_address.to_html
+
+          - if applicant.was_approved?
+            %tr
+              %th Submitted
+              %td= stamp.submitted_at&.strftime('%F') || '-'
+
+            %tr
+              %th Issued
+              %td= stamp.issued_at&.strftime('%F') || 'Not Issued'

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

@@ -0,0 +1,28 @@
+= render 'layout' do
+  = render 'effective/applicants/content', resource: resource
+
+  .card
+    .card-body
+      %p Should your application be approved, you are eligible to receive a Professional Stamp.
+
+      %p Please confirm your name as it should appear on any Professional Stamp.
+
+      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+        = f.hidden_field :id
+
+        = f.fields_for(:stamps, f.object.stamp) do |fs|
+          = fs.hidden_field :applicant_id
+          = fs.hidden_field :applicant_type
+
+          = fs.hidden_field :owner_id
+          = fs.hidden_field :owner_type
+
+          = fs.hidden_field :price
+          = fs.hidden_field :tax_exempt
+          = fs.hidden_field :qb_item_name
+
+          = render 'effective/stamps/fields', f: fs
+
+        %p Stamps will be processed after approval of this application.
+
+        = f.save 'Save and Continue'

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

@@ -0,0 +1,16 @@
+- owners = current_user.effective_memberships_owners
+
+- owners.each do |owner|
+  - membership = owner.membership
+  - card = EffectiveMemberships.MembershipCard.new(membership: membership)
+
+  - next unless EffectiveResources.authorized?(self, :show, card)
+
+  = card('Membership Card') do
+    %p
+      Your membership card for
+      = membership.categories.to_sentence
+      = membership.owner.to_s
+      is available for download:
+
+    %p= link_to 'Download Membership Card', effective_memberships.membership_card_membership_path(membership, format: :pdf), class: 'btn btn-primary'

data/config/routes.rb

@@ -18,6 +18,13 @@ EffectiveMemberships::Engine.routes.draw do
     end
 
     get '/directory', to: 'memberships_directory#index'
+
+    resources :membership_cards, only: :index
+
+    resources :memberships, only: [] do
+      get :membership_card, on: :member, to: 'membership_cards#show'
+    end
+
   end
 
   namespace :admin do