diff --git a/app/models/account.rb b/app/models/account.rb index 188dd71..009c671 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -56,6 +56,7 @@ class Account < ApplicationRecord Broadcast.where(project: projects), ZoomMeeting.where(project: projects), MedicalRelease.where(project: projects), + # MatchingRequest.where(project: projects), self ])).sum(:byte_size).to_f end diff --git a/app/views/contract_templates/_form.html.erb b/app/views/contract_templates/_form.html.erb index 9bd9b4a..dc74784 100644 --- a/app/views/contract_templates/_form.html.erb +++ b/app/views/contract_templates/_form.html.erb @@ -26,7 +26,7 @@ <% end %> <% end %> - + <%= field_set_tag content_tag(:span, t(".custom_fields.heading"), class: "h6 text-muted text-uppercase"), id: "custom_fields", style: "display: none;" do %>

<%= fa_icon("info-circle", text: t(".custom_fields.instructions")) %>

<%= render "shared/custom_fields", form: form %> diff --git a/spec/features/user_managing_appearance_releases_spec.rb b/spec/features/user_managing_appearance_releases_spec.rb index 1bdc663..d4f8c70 100644 --- a/spec/features/user_managing_appearance_releases_spec.rb +++ b/spec/features/user_managing_appearance_releases_spec.rb @@ -144,6 +144,7 @@ feature 'User managing appearance releases' do large_pdf_file = build_large_pdf_file attach_file import_appearance_release_field, Rails.root.join(large_pdf_file.path), visible: false expect(page).to have_css('#upload-progress-container') + expect(page).to have_content submit_create_button, wait: 30 click_button submit_create_button expect(page).to have_content matching_started end diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index 3fbd316..8147964 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -131,7 +131,8 @@ RSpec.describe Account do Broadcast, Account, ZoomMeeting, - MedicalRelease + MedicalRelease, + MatchingRequest ] Rails.application.eager_load! ActiveRecord::Base.descendants.each do |model|