effective_memberships 0.3.14 → 0.4.0

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

@@ -0,0 +1,31 @@
+= tabs do
+  = tab 'Company Info' do
+    = render 'admin/organizations/form_organization', organization: organization
+
+  - if organization.persisted?
+    - if can?(:index, Effective::Membership)
+      = tab 'Membership' do
+        = render 'admin/registrar_actions/form', owner: organization
+
+    = tab 'Representatives' do
+      = render_datatable(Admin::EffectiveRepresentativesDatatable.new(organization: organization), inline: true, namespace: :admin)
+
+    - if can?(:index, Effective::Fee)
+      = tab 'Fees' do
+        = render_inline_datatable(Admin::EffectiveFeesDatatable.new(owner: organization))
+
+    - if can?(:index, EffectiveMemberships.FeePayment)
+      = tab 'Fee Payments' do
+        = render_inline_datatable(Admin::EffectiveFeePaymentsDatatable.new(organization: organization))
+
+    - if can?(:index, Effective::MembershipHistory)
+      = tab 'History' do
+        = render_datatable(Admin::EffectiveMembershipHistoriesDatatable.new(owner: organization))
+
+    - if can?(:index, Effective::Order)
+      = tab 'Orders' do
+        = render_datatable(Admin::EffectiveOrdersDatatable.new(user: organization))
+
+    - if can?(:index, Effective::Log)
+      = tab 'Logs' do
+        = render_datatable(organization.log_changes_datatable, inline: true, namespace: :admin)

data/app/views/admin/organizations/_form_organization.html.haml

@@ -0,0 +1,23 @@
+= effective_form_with(model: [:admin, organization], engine: true) do |f|
+  .row
+    .col-sm-6
+      %h2 Demographics
+      = render 'admin/organizations/fields', f: f
+
+      %h2 Billing Address
+      = effective_address_fields(f, :billing)
+
+    .col-sm-6
+      %h2 Membership
+      = render 'admin/memberships/status', owner: f.object
+
+      - f.object.users.each do |user|
+        %p
+          = link_to(user, "/admin/users/#{user.to_param}/edit")
+          - if user.try(:archived?)
+            %span.badge.badge-warning Archived
+
+      %h2 Admin Only
+      %p No additional fields
+
+  = effective_submit(f)

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

@@ -0,0 +1,38 @@
+= effective_form_with(model: [:admin, representative], engine: true) do |f|
+  - f.object.user_type ||= current_user.class.name
+
+  = f.hidden_field :user_id
+  = f.hidden_field :user_type
+  = f.hidden_field :organization_id
+  = f.hidden_field :organization_type
+
+  - if f.object.new_record?
+    - unless inline_datatable? && inline_datatable.attributes[:organization_id].present?
+      = f.select :organization, { 'Organizations' => EffectiveMemberships.Organization.sorted }, polymorphic: true
+
+    = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
+
+    - unless inline_datatable? && inline_datatable.attributes[:user_id].present?
+      = f.radios :new_representative_user_action, ['Invite new user', 'Add existing user'], inline: true, label: 'Representative'
+
+      = f.show_if :new_representative_user_action, 'Add existing user' do
+        = f.select :user, {'Users' => current_user.class.sorted }, polymorphic: true
+
+      = f.show_if :new_representative_user_action, 'Invite new user' do
+        = f.fields_for :user, (f.object.user || f.object.build_user) do |fu|
+          = render 'admin/representatives/user_fields', f: fu
+
+  - if f.object.persisted?
+    - unless inline_datatable? && inline_datatable.attributes[:organization_id].present?
+      = f.static_field :organization
+
+    - unless inline_datatable? && inline_datatable.attributes[:user_id].present?
+      = f.static_field :user
+
+    = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
+
+    - unless inline_datatable? && inline_datatable.attributes[:user_id].present?
+      = f.fields_for :user, f.object.user do |fu|
+        = render 'admin/representatives/user_fields', f: fu
+
+  = f.submit

data/app/views/{effective/applicants/_demographics_fields.html.haml → admin/representatives/_user_fields.html.haml}

@@ -1,11 +1,7 @@
+= f.email_field :email
+
 - if f.object.respond_to?(:first_name)
   = f.text_field :first_name
 
 - if f.object.respond_to?(:last_name)
   = f.text_field :last_name
-
-- if f.object.respond_to?(:date_of_birth)
-  = f.date_field :date_of_birth
-
-- if f.object.respond_to?(:phone)
-  = f.tel_field :phone

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

@@ -1,12 +1,31 @@
 - authorized = EffectiveResources.authorized?(self, :new, EffectiveMemberships.Applicant)
 - datatable = EffectiveResources.best('EffectiveApplicantsDatatable').new(self)
-- in_progress = current_user.effective_memberships_owner.applicants.in_progress
 
-- if in_progress.present?
+- # In progress
+- applicant = current_user.applicants.in_progress.first
+
+- if applicant.present? && applicant.draft?
+  %h2 In-Progress Application
+
+  %p
+    Your submission is incomplete.
+
+    %p
+      Please
+      = link_to("Continue application", effective_memberships.applicant_build_path(applicant, applicant.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
+      or you can
+      = link_to('Abandon application', effective_memberships.applicant_path(applicant), 'data-confirm': "Really delete #{applicant}?", 'data-method': :delete, class: 'btn btn-danger')
+      to apply again.
+
+    %hr
+
+- elsif applicant.present?
   %h2 Active Applications
 
-  - in_progress.each do |applicant|
-    = render 'effective/applicants/summary', applicant: applicant
+  = render 'effective/applicants/summary', applicant: applicant
+  = link_to("View application", effective_memberships.applicant_build_path(applicant, applicant.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
+
+  %hr
 
 %h2 Application History
 
@@ -15,5 +34,5 @@
 - else
   %p You have not yet created any applications. When you do, we'll show them here.
 
-- if authorized && in_progress.blank?
+- if authorized && applicant.blank?
   %p= link_to 'Apply to join, reclassify, or provide a change of status notification', effective_memberships.new_applicant_path, class: 'btn btn-primary'

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

@@ -6,4 +6,4 @@
       .col-sm-auto.text-right
         = link_to('Edit', wizard_path(:demographics)) if edit_effective_wizard?
 
-    = render 'effective/applicants/demographics_owner', applicant: applicant, owner: applicant.owner
+    = render 'users/demographics', parent: applicant, user: applicant.user

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

@@ -1,9 +1,11 @@
 %h3 Missing Information
-%p The following information is missing: #{resource.missing_info_reason}.
+%p The following information is missing:
+%ul
+  %li= resource.missing_info_reason
 
 %p
   Please revisit each wizard step and
-  = link_to 'complete all missing information', wizard_path(:demographics)
+  = link_to 'Complete all missing information', wizard_path(:demographics), class: 'btn btn-primary'
   for this application.
 
 %p
@@ -12,7 +14,9 @@
 %p
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :id
-    = f.save 'Submit Application', 'data-confirm': "Really submit application?"
+
+    - # If you change this label, update EffectiveMemberships ApplicantsController
+    = f.save 'Resubmit Application', 'data-confirm': "Really re-submit application?", class: 'btn-sm'
 
 %p
   %small * No additional payment required.

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

@@ -0,0 +1,9 @@
+.card
+  .card-body
+    .row
+      .col-sm
+        %h5.card-title= applicant.wizard_step_title(:organization)
+      .col-sm-auto.text-right
+        = link_to('Edit', wizard_path(:organization)) if edit_effective_wizard?
+
+    = render 'organizations/demographics', parent: applicant, organization: applicant.organization

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

@@ -0,0 +1,21 @@
+%p Please select an organization to continue.
+
+= f.radios :organization_id, effective_memberships_select_applicant_organization_collection(f.object), label: false
+= f.hidden_field :organization_type, value: EffectiveMemberships.Organization.name
+
+= f.show_if(:organization_id, 'new') do
+  - organization = f.object.build_organization(email: f.object.user.email)
+
+  = f.fields_for :organization, organization do |fo|
+    = fo.hidden_field :email
+
+    = fo.text_field :title, label: 'New Organization Name', required: true, hint: 'Please enter the name of your organization'
+
+    = fo.fields_for :representatives, fo.object.build_representative(user: f.object.user) do |fr|
+      = fr.hidden_field :user_id
+      = fr.hidden_field :user_type
+
+      - owner = EffectiveRoles.roles.find { |role| role == :owner }
+      - raise('expected the EffectiveRoles :owner role to be present') unless owner
+
+      = fr.hidden_field :roles, value: [owner]

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

@@ -9,10 +9,18 @@
 
     - if request.path.start_with?('/admin')
       %tr
-        %th= applicant.owner_label
+        %th User
         %td
-          - url = (polymorphic_admin_path(applicant.owner) rescue "/admin/users/#{applicant.owner.to_param}/edit")
-          = link_to(applicant.owner, url)
+          - url = (polymorphic_admin_path(applicant.user) rescue "/admin/users/#{applicant.user.to_param}/edit")
+          = link_to(applicant.user, url)
+
+      %tr
+        %th Organization
+        %td
+          - if applicant.organization.present?
+            = link_to(applicant.organization, effective_memberships.edit_admin_organization_path(applicant.organization))
+          - else
+            None
 
     - if applicant.from_category.present?
       %tr
@@ -21,17 +29,17 @@
 
     %tr
       %th Category
-      %td
-        = applicant.applicant_type
-        %br
-        = applicant.category
+      %td= [applicant.applicant_type, applicant.category].join(' - ')
 
     - if applicant.orders.present?
       %tr
-        %th Orders
+        %th Order#{'s' if applicant.orders.length > 1}
         %td
           - applicant.orders.each do |order|
-            = link_to(order, effective_orders.order_path(order))
+            - if request.path.start_with?('/admin')
+              = link_to(order, effective_orders.edit_admin_order_path(order))
+            - else
+              = link_to(order, effective_orders.order_path(order))
 
     %tr
       %th Status

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

@@ -8,7 +8,7 @@
       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
         = f.hidden_field :id
 
-        = f.fields_for(:owner, f.object.owner) do |fu|
-          = effective_address_fields(fu, :billing)
+        = f.fields_for(f.object.owner_symbol, f.object.owner) do |fo|
+          = effective_address_fields(fo, :billing)
 
         = f.save 'Save and Continue'

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

@@ -1,11 +1,12 @@
 = render 'layout' do
-
   = render 'effective/applicants/content', resource: resource
 
-  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-    = f.hidden_field :id
+  .card
+    .card-body
+      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+        = f.hidden_field :id
 
-    = f.fields_for(:owner, f.object.owner) do |fu|
-      = render 'effective/applicants/demographics_fields', f: fu
+        = f.fields_for(:user, f.object.user) do |fu|
+          = render 'users/fields_demographics', f: fu, user: f.object.user, parent: resource
 
-    = f.save 'Save and Continue'
+        = f.save 'Save and Continue'

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

@@ -10,7 +10,7 @@
         = f.hidden_field :id
 
         = f.has_many(:applicant_educations, cards: true) do |aef|
-          %h4 Post-Secondary Education
+          %h4.mb-4 Post-Secondary Education
 
           .row
             .col= aef.text_field :institution
@@ -20,7 +20,7 @@
             .col= aef.date_field :start_on, label: 'Start Date'
             .col= aef.date_field :end_on, label: 'End Date'
 
-          = aef.text_field :degree_obtained, label: 'Degree or diploma obtained'
+          = aef.text_field :degree_obtained, label: 'Degree, diploma or program'
 
         /= f.text_area :applicant_educations_details, label: 'Additional Education Details'
 

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

@@ -0,0 +1,19 @@
+= render 'layout' do
+
+  = render 'effective/applicants/content', resource: resource
+
+  .card
+    .card-body
+      - datatable = EffectiveResources.best('EffectiveRepresentativesDatatable').new(self, organization: resource.organization)
+
+      %h2 Representatives
+      = render_datatable(datatable, inline: true, simple: true)
+
+      %h2 Organization Info
+      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+        = f.hidden_field :id
+
+        = f.fields_for(:organization, f.object.organization) do |fo|
+          = render 'organizations/fields_demographics', f: fo, organization: f.object.organization, parent: resource
+
+        = f.save 'Save and Continue'

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

@@ -4,7 +4,7 @@
   .card
     .card-body
       - if resource.min_applicant_references > 0
-        .alert.alert-danger You must include #{resource.min_applicant_references} or more references.
+        %p You must include #{resource.min_applicant_references} or more references.
 
       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
         = f.hidden_field :id

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

@@ -2,6 +2,7 @@
   = render 'effective/applicants/content', resource: resource
 
   - categories = resource.can_apply_categories_collection()
+  - organization_categories = categories.select(&:organization?)
 
   .card
     .card-body
@@ -16,12 +17,21 @@
         = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
           = f.hidden_field :id
 
+          = f.hidden_field :organization_id, value: nil
+          = f.hidden_field :organization_type, value: nil
+          = f.hidden_field :category_type, value: EffectiveMemberships.Category.name
+
           = f.select :category_id, categories, required: true
 
           - categories.each do |mc|
             = f.show_if(:category_id, mc.id) do
-              .my-4
+              .mb-4
                 %h3= mc.to_s
+                %small.text-muted #{mc.category} #{mc.category_type} Membership
                 = mc.rich_text_body
 
+          - if organization_categories.present?
+            = f.show_if_any(:category_id, organization_categories.map(&:id)) do
+              = render('effective/applicants/select_organization', f: f)
+
           = f.save 'Save and Continue'

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

@@ -14,8 +14,8 @@
           = fs.hidden_field :applicant_id
           = fs.hidden_field :applicant_type
 
-          = fs.hidden_field :owner_id
-          = fs.hidden_field :owner_type
+          = fs.hidden_field :user_id
+          = fs.hidden_field :user_type
 
           = fs.hidden_field :price
           = fs.hidden_field :tax_exempt

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

@@ -3,16 +3,22 @@
 
   .card
     .card-body
-      - fees = resource.owner.outstanding_fee_payment_fees
+      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+        = f.hidden_field :id
+        = f.save 'Save and Continue'
 
-      - if fees.present?
-        %p You have #{pluralize(fees.length , 'outstanding fee')}.
-        %p
-          Please
-          = link_to 'Make a fee payment', effective_memberships.new_fee_payment_path
-          before continuing with any applications
+  -# .card
+  -#   .card-body
+  -#     - fees = resource.user.outstanding_fee_payment_fees
 
-      - if fees.blank?
-        = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-          = f.hidden_field :id
-          = f.save 'Save and Continue'
+  -#     - if fees.present?
+  -#       %p You have #{pluralize(fees.length , 'outstanding fee')}.
+  -#       %p
+  -#         Please
+  -#         = link_to 'Make a fee payment', effective_memberships.new_fee_payment_path
+  -#         before continuing with any applications
+
+  -#     - if fees.blank?
+  -#       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+  -#         = f.hidden_field :id
+  -#         = f.save 'Save and Continue'

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

@@ -7,22 +7,22 @@
   .alert.alert-success.mb-4
     This application was submitted on #{resource.submitted_at.strftime('%F')}
 
+  - if resource.missing_info?
+    = card do
+      = render 'effective/applicants/missing_info', applicant: resource
+
   - unless resource.approved?
     .card
       .card-body
         %p
           Your application must still be approved.
           We will send
-          %strong= resource.owner.email
+          %strong= resource.user.email
           an email notifying you of the application's approval status.
 
   .card
     .card-body= render 'effective/applicants/summary', applicant: resource
 
-  - if resource.missing_info?
-    = card do
-      = render 'effective/applicants/missing_info', applicant: resource
-
   - if resource.min_applicant_references.to_i > 0 || resource.applicant_references.present?
     = card do
       %h3 Confidential References

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

@@ -9,6 +9,6 @@
     = f.submit(border: false, left: true) do
       -# Missing Info
       - if EffectiveResources.authorized?(self, :resubmit, resource)
-        = f.save 'Submit Application'
+        = f.save 'Resubmit Application'
       - else
         = f.save 'Save and Continue'

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

@@ -6,4 +6,4 @@
       .col-sm-auto.text-right
         = link_to('Edit', wizard_path(:demographics)) if edit_effective_wizard?
 
-    = render 'effective/fee_payments/demographics_owner', fee_payment: fee_payment, owner: fee_payment.owner
+    = render 'users/demographics', parent: fee_payment, user: fee_payment.user

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

@@ -0,0 +1,9 @@
+.card
+  .card-body
+    .row
+      .col-sm
+        %h5.card-title= fee_payment.wizard_step_title(:organization)
+      .col-sm-auto.text-right
+        = link_to('Edit', wizard_path(:organization)) if edit_effective_wizard?
+
+    = render 'organizations/demographics', parent: fee_payment, organization: fee_payment.organization

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

@@ -1 +1,39 @@
--# Intentionally blank
+%table.table.table-sm
+  %tbody
+    %tr
+      %th.border-0 Fee Payment
+      %td.border-0
+        = fee_payment.owner.to_s
+        %br
+        = mail_to(fee_payment.owner.email)
+
+    %tr
+      %th Purchased By
+      %td= fee_payment.user.to_s
+
+    - if request.path.start_with?('/admin')
+      %tr
+        %th User
+        %td
+          - url = (polymorphic_admin_path(fee_payment.user) rescue "/admin/users/#{fee_payment.user.to_param}/edit")
+          = link_to(fee_payment.user, url)
+
+      - if fee_payment.organization.present?
+        %tr
+          %th Organization
+          %td
+            = link_to(fee_payment.organization, effective_memberships.edit_admin_organization_path(fee_payment.organization))
+
+    - if fee_payment.orders.present?
+      %tr
+        %th Order#{'s' if fee_payment.orders.length > 1}
+        %td
+          - fee_payment.orders.each do |order|
+            - if request.path.start_with?('/admin')
+              = link_to(order, effective_orders.edit_admin_order_path(order))
+            - else
+              = link_to(order, effective_orders.order_path(order))
+
+    %tr
+      %th Period
+      %td= fee_payment.period.strftime('%F')

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

@@ -8,7 +8,7 @@
       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
         = f.hidden_field :id
 
-        = f.fields_for(:owner, f.object.owner) do |fu|
-          = effective_address_fields(fu, :billing)
+        = f.fields_for(f.object.owner_symbol, f.object.owner) do |fo|
+          = effective_address_fields(fo, :billing)
 
         = f.save 'Save and Continue'

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

@@ -6,7 +6,7 @@
       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
         = f.hidden_field :id
 
-        = f.fields_for(:owner, f.object.owner) do |fu|
-          = render 'effective/fee_payments/demographics_fields', f: fu
+        = f.fields_for(:user, f.object.user) do |fu|
+          = render 'users/fields_demographics', f: fu, user: f.object.user, parent: resource
 
         = f.save 'Save and Continue'

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

@@ -0,0 +1,18 @@
+= render 'layout' do
+  = render 'effective/fee_payments/content', resource: resource
+
+  .card
+    .card-body
+      - datatable = EffectiveResources.best('EffectiveRepresentativesDatatable').new(self, organization: resource.organization)
+
+      %h2 Representatives
+      = render_datatable(datatable, inline: true, simple: true)
+
+      %h2 Organization Info
+      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+        = f.hidden_field :id
+
+        = f.fields_for(:organization, f.object.organization) do |fo|
+          = render 'organizations/fields_demographics', f: fo, organization: f.object.organization, parent: resource
+
+        = f.save 'Save and Continue'

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

@@ -1,34 +1,37 @@
 = render 'layout' do
+  = render 'effective/fee_payments/content', resource: resource
 
   .card
     .card-body
-      - current_owner = current_user.current_fee_payment_owner
+      - outstanding_owners = current_user.memberships_owners.select { |owner| owner.outstanding_fee_payment_fees.present? }
 
-      %p Welcome #{current_owner}!
-
-      = render 'effective/fee_payments/content', resource: resource
-
-      - if current_owner.membership_fees_paid?
+      - if outstanding_owners.blank?
         %p You have no fees due at this time.
         = link_to 'Home', root_path, class: 'btn btn-primary'
 
       - else
-        - if resource.outstanding_fees.present?
-          %p You have the following fees due at this time:
-          = render_purchasables(resource.outstanding_fees)
-        - else
-          %p You have fees due. Please continue.
+        %p You have the following fees due at this time:
 
-        - resource.user = current_user
-        - resource.owner = current_owner
+        - outstanding_owners.each do |owner|
+          %h3= owner
+          = render_purchasables(owner.outstanding_fee_payment_fees)
 
         = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
           = f.hidden_field :id
-
-          = f.hidden_field :owner_type
-          = f.hidden_field :owner_id
-
           = f.hidden_field :user_type
           = f.hidden_field :user_id
 
+          - if outstanding_owners.length == 1
+            - resource.organization = outstanding_owners.first if outstanding_owners.first.kind_of?(EffectiveMemberships.Organization)
+
+            %p Continue with fee payment for #{resource.owner}.
+
+            = f.hidden_field :organization_id
+
+          - if outstanding_owners.length > 1
+            %p You have multiple memberships that require a fee payment. They must be purchased separately.
+            %p Please select an individual or organization to continue:
+
+            = f.select :organization_id, effective_memberships_select_fee_payment_organization(resource)
+
           = f.save 'Save and Continue'

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

@@ -9,8 +9,15 @@
 
   = 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
+  .card
+    .card-body= render 'effective/fee_payments/summary', fee_payment: resource
+
+  .mb-4
+    = collapse('Show fee payment...', card_class: 'my-2') do
+      = render 'effective/fee_payments/fee_payment', fee_payment: resource
+
+  .mb-4
+    = collapse('Show orders...', card_class: 'my-2') do
+      = render 'effective/fee_payments/orders', fee_payment: resource
 
   = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary'