effective_memberships 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5429d3c4c93088302ef65577a3f97649d2bb56191f701a5475f41973860ad21
-  data.tar.gz: 276b0b0d68ebf151cf67d8f542105b656688b1bf4969c5047c13c1667d364dca
+  metadata.gz: bf72d5bb8220dd574786eceebb0f8722521e6b097c1aff7a97742681f74bd0de
+  data.tar.gz: 00564617a0a0b722d39aa4466fa16c8fff00dfa60ed372e7cca86d9f5f8b95bf
 SHA512:
-  metadata.gz: 5b1c53a8c3cec9712413f4d2c8f58786db72d8e2a12da1f40920fa39ffae3162e67c9782c72bf290ec91b1a29e3aa93374b0c09cb09dafda6151803aec93d578
-  data.tar.gz: f7bb8c97dbbc5c4f45f6c8b60cc4979fc4de32822b06f4a930a69fc6e7844fba015bf2dd9fa5a4038e885ab6353497cee7a1db0aafb1ec20c561389255315fd1
+  metadata.gz: 67ee50afa73bd30d416a152d8e43b6ed3827733ab1c01565a270fb295f8eb47ffe327d5b9155ff584b8e1a6558f2a5b0c3f33e016e9cb966fe16d0ca250c1d6e
+  data.tar.gz: d2af28eea6edf0bc4790e819e712be0b7fe3eb4981b9a1068d9699b3274480a0b7e8ed78a44bbbb7fd8646cf0cca5579b0b712450e486b9fbe2388a18b5e597d

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/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_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/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/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/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.3.8'
+  VERSION = '0.3.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-02-04 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
@@ -349,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
@@ -360,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