effective_memberships 0.3.7 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 735da58a1a6df3aed501dc23f1d03f01aad80b53c6e90d912a7e3ca245c31145
-  data.tar.gz: d8d83e2200d6b9e1f707bc157ef4338b94da585373473517912605eb2b2939cd
+  metadata.gz: c506926f876b0fe6e4559cce6784e0c0ac8f30891dca21183f74dd5ab1fc5ee6
+  data.tar.gz: 980454f32127c3423d33aaaf4136615fac433dbede09f718ae7ebfb1c0cc3b39
 SHA512:
-  metadata.gz: 472f5e747d7a7ebcacb8fbf1a3072ee82e158c2672482e0f404e4165b62dc8cafb7f66a380d5e0d625fec7b7cb25de970789332ebfd3d4aa832b269b134172e3
-  data.tar.gz: 69ade19ab5f49b8218795cefdc8b09fa53a4f53a2726907b5ed361d581f0fab6d2fe2e4ed17a69d202ad461208062a4fee6c4628ea88f94cbe9cc7063cb13c36
+  metadata.gz: 29813982537ac083f937e2c1d8df597676b51eb26c7512f773f018fd91e0e2a3a389b6095f89ba8e8acdb44086313b2ff3638f926f380490366b8c7148eaaf46
+  data.tar.gz: 436039fe95ff3c095bb755663ec6f51674ffe620957b2f1a0557d598f634eeb651aa317476a887d818cd71bacf5a9708eb34eab2df06a3456201c6b02e1af890

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_memberships_datatable.rb

@@ -24,11 +24,48 @@ module Admin
       col :bad_standing_admin, visible: false
       col :bad_standing_reason, visible: false
 
+      col :email do |membership|
+        email = membership.owner.try(:email)
+        mail_to(email) if email.present?
+      end
+
+      col :phone do |membership|
+        membership.owner.try(:phone) || membership.owner.try(:home_phone) || membership.owner.try(:cell_phone)
+      end
+
+      col :address do |membership|
+        membership.owner.try(:addresses).try(:first).try(:to_html)
+      end
+
+      col :address1, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:address1)
+      end
+
+      col :address2, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:address2)
+      end
+
+      col :city, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:city)
+      end
+
+      col :province, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:province)
+      end
+
+      col :country, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:country)
+      end
+
+      col :postal_code, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:postal_code)
+      end
+
       actions_col
     end
 
     collection do
-      memberships = Effective::Membership.deep.all.includes(:owner)
+      memberships = Effective::Membership.deep.all.includes(owner: :addresses)
 
       raise('expected an owner_id, not user_id') if attributes[:user_id].present?
 

data/app/datatables/effective_memberships_directory_datatable.rb

@@ -11,7 +11,7 @@ class EffectiveMembershipsDirectoryDatatable < Effective::Datatable
   end
 
   collection do
-    scope = Effective::Membership.deep.includes(:owner)
+    scope = Effective::Membership.deep.good_standing.includes(:owner)
 
     archived_klasses.each do |klass|
       scope = scope.where.not(owner_id: klass.archived.select('id'), owner_type: klass.name)

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,30 +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,
-        tax_exempt: category.tax_exempt,
-        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
@@ -315,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? }
@@ -410,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
 
@@ -463,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

@@ -180,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|
@@ -189,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|
@@ -197,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_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/membership.rb

@@ -29,6 +29,8 @@ module Effective
     scope :deep, -> { includes(membership_categories: :category) }
     scope :sorted, -> { order(:id) }
 
+    scope :good_standing, -> { where(bad_standing: [nil, false]) }
+
     scope :with_paid_fees_through, -> (period = nil) {
       where(arel_table[:fees_paid_period].gteq(period || EffectiveMemberships.Registrar.current_period))
     }

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/_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

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.3.7'
+  VERSION = '0.3.10'
 end

data/lib/effective_memberships.rb

@@ -7,7 +7,7 @@ module EffectiveMemberships
   def self.config_keys
     [
       :categories_table_name, :applicants_table_name, :applicant_reviews_table_name, :fee_payments_table_name,
-      :category_class_name, :applicant_class_name, :applicant_review_class_name, :fee_payment_class_name, :registrar_class_name,
+      :category_class_name, :applicant_class_name, :applicant_review_class_name, :fee_payment_class_name, :registrar_class_name, :membership_card_class_name,
       :additional_fee_types,
       :layout,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :use_effective_email_templates
@@ -32,6 +32,10 @@ module EffectiveMemberships
     fee_payment_class_name&.constantize || Effective::FeePayment
   end
 
+  def self.MembershipCard
+    membership_card_class_name&.constantize || Effective::MembershipCard
+  end
+
   # Singleton
   def self.Registrar
     klass = registrar_class_name&.constantize || Effective::Registrar

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_products
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_resources
   requirement: !ruby/object:Gem::Requirement
@@ -252,6 +266,7 @@ files:
 - app/controllers/effective/applicant_references_controller.rb
 - app/controllers/effective/applicants_controller.rb
 - app/controllers/effective/fee_payments_controller.rb
+- app/controllers/effective/membership_cards_controller.rb
 - app/controllers/effective/memberships_directory_controller.rb
 - app/datatables/admin/effective_applicant_course_areas_datatable.rb
 - app/datatables/admin/effective_applicant_course_names_datatable.rb
@@ -273,6 +288,7 @@ files:
 - app/mailers/effective/memberships_mailer.rb
 - app/models/concerns/effective_memberships_applicant.rb
 - app/models/concerns/effective_memberships_applicant_review.rb
+- app/models/concerns/effective_memberships_card.rb
 - app/models/concerns/effective_memberships_category.rb
 - app/models/concerns/effective_memberships_fee_payment.rb
 - app/models/concerns/effective_memberships_owner.rb
@@ -289,6 +305,7 @@ files:
 - app/models/effective/fee.rb
 - app/models/effective/fee_payment.rb
 - app/models/effective/membership.rb
+- app/models/effective/membership_card.rb
 - app/models/effective/membership_category.rb
 - app/models/effective/membership_history.rb
 - app/models/effective/registrar.rb
@@ -346,6 +363,7 @@ files:
 - app/views/effective/applicants/_orders.html.haml
 - app/views/effective/applicants/_references.html.haml
 - app/views/effective/applicants/_select.html.haml
+- app/views/effective/applicants/_stamp.html.haml
 - app/views/effective/applicants/_summary.html.haml
 - app/views/effective/applicants/billing.html.haml
 - app/views/effective/applicants/checkout.html.haml
@@ -357,6 +375,7 @@ files:
 - app/views/effective/applicants/files.html.haml
 - app/views/effective/applicants/references.html.haml
 - app/views/effective/applicants/select.html.haml
+- app/views/effective/applicants/stamp.html.haml
 - app/views/effective/applicants/start.html.haml
 - app/views/effective/applicants/submitted.html.haml
 - app/views/effective/applicants/summary.html.haml
@@ -379,6 +398,7 @@ files:
 - app/views/effective/fee_payments/summary.html.haml
 - app/views/effective/fees/_dashboard.html.haml
 - app/views/effective/fees/_fee.html.haml
+- app/views/effective/membership_cards/index.html.haml
 - app/views/effective/memberships/_dashboard.html.haml
 - app/views/effective/memberships/_membership.html.haml
 - app/views/effective/memberships_directory/index.html.haml