effective_memberships 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09fbb8a22bb53806fe272999514bc8cc4d8b8cf5784aaab5428777ffe43af61e'
-  data.tar.gz: cc6fd66a60a0db18c98a44849e3768e8c6d892b6af9cd297485b18f65290457b
+  metadata.gz: 75a253a5d3a571ffd68882f95735ce2461498cb40900064fd66e60026db9ce67
+  data.tar.gz: 83336209575eb783851494cf7b5edb7c98c3a29bbe4abc2403600581b83a6214
 SHA512:
-  metadata.gz: e286896d066c61cb0bb65b325837152d275f43c158e0f8df95302c36aee81ef1fcd3359efd37a71ec3f78b182a87fa0ee587c6ffe017d3971013af32b3647e67
-  data.tar.gz: 37c79f3c9a254275346c352832082bf9014690144720fd3ea2fef642dfe2740f3e72f3597870754f4c0076574ade33c65a1227d8fefa4f2325903aaacef9bd7f
+  metadata.gz: 40ae6507569b2b58eb60b54be06033204b3eaadb9476438bf16b4683b5710627674778737b774e5db843c485be3d3df746151b0f2a0e1951efeb03a03f43fbe5
+  data.tar.gz: 264eae8dc5ac8b7666a627ed1706ac37bfbdc7439aa7004d4ac3bb9def1849df957ae198c838bfede8d40b721398a8592154d0a36e2d0e0762a0e4d5de0bf5b6

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -34,6 +34,7 @@ module EffectiveMembershipsFeePayment
       start: 'Start',
       demographics: 'Demographics',         # Individual only. Users fields.
       organization: 'Organization',         # Organization only. Organization fields.
+      cpd: 'Continuing Professional Development',
       declarations: 'Declarations',
       summary: 'Review',
       billing: 'Billing Address',

data/app/views/admin/categories/_fields_applicant_requirements.html.haml

@@ -51,5 +51,5 @@
         %td= applicant.wizard_step_title(:cpd)
         %td= f.select :applicant_cpd_step_requirement, f.object.class.cpd_step_requirements, label: false
         %td
-          minimum required
           = ets(EffectiveCpd.CpdStatement)
+          to continue

data/app/views/admin/categories/_fields_fee_payment_requirements.html.haml

@@ -7,5 +7,5 @@
         %td= fee_payment.wizard_step_title(:cpd)
         %td= f.select :fee_payment_cpd_step_requirement, f.object.class.cpd_step_requirements, label: false
         %td
-          minimum required
           = ets(EffectiveCpd.CpdStatement)
+          to continue

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

@@ -0,0 +1,3 @@
+= wizard_card(fee_payment) do
+  = render('effective/wizard_steps/cpd_statements', resource: fee_payment)
+  = render('effective/wizard_steps/cpd_requirements', resource: fee_payment)

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

@@ -0,0 +1,2 @@
+- # Intentionally blank
+%p TODO

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

@@ -3,6 +3,7 @@
 %h2 Fee Payments
 
 - if datatable.present?
+  %p You have made the following past fee payments:
   = render_simple_datatable(datatable)
 - else
   %p You have no past fee payments. When you do, we'll show them here.

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

@@ -1,2 +1,5 @@
 = wizard_card(fee_payment) do
-  = render 'organizations/demographics', parent: fee_payment, organization: fee_payment.organization
+  - if fee_payment.organization.present?
+    = render 'organizations/demographics', parent: fee_payment, organization: fee_payment.organization
+  - else
+    %p None

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

@@ -0,0 +1,20 @@
+= render 'layout' do
+  = render 'effective/fee_payments/content', resource: resource
+
+  = card(et('effective_cpd.name')) do
+    = render('cpd_requirements', fee_payment: resource)
+
+  = card('All ' + cpd_statements_label) do
+    = render('effective/wizard_steps/cpd_statements', resource: resource)
+
+  = card('Requirements') do
+    = render('effective/wizard_steps/cpd_requirements', resource: resource)
+
+  = card do
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
+
+      - f.object.declare_cpd = true if f.object.has_completed_step?(:cpd)
+      = render('effective/wizard_steps/cpd_fields', f: f)
+
+      = f.save 'Save and Continue'

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

@@ -7,7 +7,7 @@
   .alert.alert-warning.mb-4
     Successfully paid on #{resource.submit_order.purchased_at.strftime('%F')}.
 
-  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'
+  .mb-4= link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'
 
   = card do
     = render 'effective/fee_payments/summary', fee_payment: resource

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.17.0'
+  VERSION = '0.17.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-27 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -494,6 +494,8 @@ files:
 - app/views/effective/applicants/transcripts.html.haml
 - app/views/effective/documents/_dashboard.html.haml
 - app/views/effective/fee_payments/_content.html.haml
+- app/views/effective/fee_payments/_cpd.html.haml
+- app/views/effective/fee_payments/_cpd_requirements.html.haml
 - app/views/effective/fee_payments/_dashboard.html.haml
 - app/views/effective/fee_payments/_declarations.html.haml
 - app/views/effective/fee_payments/_demographics.html.haml
@@ -504,6 +506,7 @@ files:
 - 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/cpd.html.haml
 - app/views/effective/fee_payments/declarations.html.haml
 - app/views/effective/fee_payments/demographics.html.haml
 - app/views/effective/fee_payments/organization.html.haml