update video sources

app/controllers/contract_templates_controller.rb

@@ -62,19 +62,18 @@ class ContractTemplatesController < ApplicationController
   def contract_template_params
     params
       .require(:contract_template)
-      .permit(:name, :release_type, :body, :guardian_clause,
-              :signature_legal_text, :fee,
+      .permit(:name, :release_type, :body, :guardian_clause, :fee,
               :applicable_medium_id, :applicable_medium_text,
               :territory_id, :territory_text,
               :term_id, :term_text,
               :restriction_id, :restriction_text,
-              :question_1_text, :question_2_text,
-              :question_3_text, :question_4_text,
-              :question_5_text, :question_6_text,
-              :question_7_text, :question_8_text,
+              :question_1_text, :question_2_text, 
+              :question_3_text, :question_4_text, 
+              :question_5_text, :question_6_text, 
+              :question_7_text, :question_8_text, 
               :question_9_text, :question_10_text,
-              :question_11_text, :question_12_text,
-              :question_13_text, :question_14_text,
+              :question_11_text, :question_12_text, 
+              :question_13_text, :question_14_text, 
               :question_15_text)
   end
 

app/jobs/generate_contracts_zip_job.rb

@@ -22,7 +22,7 @@ class GenerateContractsZipJob < ApplicationJob
         end
       end
 
-      @download.file.attach(io: File.open(zipfile_name), filename: "#{@folder_name}.zip")
+      @download.file.attach(io: File.open(zipfile_name), filename: @folder_name)
     end
   rescue StandardError => e
     Rails.logger.error("Failed to generate download for project (##{project.id}) with release type #{release_type}\n" + e.message)

app/models/contract_template.rb

@@ -21,7 +21,6 @@ class ContractTemplate < ApplicationRecord
   monetize :fee_cents
   has_rich_text :body
   has_rich_text :guardian_clause
-  has_rich_text :signature_legal_text
 
   validates :name, presence: true
   validates :release_type, presence: true

app/models/qr_code.rb

@@ -10,7 +10,7 @@ class QrCode
     url       = Rails.application.routes.url_helpers.url_for(route)
     filename  = [contract_template.project.name, contract_template.name].map(&:parameterize).join("_")
 
-    new(url, "#{filename}.png")
+    new(url, filename)
   end
 
   def initialize(url, filename = "qrcode.png")

app/views/contract_templates/_contract_template.html.erb

@@ -27,7 +27,7 @@
           <%= link_to fa_icon("print", text: "Print"), [:new, contract_template, :blank_contracts], class: "dropdown-item", target: :_blank %>
         <% end %>
         <% if policy(contract_template).destroy? %>
-          <%= link_to fa_icon("trash", text: "Delete"), contract_template, class: "dropdown-item", method: :delete, data: { confirm: "Are you sure?" } %>
+          <%= link_to fa_icon("archive", text: "Archive"), contract_template, class: "dropdown-item", method: :delete, data: { confirm: "Are you sure?" } %>
         <% end %>
       </div>
     </div>

app/views/contract_templates/_form.html.erb

@@ -25,11 +25,6 @@
         <%= form.rich_text_area :guardian_clause %>
       <% end %>
     </div>
-    <div id="signature_legal_text">
-      <%= form.form_group do %>
-        <%= form.rich_text_area :signature_legal_text %>
-      <% end %>
-    </div>
   <% end %>
 
   <%= field_set_tag content_tag(:span, t(".custom_fields.heading"), class: "h6 text-muted text-uppercase"), id: "custom_fields", style: "display: none;" do %>

app/views/public/acquired_media_releases/new.html.erb

@@ -50,7 +50,7 @@
       <hr>
 
       <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
+        <%= render "shared/signature_fields", form: form %>
       <% end %>
 
       <div class="mt-5">

app/views/public/appearance_releases/new.html.erb

@@ -156,7 +156,7 @@
       <% end %>
 
       <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
+        <%= render "shared/signature_fields", form: form %>
       <% end %>
 
       <div class="mt-5">

app/views/public/location_releases/new.html.erb

@@ -50,7 +50,7 @@
       <% end %>
 
       <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, instruction: 'An Authorized Signatory', signature_legal_text: @contract_template.signature_legal_text %>
+        <%= render "shared/signature_fields", form: form, instruction: 'An Authorized Signatory' %>
       <% end %>
 
       <div class="mt-5">

app/views/public/material_releases/new.html.erb

@@ -41,7 +41,7 @@
       <hr>
 
       <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, instruction: 'For Owner or Authorized Signatory', signature_legal_text: @contract_template.signature_legal_text %>
+        <%= render "shared/signature_fields", form: form, instruction: 'For Owner or Authorized Signatory' %>
       <% end %>
 
       <div class="mt-5">

app/views/public/medical_releases/new.html.erb

@@ -145,7 +145,7 @@
       <% end %>
 
       <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
+        <%= render "shared/signature_fields", form: form %>
       <% end %>
 
       <div class="mt-5">

app/views/public/misc_releases/new.html.erb

@@ -39,7 +39,9 @@
           <%= form.text_field :person_first_name, required: true, wrapper_class: "col-sm-6" %>
           <%= form.text_field :person_last_name, required: true, wrapper_class: "col-sm-6" %>
           <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
-          <%= form.email_field :person_email, required: true, wrapper_class: "col-sm-6" %>
+        </div>
+        <div class="form-row">
+          <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
         </div>
         <%= render "shared/address_fields", form: form, subject: "person" %>
       <% end %>
@@ -95,7 +97,7 @@
       <% end %>
 
       <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
+        <%= render "shared/signature_fields", form: form %>
       <% end %>
 
       <div class="mt-5">

app/views/public/talent_releases/new.html.erb

@@ -131,7 +131,7 @@
       <% end %>
 
       <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
+        <%= render "shared/signature_fields", form: form %>
       <% end %>
 
       <div class="mt-5">

app/views/shared/_signature_fields.html.erb

@@ -12,8 +12,4 @@
     <%= fa_icon "refresh" %> <%= t "shared.clear" %>
   <% end %>
 </div>
-<br>
 
-<% if local_assigns[:signature_legal_text] && signature_legal_text.present? %>
-  <div class="alert alert-warning font-weight-bold"><%= signature_legal_text %></div>
-<% end %>

app/views/task_requests/create.html.erb

@@ -13,4 +13,3 @@
   <% end %>
 <% end %>
 <p class="alert alert-success p-3 lead text-center"><%= t '.success_message' %></p>
-<%= link_to fa_icon("check", text: "Done"), [@project, :task_requests], class: "btn btn-primary" %>

config/locales/en.yml

@@ -364,7 +364,6 @@ en:
       contract_template:
         fee: Leave at $0.00 for no-fee
         guardian_clause: Leave blank if not required for this contract
-        signature_legal_text: Leave blank if not required for this contract
       task_request:
         time_allowed: Minimum of 2 hours, no partial hours allowed
       video:

config/locales/es.yml

@@ -160,7 +160,6 @@ es:
       contract_template:
         fee: Leave at $0.00 for no-fee (ES)
         guardian_clause: Leave blank if not required for this contract (ES)
-        signature_legal_text: Leave blank if not required for this contract (ES)
     label:
       appearance_release:
         guardian_2_address_city: Guardian 2 city (ES)

spec/features/user_creates_task_request_spec.rb

@@ -21,7 +21,6 @@ RSpec.feature 'User creates task request', type: :feature do
     click_on 'Create Task request'
 
     expect(page).to have_content task_created_message
-    expect(page).to have_link("Done")
   end
 
   scenario 'user can view task request details' do
@@ -90,4 +89,4 @@ RSpec.feature 'User creates task request', type: :feature do
   def task_created_message
     t 'task_requests.create.success_message'
   end
-end
+end

spec/features/user_manages_contract_templates_spec.rb

@@ -35,24 +35,6 @@ RSpec.feature 'User manages contract templates', type: :feature do
     expect(page).to have_content(create_contract_template_success_message)
   end
 
-  scenario 'creating new release template, all release types accept signature legal text' do
-    all_release_types = ['Acquired Media', 'Appearance', 'Location', 'Material', 'Medical', 'Misc', 'Talent']
-
-    all_release_types.each do |release_type|
-      visit new_project_contract_template_path(project)
-
-      dropdown_selection = "#{release_type} Release"
-      select dropdown_selection, from: 'Release type'
-
-      fill_in 'Name', with: "My #{release_type} template"
-      fill_in_trix signature_legal_text_field, with: 'LL'
-
-      expect do
-        click_on 'Create Release Template'
-      end.to change(ContractTemplate, :count).by(1)
-    end
-  end
-
   scenario 'medical release template has a guardian clause field' do
     visit new_project_contract_template_path(project)
 
@@ -240,7 +222,7 @@ RSpec.feature 'User manages contract templates', type: :feature do
 
     click_on 'Manage'
     accept_alert do
-      click_on 'Delete'
+      click_on 'Archive'
     end
 
     expect(page).to have_content('The release template has been archived')
@@ -291,7 +273,7 @@ RSpec.feature 'User manages contract templates', type: :feature do
       visit project_contract_templates_path(project)
 
       click_on 'Manage'
-      expect(page).to have_content('Delete')
+      expect(page).to have_content('Archive')
     end
 
     it 'does not show create release button on splash page' do
@@ -328,10 +310,6 @@ RSpec.feature 'User manages contract templates', type: :feature do
     'contract_template_guardian_clause_trix_input_contract_template'
   end
 
-  def signature_legal_text_field
-    'contract_template_signature_legal_text'
-  end
-
   def create_contract_template_success_message
     'The release template has been created'
   end
@@ -351,8 +329,4 @@ RSpec.feature 'User manages contract templates', type: :feature do
   def create_release_template
     t 'contract_templates.splash.actions.create_template'
   end
-
-  def signature_legal_text_trix_field
-    'Signature legal text'
-  end
 end

spec/features/user_managing_acquired_media_releases_spec.rb

@@ -41,13 +41,6 @@ feature "User managing acquired_media releases" do
       expect(AcquiredMediaRelease.last.categories).to include("Still Photograph")
       expect(page).to have_content("Your release was successfully submitted. Thank you.")
     end
-
-    scenario "creating a release, if contract template contains signature legal language, it is shown" do
-      contract_template = create(:contract_template, project: project, signature_legal_text: dummy_signature_legal_text)
-      visit new_account_project_contract_template_acquired_media_release_path(project.account, project, contract_template)
-
-      expect(page).to have_content dummy_signature_legal_text
-    end
   end
 
   context "when signed in" do
@@ -364,8 +357,4 @@ feature "User managing acquired_media releases" do
   def destroy_release_alert
     t "acquired_media_releases.destroy.alert"
   end
-
-  def dummy_signature_legal_text
-    'Some signature legal language'
-  end
 end

spec/features/user_managing_appearance_releases_spec.rb

@@ -137,13 +137,6 @@ feature 'User managing appearance releases' do
       expect(page).to have_content(successful_submission_message)
       expect(AppearanceRelease.last.guardian_2_first_name).to eq 'Second'
     end
-
-    scenario "creating a release, if contract template contains signature legal language, it is shown" do
-      contract_template = create(:contract_template, project: project, signature_legal_text: dummy_signature_legal_text)
-      visit new_account_project_contract_template_appearance_release_path(project.account, project, contract_template)
-
-      expect(page).to have_content dummy_signature_legal_text
-    end
   end
 
   context 'when signed in' do
@@ -713,8 +706,4 @@ feature 'User managing appearance releases' do
   def guardian_2_photo_heading
     t 'appearance_releases.form.photos.guardian_2_photo.heading'
   end
-
-  def dummy_signature_legal_text
-    'Some signature legal language'
-  end
 end

spec/features/user_managing_location_releases_spec.rb

@@ -71,13 +71,6 @@ feature "User managing location releases" do
       expect(page).to have_content("Your release was successfully submitted. Thank you.")
       expect(LocationRelease.last.photos.attached?).to eq true
     end
-
-    scenario "creating a release, if contract template contains signature legal language, it is shown" do
-      contract_template = create(:contract_template, project: project, signature_legal_text: dummy_signature_legal_text)
-      visit new_account_project_contract_template_location_release_path(project.account, project, contract_template)
-
-      expect(page).to have_content dummy_signature_legal_text
-    end
   end
 
   context "when signed in" do
@@ -382,8 +375,4 @@ feature "User managing location releases" do
     select "Other", from: "Restriction"
     fill_in "Describe other restrictions", with: "Test"
   end
-
-  def dummy_signature_legal_text
-    'Some signature legal language'
-  end
 end

spec/features/user_managing_material_releases_spec.rb

@@ -84,13 +84,6 @@ feature "User managing material releases" do
       click_button submit_release_button
       expect(page).to have_content success_submit_message
     end
-
-    scenario "creating a release, if contract template contains signature legal language, it is shown" do
-      contract_template = create(:contract_template, project: project, signature_legal_text: dummy_signature_legal_text)
-      visit new_account_project_contract_template_material_release_path(project.account, project, contract_template)
-
-      expect(page).to have_content dummy_signature_legal_text
-    end
   end
 
   context "when signed in" do
@@ -389,8 +382,4 @@ feature "User managing material releases" do
     click_button submit_release_button
     expect(page).not_to have_content success_submit_message
   end
-
-  def dummy_signature_legal_text
-    'Some signature legal language'
-  end
 end

spec/features/user_managing_medical_releases_spec.rb

@@ -168,13 +168,6 @@ feature "User managing medical releases" do
       expect(page).to have_content(successful_submission_message)
 
     end
-
-    scenario "creating a release, if contract template contains signature legal language, it is shown" do
-      contract_template = create(:contract_template, project: project, signature_legal_text: dummy_signature_legal_text)
-      visit new_account_project_contract_template_medical_release_path(project.account, project, contract_template)
-
-      expect(page).to have_content dummy_signature_legal_text
-    end
   end
 
   context "when signed in as account manager" do
@@ -454,8 +447,4 @@ feature "User managing medical releases" do
   def answer_field_for_question(number)
     "medical_release[question_#{number}_answer]"
   end
-
-  def dummy_signature_legal_text
-    'Some signature legal language'
-  end
 end

spec/features/user_managing_misc_releases_spec.rb

@@ -48,13 +48,6 @@ feature "User managing misc releases" do
         expect(field).to be_visible
       end
     end
-
-    scenario "creating a release, if contract template contains signature legal language, it is shown" do
-      contract_template = create(:contract_template, project: project, signature_legal_text: dummy_signature_legal_text)
-      visit new_account_project_contract_template_misc_release_path(project.account, project, contract_template)
-
-      expect(page).to have_content dummy_signature_legal_text
-    end
   end
 
   context "when signed in as account manager" do
@@ -206,8 +199,4 @@ feature "User managing misc releases" do
   def person_is_minor_checkbox
     'misc_release_minor'
   end
-
-  def dummy_signature_legal_text
-    'Some signature legal language'
-  end
 end

spec/features/user_managing_talent_releases_spec.rb

@@ -126,13 +126,6 @@ feature "User managing talent releases" do
       expect(TalentRelease.last.guardian_2_photo.attached?).to eq true
       expect(TalentRelease.last.guardian_2_name).to eq "Second Guardian"
     end
-
-    scenario "creating a release, if contract template contains signature legal language, it is shown" do
-      contract_template = create(:contract_template, project: project, signature_legal_text: dummy_signature_legal_text)
-      visit new_account_project_contract_template_talent_release_path(project.account, project, contract_template)
-
-      expect(page).to have_content dummy_signature_legal_text
-    end
   end
 
   context "when signed in" do
@@ -562,8 +555,4 @@ feature "User managing talent releases" do
     fill_in guardian_address_state_field, with: "NY"
     fill_in guardian_address_zip_field, with: '1000'
   end
-
-  def dummy_signature_legal_text
-    'Some signature legal language'
-  end
 end