effective_memberships 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1fcdc5cbf08b23f6aab670babdf698a2aff6b6d9d2067055dc970bb2eb4b8e4
-  data.tar.gz: 0a423a28dc16bd84135e741bcb9f290c7997c034ba0095319bab4cf36913d605
+  metadata.gz: 070c1ddf76bc05b1659fe52e3dba9e940d2d1f22e61a106453e7f0ee319e58e1
+  data.tar.gz: 57e590916bacc7c0fc34482c7850ac2b2b9c30b8b9181ad65d553ff530bb78eb
 SHA512:
-  metadata.gz: 296aa3d82c05315ac9247f28052e474440562fb85450fc4735f4875b26d67ccdd612df58727207251f2540f103efa41c519128e1366be02f446400816000f3de
-  data.tar.gz: 71feca7c490aea3f2ba49cae7c3318b79d5da533f1b7a6adedcb0ae38a1b9ea2c6b61daa163a9abfc92e2d3e8aff110dbb705c4e373bcfab488aae1d9533a82c
+  metadata.gz: 9c11227b561d087bf85a849200f930d3fa5cac68c8aa8f20aad25a84365548769e23ceec50c3a0cf583d8cf1b9542ce9cfa5fbc1cdc00726e0f941030f8d35a7
+  data.tar.gz: 794d3a8e16605ed198cf501f9810107c6ddb20efee9ef94996a9978312e2af5cc371699f18f13e3be32a114b78b926c8e7519e8cd315c85bdf784350e3e98576

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

@@ -3,11 +3,7 @@
     = render 'admin/categories/form_category', category: category
 
     - if category.persisted?
-      = render 'admin/categories/form_applicant_eligibility', category: category
-
-      = render 'admin/categories/form_applicant_fees', category: category
-      = render 'admin/categories/form_renewals', category: category
-
+      = render 'admin/categories/form_fees', category: category
 
   - if category.persisted?
     = tab 'Content - Applicants' do
@@ -18,14 +14,9 @@
 
     = tab 'Wizards' do
       .row
-        .col
-          = render 'admin/categories/form_applicant_steps', category: category
-
-        .col
-          = render 'admin/categories/form_fee_payment_steps', category: category
+        .col= render 'admin/categories/form_applicant_steps', category: category
+        .col= render 'admin/categories/form_fee_payment_steps', category: category
 
     - if category.respond_to?(:log_changes_datatable)
       = tab 'Logs' do
         = render_inline_datatable(category.log_changes_datatable)
-
-

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

@@ -4,10 +4,11 @@
       = f.article_editor "rich_text_applicant_all_steps_content", label: false, hint: "displayed on all steps"
     - else
       = f.rich_text_area "rich_text_applicant_all_steps_content", label: false, hint: "displayed on all steps"
-  - enabled = f.object.applicant_wizard_steps
+
+  - enabled_steps = f.object.applicant_wizard_steps
 
   - EffectiveMemberships.Applicant::WIZARD_STEPS.each do |step, title|
-    - next unless enabled.include?(step)
+    - next unless enabled_steps.include?(step)
 
     = card("#{title}") do
       - if defined?(EffectiveArticleEditor)

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

@@ -1,6 +1,7 @@
 = effective_form_with(model: [:admin, category], engine: true) do |f|
   .row
-    .col= f.text_field :title, label: 'Category title'
+    .col
+      = f.text_field :title, label: 'Category title'
 
     .col
       = f.select :category_type, f.object.class.category_types,
@@ -14,4 +15,13 @@
   - else
     = f.rich_text_area :rich_text_body, label: 'Description shown in the Application to Join wizard'
 
-  = f.submit
+  %h3 Applicant Eligibility
+  = f.check_box :can_apply_new, label: 'Anyone may apply for this category'
+  = f.check_box :can_apply_existing, label: 'Any current member may apply to join'
+  = f.check_box :can_apply_restricted, label: 'Only some current members may apply to join'
+
+  = f.show_if(:can_apply_restricted, true) do
+    - categories = f.object.class.where.not(id: f.object)
+    = f.select :can_apply_restricted_ids, categories, label: 'Existing member categories'
+
+  = effective_submit(f)

data/app/views/admin/categories/{_form_renewals.html.haml → _form_fees.html.haml}

@@ -1,4 +1,28 @@
 = effective_form_with(model: [:admin, category], engine: true) do |f|
+  %h3 Applicant Fees
+  .row
+    .col= f.price_field :applicant_fee
+    .col= f.text_field :qb_item_name, label: "Quickbooks Item Name"
+
+  %h3 Pro-rated fees based on date of approval
+  .row
+    .col-lg-3
+      = f.price_field :prorated_jan, label: "January"
+      = f.price_field :prorated_feb, label: "February"
+      = f.price_field :prorated_mar, label: "March"
+    .col-lg-3
+      = f.price_field :prorated_apr, label: "April"
+      = f.price_field :prorated_may, label: "May"
+      = f.price_field :prorated_jun, label: "June"
+    .col-lg-3
+      = f.price_field :prorated_jul, label: "July"
+      = f.price_field :prorated_aug, label: "August"
+      = f.price_field :prorated_sep, label: "September"
+    .col-lg-3
+      = f.price_field :prorated_oct, label: "October"
+      = f.price_field :prorated_nov, label: "November"
+      = f.price_field :prorated_dec, label: "December"
+
   %h3 Renewal Fees
   = f.check_box :create_renewal_fees, label: 'Yes, annual renewal fees should be created'
 
@@ -6,7 +30,8 @@
     - date = EffectiveMemberships.Registrar.renewal_fee_date(date: Time.zone.now)
 
     %p Charged to members, every #{date.strftime('%B %e')}, to renew their dues.
-    = f.price_field :renewal_fee
+    .row
+      .col-3= f.price_field :renewal_fee
 
   %h3 Late Fees
   = f.check_box :create_late_fees, label: 'Yes, late fees should be created'
@@ -16,7 +41,8 @@
     - date = EffectiveMemberships.Registrar.late_fee_date(period: period)
 
     %p Charged to members, on #{date.strftime('%B %e')}, with outstanding renewal fees
-    = f.price_field :late_fee
+    .row
+      .col-3= f.price_field :late_fee
 
   %h3 Bad Standing
   = f.check_box :create_bad_standing, label: 'Yes, bad standing status should be applied'
@@ -27,4 +53,4 @@
 
     %p Members with outstanding fees, on #{date.strftime('%B %e')}, will automatically be marked in bad standing.
 
-  = effective_submit(f)
+  = f.submit

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.6.8'
+  VERSION = '0.6.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -353,13 +353,11 @@ files:
 - app/views/admin/applicants/_status.html.haml
 - app/views/admin/categories/_form.html.haml
 - app/views/admin/categories/_form_applicant_content.html.haml
-- app/views/admin/categories/_form_applicant_eligibility.html.haml
-- app/views/admin/categories/_form_applicant_fees.html.haml
 - app/views/admin/categories/_form_applicant_steps.html.haml
 - app/views/admin/categories/_form_category.html.haml
 - app/views/admin/categories/_form_fee_payment_content.html.haml
 - app/views/admin/categories/_form_fee_payment_steps.html.haml
-- app/views/admin/categories/_form_renewals.html.haml
+- app/views/admin/categories/_form_fees.html.haml
 - app/views/admin/fee_payments/_fee_payment.html.haml
 - app/views/admin/fees/_fee.html.haml
 - app/views/admin/fees/_form.html.haml

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

@@ -1,9 +0,0 @@
-= effective_form_with(model: [:admin, category], engine: true) do |f|
-  %h3 Applicant Eligibility
-  = f.check_box :can_apply_new, label: 'Anyone may apply for this category'
-  = f.check_box :can_apply_existing, label: 'Any current member may apply to join'
-  = f.check_box :can_apply_restricted, label: 'Only some current members may apply to join'
-
-  = f.show_if(:can_apply_restricted, true) do
-    - categories = f.object.class.where.not(id: f.object)
-    = f.select :can_apply_restricted_ids, categories, label: 'Existing member categories'

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

@@ -1,24 +0,0 @@
-= effective_form_with(model: [:admin, category], engine: true) do |f|
-  %h3 Applicant Fees
-  .row
-    .col= f.price_field :applicant_fee
-    .col= f.text_field :qb_item_name, label: "Quickbooks Item Name"
-
-  %h3 Pro-rated fees based on date of approval
-  .row
-    .col-lg-3
-      = f.price_field :prorated_jan, label: "January"
-      = f.price_field :prorated_feb, label: "February"
-      = f.price_field :prorated_mar, label: "March"
-    .col-lg-3
-      = f.price_field :prorated_apr, label: "April"
-      = f.price_field :prorated_may, label: "May"
-      = f.price_field :prorated_jun, label: "June"
-    .col-lg-3
-      = f.price_field :prorated_jul, label: "July"
-      = f.price_field :prorated_aug, label: "August"
-      = f.price_field :prorated_sep, label: "September"
-    .col-lg-3
-      = f.price_field :prorated_oct, label: "October"
-      = f.price_field :prorated_nov, label: "November"
-      = f.price_field :prorated_dec, label: "December"