effective_memberships 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 981aea653a25a94a440ce8599ab99cab71f429ac409a839f5f061d9731239d2e
-  data.tar.gz: b88503a72edd658d63e81b49d4b17c4402dde65d717692db4dff53f3b54c02fe
+  metadata.gz: b0eef9b0e1ee657cc1d68ba1bdadde44e3f89b8002889512a62f99ba77fba756
+  data.tar.gz: 0a08d2d2352e7b6a1fa1bd67ae66b99706e278c85b08eee75ef3d2e4aae8eab6
 SHA512:
-  metadata.gz: 67066fc2672c948a59c20cd1422e88d39a5b41be07aecf36ede4dcace2919e91c0d1058c165ebad70af7ed6dedcdc47015f447d89449c330d7cd1edf537a80cb
-  data.tar.gz: 7f46ea79c2d79e431f1150224180520850dbc683b399b9758801818d9ab213de67e6e4902a1e3861a1b16a5f54843fe048f5e0c5222d89cda27351ae5f6e28a6
+  metadata.gz: db209b01ffdbe5b9071e05b7df946c72454b8edfd19833e3cb393261beed6336c65345d7133e3da3406c190e16e87612f3064e412a7bc7023191be17cfbe2691
+  data.tar.gz: f3dcfabe8a98ccae4109166398356127fb6a860d3896966681604f119fdd4b830870ae9a2f808c8fdd6a4a3be7bbbb0ba442bc8a2acb5b0e692921164f6a47a2

data/app/helpers/effective_memberships_helper.rb

@@ -1,15 +1,2 @@
 module EffectiveMembershipsHelper
-
-  def edit_effective_applicants_wizard?
-    params[:controller] == 'effective/applicants' && defined?(resource) && resource.draft?
-  end
-
-  def edit_effective_applicant_reviews_wizard?
-    params[:controller] == 'effective/applicant_reviews' && defined?(resource) && resource.draft?
-  end
-
-  def edit_effective_fee_payments_wizard?
-    params[:controller] == 'effective/fee_payments' && defined?(resource) && resource.draft?
-  end
-
 end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -16,10 +16,6 @@ module EffectiveMembershipsApplicant
   module ClassMethods
     def effective_memberships_applicant?; true; end
 
-    def all_wizard_steps
-      const_get(:WIZARD_STEPS).keys
-    end
-
     # For effective_category_applicant_wizard_steps_collection
     def required_wizard_steps
       [:start, :select, :summary, :billing, :checkout, :submitted]

data/app/models/concerns/effective_memberships_applicant_review.rb

@@ -16,10 +16,6 @@ module EffectiveMembershipsApplicantReview
   module ClassMethods
     def effective_memberships_applicant_review?; true; end
 
-    def all_wizard_steps
-      const_get(:WIZARD_STEPS).keys
-    end
-
     # For effective_category_applicant_wizard_steps_collection
     def required_wizard_steps
       [:start, :recommendation, :submitted]

data/app/models/concerns/effective_memberships_category.rb

@@ -176,7 +176,7 @@ module EffectiveMembershipsCategory
   end
 
   def applicant_wizard_steps_collection
-    wizard_steps = EffectiveMemberships.Applicant.const_get(:WIZARD_STEPS)
+    wizard_steps = EffectiveMemberships.Applicant.all_wizard_steps
     required_steps = EffectiveMemberships.Applicant.required_wizard_steps
 
     wizard_steps.map do |step, title|
@@ -185,7 +185,7 @@ module EffectiveMembershipsCategory
   end
 
   def fee_payment_wizard_steps_collection
-    wizard_steps = EffectiveMemberships.FeePayment.const_get(:WIZARD_STEPS)
+    wizard_steps = EffectiveMemberships.FeePayment.all_wizard_steps
     required_steps = EffectiveMemberships.FeePayment.required_wizard_steps
 
     wizard_steps.map do |step, title|

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -16,10 +16,6 @@ module EffectiveMembershipsFeePayment
   module ClassMethods
     def effective_memberships_fee_payment?; true; end
 
-    def all_wizard_steps
-      const_get(:WIZARD_STEPS).keys
-    end
-
     def required_wizard_steps
       [:start, :summary, :billing, :checkout, :submitted]
     end

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

@@ -1,6 +1,3 @@
 .effective-applicant
-  - blacklist = EffectiveMemberships.Applicant.required_wizard_steps
-  - steps = applicant.required_steps - blacklist
-
-  - steps.select { |step| applicant.has_completed_step?(step) }.each do |partial|
+  - applicant.render_steps.each do |partial|
     = render "effective/applicants/#{partial}", applicant: applicant, step: partial

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

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:course_amounts)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:course_amounts)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:course_amounts)) if edit_effective_wizard?
 
 
     - applicant.applicant_course_areas_collection.each do |area|

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

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:declarations)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:declarations)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:declarations)) if edit_effective_wizard?
 
     %table.table
       %tbody

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

@@ -4,6 +4,6 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:demographics)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:demographics)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:demographics)) if edit_effective_wizard?
 
     = render 'effective/applicants/demographics_owner', applicant: applicant, owner: applicant.owner

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

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:education)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:education)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:education)) if edit_effective_wizard?
 
     - datatable = EffectiveApplicantEducationsDatatable.new(applicant_id: applicant.id)
     .mb-4= render_simple_datatable(datatable)

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

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:experience)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:experience)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:experience)) if edit_effective_wizard?
 
     %table.table
       %tbody

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

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:files)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:files)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:files)) if edit_effective_wizard?
 
     %table.table
       %tbody

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

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:references)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:references)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:references)) if edit_effective_wizard?
 
     - applicant.applicant_references.each_with_index do |applicant_reference, index|
       - if index > 0

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

@@ -0,0 +1 @@
+-# Intentionally blank

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

@@ -34,11 +34,8 @@
     = collapse('Show application...', card_class: 'my-2') do
       = render 'effective/applicants/applicant', applicant: resource
 
-  = render 'effective/applicants/orders', applicant: resource
-
-  -# - if resource.can_visit_step?(next_step)
-  -#   = effective_form_with(model: resource, url: wizard_path(step)) do |f|
-  -#     = f.hidden_field :current_step
-  -#     = f.submit 'Save and Continue', class: 'btn btn-primary'
+  .mb-4
+    = collapse('Show orders...', card_class: 'my-2') do
+      = render 'effective/applicants/orders', applicant: resource
 
   = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary btn-block'

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

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= fee_payment.wizard_step_title(:declarations)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:declarations)) if edit_effective_fee_payments_wizard?
+        = link_to('Edit', wizard_path(:declarations)) if edit_effective_wizard?
 
     %table.table
       %tbody

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

@@ -4,6 +4,6 @@
       .col-sm
         %h5.card-title= fee_payment.wizard_step_title(:demographics)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:demographics)) if edit_effective_fee_payments_wizard?
+        = link_to('Edit', wizard_path(:demographics)) if edit_effective_wizard?
 
     = render 'effective/fee_payments/demographics_owner', fee_payment: fee_payment, owner: fee_payment.owner

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

@@ -1,6 +1,3 @@
 .effective-fee-payment
-  - blacklist = EffectiveMemberships.FeePayment.required_wizard_steps
-  - steps = fee_payment.required_steps - blacklist
-
-  - steps.select { |step| fee_payment.has_completed_step?(step) }.each do |partial|
+  - fee_payment.render_steps.each do |partial|
     = render "effective/fee_payments/#{partial}", fee_payment: fee_payment, resource: fee_payment, step: partial

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

@@ -0,0 +1 @@
+-# Intentionally blank

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

@@ -9,6 +9,7 @@
 
   = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
 
+  = render 'effective/fee_payments/summary', fee_payment: resource
   = render 'effective/fee_payments/fee_payment', fee_payment: resource
   = render 'effective/fee_payments/orders', fee_payment: resource
 

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Code and Effect
@@ -343,6 +343,7 @@ files:
 - app/views/effective/applicants/_layout.html.haml
 - 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/_summary.html.haml
 - app/views/effective/applicants/billing.html.haml
 - app/views/effective/applicants/checkout.html.haml
@@ -366,6 +367,7 @@ files:
 - app/views/effective/fee_payments/_fee_payment.html.haml
 - app/views/effective/fee_payments/_layout.html.haml
 - app/views/effective/fee_payments/_orders.html.haml
+- app/views/effective/fee_payments/_summary.html.haml
 - app/views/effective/fee_payments/billing.html.haml
 - app/views/effective/fee_payments/checkout.html.haml
 - app/views/effective/fee_payments/declarations.html.haml