fix MR comment

remove validation and add specs
add Chat Now button
2020-07-15 19:03:35 +02:00 · 2020-07-15 12:25:54 +02:00 · 2020-07-15 12:25:54 +02:00 · 2020-07-15 12:25:54 +02:00
107 changed files with 134 additions and 2526 deletions
--- a/app/assets/javascripts/channels/broadcasts.coffee
+++ b/app/assets/javascripts/channels/broadcasts.coffee
@@ -21,12 +21,11 @@ $(document).on "turbolinks:load", ->

    refreshBroadcastVideo: (data) ->
      $("#broadcast_updates").html data.status_content
-      stream_selected = $("#broadcast_video").attr('video-type') == 'stream';
-      if data.streamer_status == 'recording' && data.status == 'active' && stream_selected
+      if data.streamer_status == 'recording' && data.status == 'active'
        $("#broadcast_video").html data.video_content
        new (Clappr.Player)(
          parentId: '#broadcast_video'
-          source: data.full_live_stream_playback_url
+          source: data.playback_url
          width: '100%',
          height: '100%',
          mute: true,
--- a/app/assets/javascripts/group_qr_code.js
+++ b/app/assets/javascripts/group_qr_code.js
@@ -1,50 +0,0 @@
-$(document).on("click", "[data-behavior=select_contract_template]", function() {
-  var _this = this;
-  var checkbox = $(this).children("input:checkbox");
-
-  selectContractTemplate(_this, checkbox);
-});
-
-$(document).on("click", "[data-behavior=select_contract_template] input[type='checkbox']", function(e) {
-  e.stopPropagation();
-
-  var _this = this;
-  var checkbox = $(this);
-
-  selectContractTemplate(_this, checkbox);
-});
-
-function selectContractTemplate(clicked_element, checkbox) {
-  if (clicked_element.hasChildNodes()) {
-    if(checkbox.prop("checked")) {
-      checkbox.prop('checked', false);
-    } else {
-      checkbox.prop('checked', true);
-    }
-  }
-
-  var checked = checkbox.prop("checked");
-  var project_id = JSON.parse($('#group_qr_code').attr('data-project-id'));
-  var contract_template_ids = JSON.parse($('#group_qr_code').attr('data-contract-template-ids'));
-  var selected_contract_template_id = checkbox.val();
-
-  if (checked && !contract_template_ids.includes(selected_contract_template_id)) {
-    contract_template_ids.push(selected_contract_template_id);
-  } else if(!checked && contract_template_ids.includes(selected_contract_template_id)) {
-    contract_template_ids.splice( $.inArray(selected_contract_template_id, contract_template_ids), 1 );
-  }
-  
-  $('#group_qr_code').attr('data-contract-template-ids', JSON.stringify(contract_template_ids));
-
-  if (contract_template_ids.length >= 2) {
-    multi_sign_ids = $.param({multi_sign_ids: contract_template_ids});
-    contract_template_url = "/en/contract_templates/" + contract_template_ids[0] + "/qr_codes?" + multi_sign_ids
-
-    $("#group_qr_code").attr("href", contract_template_url);
-    $("#group_qr_code").attr("target", "_blank");
-    $("#group_qr_code").removeClass('disabled');
-  } else if (contract_template_ids.length < 2) {
-    $("#group_qr_code").attr("href", "javascript:void(0);");
-    $("#group_qr_code").addClass('disabled');
-  }
-}
--- a/app/assets/javascripts/play_previous_recordings.js.erb
+++ b/app/assets/javascripts/play_previous_recordings.js.erb
@@ -3,7 +3,7 @@ $(document).on("click", "[data-behavior=play_recording]", function() {
        return false;
    }

-    $("#broadcast_video").attr('video-type', 'recording');
+    console.warn('Play prev : ', playback_url);

    var playback_url = $(this).attr("data-playback-url")
    $("#broadcast_video").empty();
@@ -23,6 +23,4 @@ $(document).on("click", "[data-behavior=play_recording]", function() {
    $(this).siblings().children("i").remove();
    $(this).addClass('active');
    $(this).prepend('<i class="fa fa-check">&nbsp;</i>');
-});
-
-$(document).on("click", "[data-behavior=play_stream]", function() { $("#broadcast_video").attr('video-type', 'stream'); });
+});
--- a/app/channels/broadcasts_channel.rb
+++ b/app/channels/broadcasts_channel.rb
@@ -16,7 +16,6 @@ class BroadcastsChannel < ApplicationCable::Channel
      event: :broadcast_stream_update,
      status: broadcast.status,
      playback_url: broadcast.stream_playback_url,
-      full_live_stream_playback_url: broadcast.full_live_stream_playback_url,
      video_content: video_content,
      status_content: status_content,
      streamer_status: broadcast.streamer_status
--- a/app/controllers/approvals_controller.rb
+++ b/app/controllers/approvals_controller.rb
@@ -1,28 +1,21 @@
 class ApprovalsController < ApplicationController
-  before_action :set_releasable
+  include MedicalReleaseContext
+
+  before_action :set_medical_release
  before_action :set_project

  layout "project"

  def create
-    @releasable.approve_by(current_user)
-
-    if @releasable.save
-      redirect_to [@project, "#{@releasable_param.name.pluralize}"], notice: t('.release_approved', release_type: @releasable.model_name.human)
+    @medical_release.approve_by(current_user)
+    if @medical_release.save
+      redirect_to [@project, :medical_releases], notice: t('.release_approved')
    end
  end

  private

-  def releasable_param
-    @releasable_param ||= ReleasableParam.new(params.to_unsafe_h)
-  end
-
-  def set_releasable
-    @releasable = authorize policy_scope(releasable_param.type).find(releasable_param.id)
-  end
-
  def set_project
-    @project = @releasable.project
+    @project = @medical_release.project
  end
 end
--- a/app/controllers/broadcasts_controller.rb
+++ b/app/controllers/broadcasts_controller.rb
@@ -60,7 +60,7 @@ class BroadcastsController < ApplicationController
  end

  def broadcast_params
-    params.require(:broadcast).permit(:name, :shoot_location_time_zone, files: [])
+    params.require(:broadcast).permit(:name, files: [])
  end

  def set_project
--- a/app/controllers/contract_templates/duplicates_controller.rb
+++ b/app/controllers/contract_templates/duplicates_controller.rb
@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-class ContractTemplates::DuplicatesController < ApplicationController
-  before_action :set_contract_template
-
-  def create
-    authorize(ContractTemplate)
-    new_contract_template = @contract_template.dup
-    new_contract_template.name = I18n.t('contract_templates.duplicate.name_prefix', template_name: @contract_template.name)
-
-    # Duplicate rich text fields
-
-    new_contract_template.body = @contract_template.body
-    new_contract_template.guardian_clause = @contract_template.guardian_clause
-    new_contract_template.signature_legal_text = @contract_template.signature_legal_text
-
-    if new_contract_template.save
-      redirect_to [:edit, new_contract_template]
-    else
-      redirect_to [@contract_template.project, :contract_templates], alert: t('.error')
-    end
-  end
-
-  private
-
-  def contract_templates
-    policy_scope(ContractTemplate)
-  end
-
-  def set_contract_template
-    @contract_template = contract_templates.find(params[:contract_template_id])
-  end
-end
--- a/app/controllers/contract_templates/qr_codes_controller.rb
+++ b/app/controllers/contract_templates/qr_codes_controller.rb
@@ -16,12 +16,7 @@ class ContractTemplates::QrCodesController < ApplicationController
  end

  def qr_code
-    if params[:multi_sign_ids].present?
-      contract_templates_group = authorize contract_templates.where(id: params[:multi_sign_ids]).order_by_recent
-      authorize QrCode.build_from_multiple_contract_templates(contract_templates_group, @contract_template.project)
-    else
-      authorize QrCode.build_from_contract_template(@contract_template)
-    end
+    authorize QrCode.build_from_contract_template(@contract_template)
  end

  def download_attributes
--- a/app/controllers/contract_templates_controller.rb
+++ b/app/controllers/contract_templates_controller.rb
@@ -5,9 +5,8 @@ class ContractTemplatesController < ApplicationController

  layout 'project'

-  before_action :set_project, except: [:destroy, :edit, :update]
-  before_action :set_contract_template, only: [:destroy, :edit, :update]
-  before_action :set_project_from_contract_template, only: [:edit, :update]
+  before_action :set_project, except: [:destroy]
+  before_action :set_contract_template, only: [:destroy]
  before_action :show_splash_screen, only: :index

  def index
@@ -33,20 +32,6 @@ class ContractTemplatesController < ApplicationController
    end
  end

-  def edit
-    @release_type = @contract_template.release_type
-  end
-
-  def update
-    @contract_template.attributes = contract_template_params
-
-    if @contract_template.save
-      redirect_to [@project, :contract_templates], notice: t('.notice')
-    else
-      render :edit
-    end
-  end
-
  def destroy
    @contract_template.archive
    redirect_to [@contract_template.project, :contract_templates], alert: t('.archived_notice')
@@ -54,10 +39,6 @@ class ContractTemplatesController < ApplicationController

  private

-  def set_project_from_contract_template
-    @project = @contract_template.project
-  end
-
  def show_splash_screen
    render :splash if contract_templates.non_archived.count.zero?
  end
@@ -82,7 +63,7 @@ class ContractTemplatesController < ApplicationController
    params
      .require(:contract_template)
      .permit(:name, :release_type, :body, :guardian_clause,
-              :signature_legal_text, :fee, :amendment_clause,
+              :signature_legal_text, :fee,
              :applicable_medium_id, :applicable_medium_text,
              :territory_id, :territory_text,
              :term_id, :term_text, :accessibility,
--- a/app/controllers/public/amendments_controller.rb
+++ b/app/controllers/public/amendments_controller.rb
@@ -1,47 +0,0 @@
-class Public::AmendmentsController < Public::BaseController
-  skip_after_action :verify_authorized, :verify_policy_scoped
-  before_action :set_account, :set_project, :set_contract_template, :set_release
-
-  def new
-    if @release.amendment_signed?
-      render :create, locals: { already_signed: true }
-    end
-  end
-
-  def create
-    if @release.amendment_signed?
-      render :create, locals: { already_signed: true }
-      return
-    end
-
-    @release.attributes = amendment_params
-
-    render :new unless @release.save(context: :amendment)
-  end
-
-  private
-
-  def amendment_params
-    params.require(releasable_param.name).permit(:amendment_signer_name, :amendment_signature_base64)
-  end
-
-  def releasable_param
-    @releasable_param ||= ReleasableParam.new(params.to_unsafe_h)
-  end
-
-  def set_release
-    @release = @contract_template.releases.find(releasable_param.id)
-  end
-
-  def set_contract_template
-    @contract_template = @project.contract_templates.find(params[:contract_template_id])
-  end
-
-  def set_project
-    @project = @account.projects.find(params[:project_id])
-  end
-
-  def set_account
-    @account = Account.find_by(slug: params[:account_id])
-  end
-end
--- a/app/controllers/public/contract_templates_controller.rb
+++ b/app/controllers/public/contract_templates_controller.rb
@@ -1,18 +0,0 @@
-class Public::ContractTemplatesController < Public::BaseController
-  skip_after_action :verify_authorized, :verify_policy_scoped
-  before_action :set_account, :set_project
-
-  def index
-    @contract_templates = @project.contract_templates.where(id: params[:contract_template_ids]).order_by_name.paginate(page: params[:page])
-  end
-
-  private
-
-  def set_project
-    @project = @account.projects.find(params[:project_id])
-  end
-
-  def set_account
-    @account = Account.find_by(slug: params[:account_id])
-  end
-end
--- a/app/controllers/stream_notifications_controller.rb
+++ b/app/controllers/stream_notifications_controller.rb
@@ -14,10 +14,6 @@ class StreamNotificationsController < ApplicationController
    when "video.live_stream.recording"
      @broadcast.streamer_recording!
      notify_users
-    when "video.asset.ready"
-      full_live_stream_playback_uid = notification.dig(:data, :playback_ids, 0, :id)
-      @broadcast.update(full_live_stream_playback_uid: full_live_stream_playback_uid)
-      notify_users
    when "video.live_stream.active"
      @broadcast.active!
      notify_users
@@ -63,8 +59,7 @@ class StreamNotificationsController < ApplicationController
  end

  def set_broadcast
-    case notification_type
-    when "video.asset.static_renditions.ready", "video.asset.ready"
+    if notification_type == "video.asset.static_renditions.ready"
      live_stream_id = notification.dig(:stream_notification, :data, :live_stream_id)
      @broadcast = Broadcast.find_by(stream_uid: live_stream_id)
    else
--- a/app/helpers/tooltip_helper.rb
+++ b/app/helpers/tooltip_helper.rb
@@ -6,11 +6,11 @@ module TooltipHelper
    end
  end

-  def get_approval_data_for_releasable(release)
-    if release.approved_by_user_name.present?
-      "#{release.approved_by_user_name} [#{release.approved_by_user_email}]"
+  def get_approval_data_for_medical_release(medical_release)
+    if medical_release.approved_by_user_name.present?
+      "#{medical_release.approved_by_user_name} [#{medical_release.approved_by_user_email}]"
    else
-      release.approved_by_user_email
+      medical_release.approved_by_user_email
    end
  end
 end
--- a/app/models/acquired_media_release.rb
+++ b/app/models/acquired_media_release.rb
@@ -10,7 +10,6 @@ class AcquiredMediaRelease < ApplicationRecord
  include Syncable
  include PersonName
  include CsvExportable
-  include Approvable

  class << self
    def custom_csv_exportable_headers
--- a/app/models/appearance_release.rb
+++ b/app/models/appearance_release.rb
@@ -16,7 +16,6 @@ class AppearanceRelease < ApplicationRecord
  include GuardianName
  include SecondGuardianName
  include CsvExportable
-  include Approvable

  class << self
    def custom_csv_exportable_headers
--- a/app/models/broadcast.rb
+++ b/app/models/broadcast.rb
@@ -30,10 +30,6 @@ class Broadcast < ApplicationRecord
    "https://stream.mux.com/#{stream_playback_uid}.m3u8"
  end

-  def full_live_stream_playback_url
-    full_live_stream_playback_uid.blank? ? stream_playback_url : "https://stream.mux.com/#{full_live_stream_playback_uid}.m3u8"
-  end
-
  def stream_server_url
    ENV['MUX_BROADCAST_SERVER_URL']
  end
--- a/app/models/broadcast_recording.rb
+++ b/app/models/broadcast_recording.rb
@@ -14,6 +14,6 @@ class BroadcastRecording < ApplicationRecord
  end

  def download_file_name
-    "#{broadcast_name}_Date_#{created_at.in_time_zone(broadcast.shoot_location_time_zone).strftime("%Y-%m-%d")}_Time_#{created_at.in_time_zone(broadcast.shoot_location_time_zone).strftime("%T")}".parameterize
+    "#{broadcast_name}_Date_#{created_at.strftime("%Y-%m-%d")}_Time_#{created_at.strftime("%T")}".parameterize
  end
 end
--- a/app/models/concerns/amendmenable.rb
+++ b/app/models/concerns/amendmenable.rb
@@ -1,32 +0,0 @@
-module Amendmenable
-  extend ActiveSupport::Concern
-
-  included do
-    include ActiveStorageSupport::SupportForBase64
-
-    has_one_base64_attached :amendment_signature
-
-    with_options on: :amendment do
-      validates :amendment_signer_name, presence: true
-      validates :amendment_signature, attached: true
-    end
-  end
-
-  def amendment_signable?
-    contract_template.present? && contract_template.amendment_clause.present?
-  end
-
-  def amendment_signed?
-    amendment_signature.attached?
-  end
-
-  def amendment_signature_base64
-    nil
-  end
-
-  def amendment_signature_base64=(data_uri)
-    return if data_uri.blank?
-
-    amendment_signature.attach(data: data_uri, filename: "amendment_signature.png", content_type: "image/png", identify: "false")
-  end
-end
--- a/app/models/concerns/approvable.rb
+++ b/app/models/concerns/approvable.rb
@@ -1,17 +0,0 @@
-module Approvable
-  extend ActiveSupport::Concern
-  
-  included do
-    def approve_by(user)
-      return unless approved_at.nil?
-  
-      self.approved_by_user_name = user.full_name
-      self.approved_by_user_email = user.email
-      self.approved_at = Time.zone.now
-    end
-  
-    def approved?
-      self.approved_at.present?
-    end
-  end
-end
--- a/app/models/concerns/csv_exportable.rb
+++ b/app/models/concerns/csv_exportable.rb
@@ -3,7 +3,7 @@
 module CsvExportable
  extend ActiveSupport::Concern

-  COMMON_HEADERS = %i[approved? notes tags signed_at].freeze
+  COMMON_HEADERS = %i[notes tags signed_at].freeze
  COMMON_VALUES = %w[clean_notes clean_tags signed_on].freeze

  included do
--- a/app/models/contract_template.rb
+++ b/app/models/contract_template.rb
@@ -22,7 +22,6 @@ class ContractTemplate < ApplicationRecord
  has_rich_text :body
  has_rich_text :guardian_clause
  has_rich_text :signature_legal_text
-  has_rich_text :amendment_clause

  validates :name, presence: true
  validates :release_type, presence: true
@@ -70,13 +69,9 @@ class ContractTemplate < ApplicationRecord
    (1..NUMBER_OF_CUSTOM_FIELDS).any? { |n| public_send("question_#{n}_text").presence }
  end

-  def editable?
-    releases.size.zero?
-  end
-
  def attributes
    result = super()
-    result[:signature_legal_text] = signature_legal_text.as_json
+    result[:signature_legal_text] = signature_legal_text.as_json 
    result
  end
 end
--- a/app/models/location_release.rb
+++ b/app/models/location_release.rb
@@ -11,8 +11,6 @@ class LocationRelease < ApplicationRecord
  include Taggable
  include PersonName
  include CsvExportable
-  include Approvable
-  include Amendmenable

  class << self
    def custom_csv_exportable_headers
--- a/app/models/material_release.rb
+++ b/app/models/material_release.rb
@@ -11,7 +11,6 @@ class MaterialRelease < ApplicationRecord
  include Taggable
  include PersonName
  include CsvExportable
-  include Approvable

  class << self
    def custom_csv_exportable_headers
--- a/app/models/medical_release.rb
+++ b/app/models/medical_release.rb
@@ -12,11 +12,10 @@ class MedicalRelease < ApplicationRecord
  include GuardianName
  include SecondGuardianName
  include CsvExportable
-  include Approvable

  class << self
    def custom_csv_exportable_headers
-      %i[name contact_info]
+      %i[approved? name contact_info]
    end
  end

@@ -108,6 +107,18 @@ class MedicalRelease < ApplicationRecord
    "#{project.name.parameterize}_#{contract_template.release_type}_#{(signed_at || created_at).strftime("%Y.%m.%d")}_#{release_number}_#{filename_suffix.parameterize}"
  end

+  def approve_by(user)
+    return unless approved_at.nil?
+
+    self.approved_by_user_name = user.full_name
+    self.approved_by_user_email = user.email
+    self.approved_at = Time.zone.now
+  end
+
+  def approved?
+    approved_at.present?
+  end
+
  private

  def valid_answers
--- a/app/models/misc_release.rb
+++ b/app/models/misc_release.rb
@@ -10,7 +10,6 @@ class MiscRelease < ApplicationRecord
  include GuardianName
  include GuardianPhotoable
  include CsvExportable
-  include Approvable

  class << self
    def custom_csv_exportable_headers
--- a/app/models/music_release.rb
+++ b/app/models/music_release.rb
@@ -8,7 +8,6 @@ class MusicRelease < ApplicationRecord
  include Taggable
  include PersonName
  include CsvExportable
-  include Approvable

  class << self
    def custom_csv_exportable_headers
--- a/app/models/qr_code.rb
+++ b/app/models/qr_code.rb
@@ -13,18 +13,6 @@ class QrCode
    new(url, "#{filename}.png")
  end

-  def self.build_from_multiple_contract_templates(contract_templates, project)
-    account   = project.account
-    locale    = I18n.locale
-    host      = AppHost.new.domain_with_port
-    route     = [account, project, :contract_templates, contract_template_ids: contract_templates.ids, locale: I18n.locale, host: AppHost.new.domain_with_port]
-
-    url       = Rails.application.routes.url_helpers.url_for(route)
-    filename  = [project.account.name, project.name].map(&:parameterize).join("_")
-
-    new(url, "#{filename}.png")
-  end
-
  def initialize(url, filename = "qrcode.png")
    @url = url
    @filename = filename
--- a/app/models/talent_release.rb
+++ b/app/models/talent_release.rb
@@ -15,7 +15,6 @@ class TalentRelease < ApplicationRecord
  include GuardianName
  include SecondGuardianName
  include CsvExportable
-  include Approvable

  class << self
    def custom_csv_exportable_headers
@@ -111,7 +110,7 @@ class TalentRelease < ApplicationRecord
  end

  def uses_edl?
-    true
+    false
  end

  def second_guardian_present?
--- a/app/policies/acquired_media_release_policy.rb
+++ b/app/policies/acquired_media_release_policy.rb
@@ -30,12 +30,4 @@ class AcquiredMediaReleasePolicy < ApplicationPolicy
  def download_multiple?
    true
  end
-
-  def review?
-    user.account_manager?
-  end
-
-  def approve?
-    review?
-  end
 end
--- a/app/policies/appearance_release_policy.rb
+++ b/app/policies/appearance_release_policy.rb
@@ -26,12 +26,4 @@ class AppearanceReleasePolicy < ReleasePolicy
  def download_multiple?
    true
  end
-
-  def review?
-    user.account_manager?
-  end
-
-  def approve?
-    review?
-  end
 end
--- a/app/policies/contract_template_policy.rb
+++ b/app/policies/contract_template_policy.rb
@@ -23,18 +23,6 @@ class ContractTemplatePolicy < ApplicationPolicy
    create?
  end

-  def edit?
-    record.editable? && create?
-  end
-
-  def update?
-    edit?
-  end
-
-  def duplicate?
-    create?
-  end
-
  def import?
    if user.account_manager?
      record.project.account = user.account
--- a/app/policies/location_release_policy.rb
+++ b/app/policies/location_release_policy.rb
@@ -34,16 +34,4 @@ class LocationReleasePolicy < ReleasePolicy
  def download_multiple?
    true
  end
-
-  def review?
-    user.account_manager?
-  end
-
-  def sign_amendment?
-    user.manager? || user.account_manager?
-  end
-
-  def approve?
-    review?
-  end
 end
--- a/app/policies/material_release_policy.rb
+++ b/app/policies/material_release_policy.rb
@@ -34,12 +34,4 @@ class MaterialReleasePolicy < ReleasePolicy
  def download_multiple?
    true
  end
-
-  def review?
-    user.account_manager?
-  end
-
-  def approve?
-    review?
-  end
 end
--- a/app/policies/misc_release_policy.rb
+++ b/app/policies/misc_release_policy.rb
@@ -38,12 +38,4 @@ class MiscReleasePolicy < ReleasePolicy
  def download_multiple?
    download_single?
  end
-
-  def review?
-    user.account_manager?
-  end
-
-  def approve?
-    review?
-  end
 end
--- a/app/policies/music_release_policy.rb
+++ b/app/policies/music_release_policy.rb
@@ -22,12 +22,4 @@ class MusicReleasePolicy < ReleasePolicy
  def download_multiple?
    true
  end
-
-  def review?
-    user.account_manager?
-  end
-
-  def approve?
-    review?
-  end
 end
--- a/app/policies/talent_release_policy.rb
+++ b/app/policies/talent_release_policy.rb
@@ -34,12 +34,4 @@ class TalentReleasePolicy < ReleasePolicy
  def download_multiple?
    true
  end
-
-  def review?
-    user.account_manager?
-  end
-
-  def approve?
-    review?
-  end
 end
--- a/app/views/acquired_media_releases/_acquired_media_release.html.erb
+++ b/app/views/acquired_media_releases/_acquired_media_release.html.erb
@@ -1,13 +1,5 @@
 <tr id="<%= dom_id(acquired_media_release) %>">
  <td data-behavior="select"><%= check_box_tag "acquired_media_release_ids[]", acquired_media_release.id, false %></td>
-  <td class="text-center">
-    <% if acquired_media_release.approved? %>
-      <% tooltip_user_data = get_approval_data_for_releasable(acquired_media_release) %>
-      <i class="fa fa-check-circle fa-2x text-success"
-         data-toggle="tooltip"
-         title="<%= t '.messages.approved_tooltip', user: tooltip_user_data, timestamp: acquired_media_release.approved_at %>"></i>
-    <% end %>
-  </td>
  <td>
    <%= acquired_media_release.name %>
  </td>
@@ -43,9 +35,6 @@
        <% if policy(Contract).show? && (acquired_media_release.contract.attached? || acquired_media_release.contract_template.present?) %>
          <%= link_to fa_icon("download fw", text: "Download"), [acquired_media_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>
        <% end %>
-        <% if policy(AcquiredMediaRelease).review? %>
-          <%= link_to fa_icon("search fw", text: t('.actions.review')), new_acquired_media_release_approvals_path(acquired_media_release), class: "dropdown-item" %>
-        <% end %>
        <% if policy(acquired_media_release).edit? %>
          <%= link_to fa_icon("pencil fw", text: "Edit"), [:edit, acquired_media_release], class: "dropdown-item" %>
        <% end %>
--- a/app/views/acquired_media_releases/index.html.erb
+++ b/app/views/acquired_media_releases/index.html.erb
@@ -26,7 +26,6 @@
    <thead class="thead-light">
      <tr>
        <th data-behavior="all-selectable"><%= check_box_tag "acquired_media_release_ids[]", false, false %></th>
-        <th><%= t '.table_headers.approved'%></th>
        <th><%= AcquiredMediaRelease.human_attribute_name(:name) %></th>
        <th><%= t(".table_headers.file_infos_count") %></th>
        <th><%= t(".table_headers.notes") %></th>
--- a/app/views/appearance_releases/_appearance_release.html.erb
+++ b/app/views/appearance_releases/_appearance_release.html.erb
@@ -1,13 +1,5 @@
 <tr id="<%= dom_id(appearance_release) %>">
  <td data-behavior="select"><%= check_box_tag "appearance_release_ids[]", appearance_release.id, false %></td>
-  <td class="text-center">
-    <% if appearance_release.approved? %>
-      <% tooltip_user_data = get_approval_data_for_releasable(appearance_release) %>
-      <i class="fa fa-check-circle fa-2x text-success"
-          data-toggle="tooltip"
-          title="<%= t '.messages.approved_tooltip', user: tooltip_user_data, timestamp: appearance_release.approved_at %>"></i>
-    <% end %>
-  </td>
  <td>
    <% if appearance_release.photo.attached? %>
      <%= image_tag medium_variant(appearance_release.photo) %>
@@ -47,9 +39,6 @@
        <% if policy(Contract).show? && (appearance_release.contract.attached? || appearance_release.contract_template.present?) %>
          <%= link_to fa_icon("download fw", text: "Download"), [appearance_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>
        <% end %>
-        <% if policy(AppearanceRelease).review? %>
-          <%= link_to fa_icon("search fw", text: t('.actions.review')), new_appearance_release_approvals_path(appearance_release), class: "dropdown-item" %>
-        <% end %>
        <% if policy(appearance_release).edit? %>
          <%= link_to fa_icon("pencil fw", text: "Edit"), [:edit, appearance_release], class: "dropdown-item" %>
        <% end %>
--- a/app/views/appearance_releases/index.html.erb
+++ b/app/views/appearance_releases/index.html.erb
@@ -44,7 +44,6 @@
    <thead class="thead-light">
      <tr>
        <th data-behavior="all-selectable"><%= check_box_tag "appearance_release_ids[]", false, false %></th>
-        <th><%= t '.table_headers.approved'%></th>
        <th></th>
        <th><%= AppearanceRelease.human_attribute_name(:person_name) %></th>
        <th><%= AppearanceRelease.human_attribute_name(:contact_info) %></th>
--- a/app/views/approvals/new.html.erb
+++ b/app/views/approvals/new.html.erb
@@ -1,11 +1,11 @@
 <div class="card shadow-sm">
-  <%= card_header text: t(".heading", release_type: @releasable_param.name.titleize), close_action_path: [@project, "#{@releasable_param.name.pluralize}"] %>
+  <%= card_header text: t(".heading"), close_action_path: [@project, :medical_releases] %>
  <div class="card-body">
-    <embed class="embeded-contract-preview" type="application/pdf" src="<%= url_for [@releasable, :contracts, format: "pdf"] %>" width="90%" height="1200" />
+    <embed class="embeded-contract-preview" type="application/pdf" src="<%= url_for [@medical_release, :contracts, format: "pdf"] %>" width="90%" height="1200" />

-    <%= bootstrap_form_with model: @releasable, method: :post, url: public_send("#{@releasable_param.name}_approvals_path", @releasable), local: true do |form| %>
+    <%= bootstrap_form_with model: @medical_release, method: :post, url: medical_release_approvals_path(@medical_release), local: true do |form| %>
      <div class="row align-items-center text-center mt-4">
-        <%= link_to t("shared.cancel"), [@releasable.project, "#{@releasable_param.name.pluralize}"], class: "col-3 text-reset" %>
+        <%= link_to t("shared.cancel"), [@medical_release.project, :medical_releases], class: "col-3 text-reset" %>
        <div class="col-9">
          <%= form.button t('.actions.approve'), id: "approve_release", class: class_string("btn btn-block btn-success btn-primary"), data: { disable_with: t("shared.disable_with") } %>
        </div>
--- a/app/views/broadcasts/_broadcast.html.erb
+++ b/app/views/broadcasts/_broadcast.html.erb
@@ -3,9 +3,6 @@
  <td>
    <%= broadcast.name %>
  </td>
-  <td>
-    <%= broadcast.shoot_location_time_zone %>
-  </td>
  <td>
    <%= broadcast.status.titleize %>
  </td>
--- a/app/views/broadcasts/_form.html.erb
+++ b/app/views/broadcasts/_form.html.erb
@@ -2,7 +2,6 @@

 <%= bootstrap_form_with model: model, local: true do |form| %>
  <%= form.text_field :name %>
-  <%= form.time_zone_select(:shoot_location_time_zone, nil, label: "Time zone of shoot location") %>

  <div class="row align-items-center text-center mt-4">
    <%= link_to t("shared.cancel"), [project, :broadcasts], class: "col-3 text-reset" %>
--- a/app/views/broadcasts/index.html.erb
+++ b/app/views/broadcasts/index.html.erb
@@ -22,7 +22,6 @@
      <tr>
        <th></th>
        <th><%= t(".table_headers.broadcast_name") %></th>
-        <th><%= t(".table_headers.broadcast_time_zone") %></th>
        <th><%= t(".table_headers.broadcast_status") %></th>
        <th><%= t(".table_headers.broadcast_created_at") %></th>
        <th></th>
@@ -33,7 +32,7 @@
        <%= render @broadcasts %>
      <% else %>
        <tr>
-          <td colspan="6" class="py-4 text-center text-muted"><%= t(".empty") %></td>
+          <td colspan="5" class="py-4 text-center text-muted"><%= t(".empty") %></td>
        </tr>
      <% end %>
    </tbody>
--- a/app/views/broadcasts/show.html.erb
+++ b/app/views/broadcasts/show.html.erb
@@ -33,10 +33,10 @@
            <%= link_to "Switch View", "#", class: "btn btn-light border dropdown-toggle", role: "button", id: "dropdownMenuLink", data: { toggle: "dropdown" }, aria: { haspopup: "true", expanded: "false" } %>
            <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
              <h5 class="dropdown-header">Live Streams</h5>
-              <%= link_to fa_icon("check", text: @broadcast.name.titleize), "#", data: { behavior: "play_stream"}, class: "dropdown-item active" %>
+              <%= link_to fa_icon("check", text: @broadcast.name.titleize), "#", class: "dropdown-item active" %>
              <% @multi_view_broadcasts.each do |broadcast| %>
                <% if broadcast.id != @broadcast.id %>
-                  <%= link_to broadcast.name.titleize, broadcast.url, data: { behavior: "play_stream"}, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
+                  <%= link_to broadcast.name.titleize, broadcast.url, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
                <% end %>
              <% end %>
              <h5 class="dropdown-header">Previous Sessions</h5>
--- a/app/views/contract_templates/_contract_template.html.erb
+++ b/app/views/contract_templates/_contract_template.html.erb
@@ -1,5 +1,4 @@
 <tr>
-  <td data-behavior="select_contract_template"><%= check_box_tag "contract_template_ids[]", contract_template.id, false %></td>
  <td>
    <%= contract_template.name %>
  </td>
@@ -20,12 +19,6 @@
    <div class="btn-group">
      <%= button_tag t(".actions.manage"), class: "btn btn-light btn-sm dropdown-toggle border", data: { toggle: "dropdown", boundary: "window" }, aria: { haspopup: true, expanded: false } %>
      <div class="dropdown-menu dropdown-menu-right">
-        <% if policy(contract_template).edit? %>
-          <%= link_to fa_icon("pencil fw", text: t(".actions.edit")), [:edit, contract_template], class: "dropdown-item" %>
-        <% end %>
-        <% if policy(ContractTemplate).duplicate? %>
-          <%= link_to fa_icon("clone fw", text: t(".actions.duplicate")), contract_template_duplicates_path(contract_template), method: :post, class: "dropdown-item" %>
-        <% end %>
        <% if policy(QrCode).show? %>
          <%= link_to fa_icon("qrcode", text: t(".actions.qr_code")), [contract_template, :qr_codes], class: "dropdown-item", target: :_blank %>
        <% end %>
--- a/app/views/contract_templates/_form.html.erb
+++ b/app/views/contract_templates/_form.html.erb
@@ -1,8 +1,8 @@
-<%= bootstrap_form_with model: model, local: true do |form| %>
+<%= bootstrap_form_with model: [project, contract_template], local: true do |form| %>
  <%= field_set_tag content_tag(:span, t(".release_info.heading"), class: "h6 text-muted text-uppercase") do %>
    <div class="form-row">
      <%= form.text_field :name, wrapper_class: "col-sm-6" %>
-      <%= form.select :release_type, options_for_release_type_select(project, @release_type), { wrapper_class: "col-sm-6" }, data: { toggle: "collapse-select", target_show_values_mapping: { "#guardian_clause": %w(appearance talent misc medical), "#fee_field": %w(appearance talent location material acquired_media), "#exploitable_rights_fields": %w(appearance talent location material acquired_media), "#custom_fields": %w(medical misc), "#amendment_clause": %w(location) } }, class: "form-control custom-select" %>
+      <%= form.select :release_type, options_for_release_type_select(project, @release_type), { wrapper_class: "col-sm-6" }, data: { toggle: "collapse-select", target_show_values_mapping: { "#guardian_clause": %w(appearance talent misc medical), "#fee_field": %w(appearance talent location material acquired_media), "#exploitable_rights_fields": %w(appearance talent location material acquired_media), "#custom_fields": %w(medical misc) } }, class: "form-control custom-select" %>
    </div>
    <div class="form-row mb-3">
      <%= form.radio_button :accessibility, :public_template, label: "Public", wrapper_class: "mr-3" %>
@@ -29,11 +29,6 @@
        <%= form.rich_text_area :guardian_clause %>
      <% end %>
    </div>
-    <div id="amendment_clause">
-      <%= form.form_group do %>
-        <%= form.rich_text_area :amendment_clause %>
-      <% end %>
-    </div>
    <div id="signature_legal_text">
      <%= form.form_group do %>
        <%= form.rich_text_area :signature_legal_text %>
--- a/app/views/contract_templates/edit.html.erb
+++ b/app/views/contract_templates/edit.html.erb
@@ -1,6 +0,0 @@
-<div class="card shadow-sm">
-  <%= card_header text: t(".heading"), close_action_path: [@project, :contract_templates] %>
-  <div class="card-body">
-    <%= render "form", model: @contract_template, project: @project, contract_template: @contract_template %>
-  </div>
-</div>
--- a/app/views/contract_templates/index.html.erb
+++ b/app/views/contract_templates/index.html.erb
@@ -5,14 +5,12 @@
    <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :contract_template], class: "btn btn-primary" %>
    <%= link_to fa_icon("clone", text: t(".actions.import")), [:new, @project, :release_template_imports], class: "btn btn-secondary" %>
  <% end %>
-  <%= link_to "Group QR Code", "javascript:void(0);", class: "btn btn-light border disabled", id: "group_qr_code", data: { project_id: @project.id, contract_template_ids: [] } %>
 </p>

 <div class="border bg-white rounded shadow-sm pb-3 table-responsive">
  <table class="table table-striped tr-px-4 align-all-middle">
    <thead class="thead-light">
      <tr>
-        <th></th>
        <th><%= ContractTemplate.human_attribute_name(:name) %></th>
        <th><%= ContractTemplate.human_attribute_name(:fee) %></th>
        <th><%= t(".table_headers.release_type") %></th>
--- a/app/views/contract_templates/new.html.erb
+++ b/app/views/contract_templates/new.html.erb
@@ -1,6 +1,6 @@
 <div class="card shadow-sm">
  <%= card_header text: t(".heading"), close_action_path: [@project, :contract_templates] %>
  <div class="card-body">
-    <%= render "form", model: [@project, @contract_template], project: @project, contract_template: @contract_template %>
+    <%= render "form", project: @project, contract_template: @contract_template %>
  </div>
 </div>
--- a/app/views/contracts/_amendment_page.html.erb
+++ b/app/views/contracts/_amendment_page.html.erb
@@ -1,19 +0,0 @@
-<% if preview %>
-  <h1>PREVIEW ONLY</h1>
-<% end %>
-
-<p class="heading"><strong><u><%= t '.heading' %></u></strong></p>
-
-<dl>
-  <%= description_list_pair "#{t('.description_labels.amendment_clause')}:", releasable.contract_template.amendment_clause %>
-  <%= description_list_pair "#{t('.description_labels.amendment_signer_name')}:", releasable.amendment_signer_name %>
-
-  <dt><%= t('.description_labels.amendment_signature') %>:</dt>
-  <dd>
-    <% if preview %>
-      <%= image_tag dummy_signature %>
-    <% elsif releasable.amendment_signature.attached? %>
-      <%= image_tag releasable.amendment_signature.variant(auto_orient: true, resize: "200x200") %>
-    <% end %>
-  </dd>
-</dl>
--- a/app/views/contracts/_for_office_use_only.erb
+++ b/app/views/contracts/_for_office_use_only.erb
@@ -7,7 +7,7 @@
 <dl>
  <%= description_list_pair t('.description_labels.producer'), releasable.project.account.name %>
  <%= description_list_pair t('.description_labels.production'), releasable.project.name %>
-  <%= description_list_pair t('.description_labels.issued_to'), releasable.name %>
+  <%= description_list_pair t('.description_labels.employee_issued_to'), releasable.name %>
  <%= description_list_pair t('.description_labels.issued_by'), releasable.approved_by_user_name %>
  <%= description_list_pair t('.description_labels.date_issued'), releasable.approved_at %>
 </dl>
--- a/app/views/contracts/pdf.html.erb
+++ b/app/views/contracts/pdf.html.erb
@@ -26,13 +26,7 @@
  <%= render "contracts/signature_page", releasable: releasable, contract_template: contract_template, preview: preview %>
 </div>

-<% if releasable.respond_to?(:amendment_signed?) && releasable.amendment_signed? %>
-  <div class="page">
-    <%= render "contracts/amendment_page", releasable: releasable, preview: preview %>
-  </div>
-<%end %>
-
-<% if releasable.respond_to?(:approved?) && releasable.approved? %>
+<% if releasable.class == MedicalRelease && releasable.approved? %>
  <div class="page">
    <%= render "contracts/for_office_use_only", releasable: releasable, preview: preview %>
  </div>
--- a/app/views/location_releases/_location_release.html.erb
+++ b/app/views/location_releases/_location_release.html.erb
@@ -1,13 +1,5 @@
 <tr id="<%= dom_id(location_release) %>">
  <td data-behavior="select"><%= check_box_tag "location_release_ids[]", location_release.id, false %></td>
-  <td class="text-center">
-    <% if location_release.approved? %>
-      <% tooltip_user_data = get_approval_data_for_releasable(location_release) %>
-      <i class="fa fa-check-circle fa-2x text-success"
-         data-toggle="tooltip"
-         title="<%= t '.messages.approved_tooltip', user: tooltip_user_data, timestamp: location_release.approved_at %>"></i>
-    <% end %>
-  </td>
  <td>
    <% if location_release.photo.attached? %>
      <%= image_tag medium_variant(location_release.photo), class: "img-fluid" %>
@@ -30,17 +22,6 @@
    <td>
    <%= location_release.signed_on %>
  </td>
-  <td class="text-center">
-    <% if location_release.amendment_signed? %>
-      <i class="fa fa-check-square-o text-dark"
-         data-toggle="tooltip"
-         title="<%= t '.messages.amendment_signed_tooltip' %>"></i>
-    <% elsif location_release.amendment_signable? %>
-      <i class="fa fa-square-o"
-         data-toggle="tooltip"
-         title="<%= t '.messages.amendment_not_signed_tooltip' %>"></i>
-    <% end %>
-  </td>

  <td class="text-right">
    <div class="btn-group">
@@ -55,15 +36,9 @@
        <% if policy(location_release).edit_photos? %>
          <%= link_to fa_icon("picture-o fw", text: "Photos"), [:edit, location_release, :photos], class: "dropdown-item" %>
        <% end %>
-        <% if policy(location_release).sign_amendment? && location_release.amendment_signable? && !location_release.amendment_signed? %>
-          <%= link_to fa_icon("file-text fw", text: t('.actions.sign_amendment')), [:new, location_release.project.account, location_release.project, location_release.contract_template, location_release, :amendment], class: "dropdown-item", target: "_blank" %>
-        <% end %>
        <% if policy(Contract).show? && (location_release.contract.attached? || location_release.contract_template.present?) %>
          <%= link_to fa_icon("download fw", text: "Download"), [location_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>
        <% end %>
-        <% if policy(LocationRelease).review? %>
-          <%= link_to fa_icon("search fw", text: t('.actions.review')), new_location_release_approvals_path(location_release), class: "dropdown-item" %>
-        <% end %>
        <% if policy(location_release).edit? %>
          <%= link_to fa_icon("pencil fw", text: "Edit"), [:edit, location_release], class: "dropdown-item" %>
        <% end %>
--- a/app/views/location_releases/index.html.erb
+++ b/app/views/location_releases/index.html.erb
@@ -26,14 +26,13 @@
    <thead class="thead-light">
      <tr>
        <th data-behavior="all-selectable"><%= check_box_tag "location_release_ids[]", false, false %></th>
-        <th><%= t '.table_headers.approved'%></th>
        <th></th>
        <th><%= LocationRelease.human_attribute_name(:name) %></th>
        <th><%= t(".table_headers.address") %>
        <th><%= t(".table_headers.notes") %></th>
        <th><%= t(".table_headers.tags") %></th>
-        <th><%= t(".table_headers.signed_at") %></th>
-        <th></th>
+         <th><%= t(".table_headers.signed_at") %></th>
+
        <th></th>
      </tr>
    </thead>
--- a/app/views/material_releases/_material_release.html.erb
+++ b/app/views/material_releases/_material_release.html.erb
@@ -1,13 +1,5 @@
 <tr id="<%= dom_id(material_release) %>">
  <td data-behavior="select"><%= check_box_tag "material_release_ids[]", material_release.id, false %></td>
-  <td class="text-center">
-    <% if material_release.approved? %>
-      <% tooltip_user_data = get_approval_data_for_releasable(material_release) %>
-      <i class="fa fa-check-circle fa-2x text-success"
-         data-toggle="tooltip"
-         title="<%= t '.messages.approved_tooltip', user: tooltip_user_data, timestamp: material_release.approved_at %>"></i>
-    <% end %>
-  </td>
  <td>
    <% if material_release.photo.attached? %>
      <%= image_tag medium_variant(material_release.photo), class: "img-fluid" %>
@@ -44,9 +36,6 @@
        <% if policy(Contract).show? && (material_release.contract.attached? || material_release.contract_template.present?) %>
          <%= link_to fa_icon("download fw", text: "Download"), [material_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>
        <% end %>
-        <% if policy(MaterialRelease).review? %>
-          <%= link_to fa_icon("search fw", text: t('.actions.review')), new_material_release_approvals_path(material_release), class: "dropdown-item" %>
-        <% end %>
        <% if policy(material_release).edit? %>
          <%= link_to fa_icon("pencil fw", text: "Edit"), [:edit, material_release], class: "dropdown-item" %>
        <% end %>
--- a/app/views/material_releases/index.html.erb
+++ b/app/views/material_releases/index.html.erb
@@ -26,7 +26,6 @@
    <thead class="thead-light">
      <tr>
        <th data-behavior="all-selectable"><%= check_box_tag "material_release_ids[]", false, false %></th>
-        <th><%= t '.table_headers.approved'%></th>
        <th></th>
        <th><%= MaterialRelease.human_attribute_name(:name) %></th>
        <th><%= t(".table_headers.notes") %></th>
--- a/app/views/medical_releases/_medical_release.html.erb
+++ b/app/views/medical_releases/_medical_release.html.erb
@@ -2,7 +2,7 @@
  <td data-behavior="select"><%= check_box_tag "medical_release_ids[]", medical_release.id, false %></td>
  <td class="text-center">
    <% if medical_release.approved? %>
-      <% tooltip_user_data = get_approval_data_for_releasable(medical_release) %>
+      <% tooltip_user_data = get_approval_data_for_medical_release(medical_release) %>
      <i class="fa fa-check-circle fa-2x text-success"
         data-toggle="tooltip"
         title="<%= t '.messages.approved_tooltip', user: tooltip_user_data, timestamp: medical_release.approved_at %>"></i>
--- a/app/views/misc_releases/_misc_release.html.erb
+++ b/app/views/misc_releases/_misc_release.html.erb
@@ -1,13 +1,5 @@
 <tr id="<%= dom_id(misc_release) %>">
  <td data-behavior="select"><%= check_box_tag "misc_release_ids[]", misc_release.id, false %></td>
-  <td class="text-center">
-    <% if misc_release.approved? %>
-      <% tooltip_user_data = get_approval_data_for_releasable(misc_release) %>
-      <i class="fa fa-check-circle fa-2x text-success"
-         data-toggle="tooltip"
-         title="<%= t '.messages.approved_tooltip', user: tooltip_user_data, timestamp: misc_release.approved_at %>"></i>
-    <% end %>
-  </td>
  <td>
    <% if misc_release.photo.attached? %>
      <%= image_tag medium_variant(misc_release.photo), class: "img-fluid" %>
@@ -44,9 +36,6 @@
        <% if policy(misc_release.tags).new? %>
          <%= link_to fa_icon("tags fw", text: "Tags"), [:new, misc_release, :acts_as_taggable_on_tag], class: "dropdown-item", remote: true %>
        <% end %>
-        <% if policy(MiscRelease).review? %>
-          <%= link_to fa_icon("search fw", text: t('.actions.review')), new_misc_release_approvals_path(misc_release), class: "dropdown-item" %>
-        <% end %>
        <% if policy(MedicalRelease).download_single? && policy(Contract).show? && (misc_release.contract.attached? || misc_release.contract_template.present?) %>
          <%= link_to fa_icon("download fw", text: "Download"), [misc_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>
        <% end %>
--- a/app/views/misc_releases/index.html.erb
+++ b/app/views/misc_releases/index.html.erb
@@ -22,7 +22,6 @@
    <thead class="thead-light">
      <tr>
        <th data-behavior="all-selectable"><%= check_box_tag "misc_release_ids[]", false, false %></th>
-        <th><%= t '.table_headers.approved'%></th>
        <th></th>
        <th><%= MiscRelease.human_attribute_name(:person_name) %></th>
        <th><%= MiscRelease.human_attribute_name(:contact_info) %></th>
--- a/app/views/music_releases/_music_release.html.erb
+++ b/app/views/music_releases/_music_release.html.erb
@@ -1,13 +1,5 @@
 <tr id="<%= dom_id(music_release) %>">
  <td data-behavior="select"><%= check_box_tag "music_release_ids[]", music_release.id, false %></td>
-  <td class="text-center">
-    <% if music_release.approved? %>
-      <% tooltip_user_data = get_approval_data_for_releasable(music_release) %>
-      <i class="fa fa-check-circle fa-2x text-success"
-         data-toggle="tooltip"
-         title="<%= t '.messages.approved_tooltip', user: tooltip_user_data, timestamp: music_release.approved_at %>"></i>
-    <% end %>
-  </td>
  <td>
    <%= music_release.name %>
  </td>
@@ -44,9 +36,6 @@
        <% if policy(Contract).show? && (music_release.contract.attached? || music_release.contract_template.present?) %>
          <%= link_to fa_icon("download fw", text: "Download"), [music_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>
        <% end %>
-        <% if policy(MusicRelease).review? %>
-          <%= link_to fa_icon("search fw", text: t('.actions.review')), new_music_release_approvals_path(music_release), class: "dropdown-item" %>
-        <% end %>
        <% if policy(music_release).edit? %>
          <%= link_to fa_icon("pencil fw", text: "Edit"), [:edit, music_release], class: "dropdown-item" %>
        <% end %>
--- a/app/views/music_releases/index.html.erb
+++ b/app/views/music_releases/index.html.erb
@@ -25,7 +25,6 @@
    <thead class="thead-light">
      <tr>
        <th data-behavior="all-selectable"><%= check_box_tag "music_release_ids[]", false, false %></th>
-        <th><%= t '.table_headers.approved'%></th>
        <th><%= MusicRelease.human_attribute_name(:name) %></th>
        <th><%= t(".table_headers.file_infos_count") %></th>
        <th><%= t(".table_headers.composers_count") %></th>
--- a/app/views/public/amendments/create.html.erb
+++ b/app/views/public/amendments/create.html.erb
@@ -1,3 +0,0 @@
-<% message = local_assigns[:already_signed] ? t('.amendment_already_signed_message') : t('.amendment_signed_message') %>
-<% alert_type = local_assigns[:already_signed] ? "alert-warning" : "alert-success" %>
-<p class="alert <%= alert_type %> p-3 lead text-center"><%= message %></p>
--- a/app/views/public/amendments/new.html.erb
+++ b/app/views/public/amendments/new.html.erb
@@ -1,30 +0,0 @@
-<button type="button" class="btn btn-success mb-3" data-behavior="clipboard" href="<%= polymorphic_url [:new, @account, @project, @contract_template, @release, :amendment] %>">
-  <i class="fa fa-clipboard"></i>
-  <%= t '.copy_url' %>
-</button>
-
-
-<div class="card shadow-sm">
-  <div class="card-body">
-    <%= errors_summary_for @release %>
-    <%= bootstrap_form_with model: @release, method: :post, url: public_send("account_project_contract_template_#{@contract_template.release_type}_release_amendments_path"), local: true do |form| %>
-      <%= card_field_set_tag t(".amendment.heading") do %>
-        <p><%= @contract_template.amendment_clause %></p>
-      <% end %>
-
-      <hr>
-
-      <div class="form-row">
-        <%= form.text_field :amendment_signer_name, required: true, wrapper_class: "col-sm-6" %>
-      </div>
-
-      <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", signature_field: :amendment_signature_base64, form: form %>
-      <% end %>
-
-      <div class="mt-5">
-        <%= form.button t("shared.submit_release_long"), class: "btn btn-block btn-lg btn-success", data: { disable_with: t("shared.disable_with") } %>
-      </div>
-    <% end %>
-  </div>
-</div>
--- a/app/views/public/contract_templates/_contract_template.html.erb
+++ b/app/views/public/contract_templates/_contract_template.html.erb
@@ -1,8 +0,0 @@
-<tr>
-  <td>
-    <%= contract_template.name %>
-  </td>
-  <td class="text-right" nowrap>
-    <%= link_to t(".actions.sign"), [:new, contract_template.project.account, contract_template.project, contract_template, "#{contract_template.release_type}_release"], class: "btn btn-sm btn-primary", target: :_blank %>
-  </td>
-</tr>
--- a/app/views/public/contract_templates/index.html.erb
+++ b/app/views/public/contract_templates/index.html.erb
@@ -1,27 +0,0 @@
-<% content_for :header do %>
-  <header class="container-fluid py-3 border-bottom sticky-top bg-light">
-    <div class="row align-items-center justify-content-center">
-      <div class="col-4 text-center">
-        <h1 class="h4 m-0"><%= @account.name %></h1>
-      </div>
-    </div>
-  </header>
-<% end %>
-
-<div class="border bg-white rounded shadow-sm pb-3 table-responsive">
-  <table class="table table-striped tr-px-4 align-all-middle">
-    <thead class="thead-light">
-      <tr>
-        <th><%= ContractTemplate.human_attribute_name(:name) %></th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody>
-      <%= render @contract_templates %>
-    </tbody>
-  </table>
-</div>
-
-<div class="mt-3">
-  <%= will_paginate @contract_templates %>
-</div>
--- a/app/views/shared/_signature_fields.html.erb
+++ b/app/views/shared/_signature_fields.html.erb
@@ -1,4 +1,3 @@
-<% signature_field = local_assigns[:signature_field] ? local_assigns[:signature_field] : :signature_base64 %>
 <canvas class="border bg-light w-100" data-behavior="digital-signature" data-signature-input="[data-ujs-target=signature-input]" style="height: 150px"></canvas>

 <% if local_assigns[:instruction] %>
@@ -7,7 +6,7 @@
  </small>
 <% end %>

-<%= form.hidden_field signature_field, data: { ujs_target: "signature-input" } %>
+<%= form.hidden_field :signature_base64, data: { ujs_target: "signature-input" } %>
 <div class="text-right">
  <%= button_tag class: "btn btn-sm btn-danger", data: { behavior: "clear-digital-signature" } do %>
    <%= fa_icon "refresh" %> <%= t "shared.clear" %>
--- a/app/views/talent_releases/_talent_release.html.erb
+++ b/app/views/talent_releases/_talent_release.html.erb
@@ -1,13 +1,5 @@
 <tr id="<%= dom_id(talent_release) %>">
  <td data-behavior="select"><%= check_box_tag "talent_release_ids[]", talent_release.id, false %></td>
-  <td class="text-center">
-    <% if talent_release.approved? %>
-      <% tooltip_user_data = get_approval_data_for_releasable(talent_release) %>
-      <i class="fa fa-check-circle fa-2x text-success"
-         data-toggle="tooltip"
-         title="<%= t '.messages.approved_tooltip', user: tooltip_user_data, timestamp: talent_release.approved_at %>"></i>
-    <% end %>
-  </td>
  <td>
    <% if talent_release.photo.attached? %>
      <%= image_tag medium_variant(talent_release.photo), class: "img-fluid" %>
@@ -50,9 +42,6 @@
        <% if policy(Contract).show? && (talent_release.contract.attached? || talent_release.contract_template.present?) %>
          <%= link_to fa_icon("download fw", text: "Download"), [talent_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>
        <% end %>
-        <% if policy(TalentRelease).review? %>
-          <%= link_to fa_icon("search fw", text: t('.actions.review')), new_talent_release_approvals_path(talent_release), class: "dropdown-item" %>
-        <% end %>
        <% if policy(talent_release).edit? %>
          <%= link_to fa_icon("pencil fw", text: "Edit"), [:edit, talent_release], class: "dropdown-item" %>
        <% end %>
--- a/app/views/talent_releases/index.html.erb
+++ b/app/views/talent_releases/index.html.erb
@@ -26,7 +26,6 @@
    <thead class="thead-light">
      <tr>
        <th data-behavior="all-selectable"><%= check_box_tag "talent_release_ids[]", false, false %></th>
-        <th><%= t '.table_headers.approved'%></th>
        <th></th>
        <th><%= TalentRelease.human_attribute_name(:person_name) %></th>
        <th><%= TalentRelease.human_attribute_name(:person_phone) %></th>
--- a/config/initializers/allowed_host.rb
+++ b/config/initializers/allowed_host.rb
@@ -1,6 +1,3 @@
 unless Rails.env.test?
-  allowed_hosts = ENV['ALLOWED_HOSTS'].to_s.split(",")
-
  Rails.application.config.hosts << AppHost.new.domain
-  Rails.application.config.hosts += allowed_hosts
 end
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -29,9 +29,6 @@ en:
    acquired_media_release:
      actions:
        manage: Manage
-        review: Review
-      messages:
-        approved_tooltip: Approved by %{user} on %{timestamp}
      no_media: No Media
    create:
      notice: The acquired media release has been created
@@ -52,7 +49,6 @@ en:
        search: Search
      empty: Acquired Media Releases will appear here
      table_headers:
-        approved: Approved
        file_infos_count: No. Files
        name: Name
        notes: Notes
@@ -125,9 +121,6 @@ en:
    appearance_release:
      actions:
        manage: Manage
-        review: Review
-      messages:
-        approved_tooltip: Approved by %{user} on %{timestamp}
      no_photos: Needs Photo
    create:
      failed_import: Failed to create appearance release for files listed below
@@ -159,7 +152,6 @@ en:
      empty: Appearance Releases will appear here
      imported_appearance_release_missing_attachment: Person photo or contract missing for imported appearance release
      table_headers:
-        approved: Approved
        contact_info: Contact info
        name: Name
        notes: Notes
@@ -184,11 +176,11 @@ en:
      team_member: Team Member
  approvals:
    create:
-      release_approved: "%{release_type} has been approved"
+      release_approved: Medical release has been approved
    new:
      actions:
        approve: Approve
-      heading: "Review %{release_type}" 
+      heading: Review Medical Release
  blank_contracts:
    new:
      number_of_copies_label: Number of copies
@@ -222,7 +214,6 @@ en:
        broadcast_created_at: Created Date
        broadcast_name: Name
        broadcast_status: Status
-        broadcast_time_zone: Time Zone of Shoot Location
    new:
      heading:
        Create Live Stream
@@ -264,8 +255,6 @@ en:
    contract_template:
      actions:
        copy_url: Copy Release URL
-        duplicate: Duplicate
-        edit: Edit
        manage: Manage
        qr_code: QR Code
        sign: Sign
@@ -275,13 +264,6 @@ en:
    destroy:
      archived_failure: Failed to archive the release template
      archived_notice: The release template has been archived
-    duplicate:
-      name_prefix: Copy of %{template_name}
-    duplicates:
-      create:
-        error: Failed to duplicate release template
-    edit:
-      heading: Edit Contract Template
    form:
      custom_fields:
        heading: Questionnaire
@@ -320,20 +302,12 @@ en:
        manage_large_audience: Easily manage large audiences with the crowd control feature
        print_QR_code: Print out release QR codes
        releases_automatically_organized: Releases are automatically organized as they’re submitted
-    update:
-      notice: The release template has been updated
  contracts:
-    amendment_page:
-      description_labels:
-        amendment_clause: Amendment Clause
-        amendment_signature: Amendment Signature
-        amendment_signer_name: Amendment Signer Name
-      heading: Amendment
    for_office_use_only:
      description_labels:
        date_issued: Date Issued
+        employee_issued_to: Employee Issued To
        issued_by: Issued By
-        issued_to: Issued To
        producer: Producer
        production: Production
      heading: For Office Use Only
@@ -411,7 +385,6 @@ en:
  helpers:
    help:
      contract_template:
-        amendment_clause: Leave blank if not required for this contract
        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
@@ -721,7 +694,6 @@ en:
        update: Save Changes
      contract_template:
        create: Create Release Template
-        update: Save Changes
      directory:
        create: Create Folder
        new_file: Upload Files
@@ -778,7 +750,6 @@ en:
      empty: Location Releases will appear here
      table_headers:
        address: Address
-        approved: Approved
        name: Name
        notes: Notes
        signed_at: Date Signed
@@ -786,12 +757,6 @@ en:
    location_release:
      actions:
        manage: Manage
-        review: Review
-        sign_amendment: Sign Amendment
-      messages:
-        amendment_not_signed_tooltip: Amendment not yet signed
-        amendment_signed_tooltip: Amendment Signed
-        approved_tooltip: Approved by %{user} on %{timestamp}
      no_photos: Needs Photo
    new:
      heading: Import Location Release
@@ -820,7 +785,6 @@ en:
        search: Search
      empty: Material Releases will appear here
      table_headers:
-        approved: Approved
        name: Name
        notes: Notes
        signed_at: Date Signed
@@ -828,9 +792,6 @@ en:
    material_release:
      actions:
        manage: Manage
-        review: Review
-      messages:
-        approved_tooltip: Approved by %{user} on %{timestamp}
      no_photos: Needs Photo
    new:
      heading: Import Material Release (Products / Logos)
@@ -867,7 +828,6 @@ en:
        search: Search
      empty: Misc Releases will appear here
      table_headers:
-        approved: Approved
        contact_info: Contact info
        name: Person name
        notes: Notes
@@ -876,9 +836,6 @@ en:
    misc_release:
      actions:
        manage: Manage
-        review: Review
-      messages:
-        approved_tooltip: Approved by %{user} on %{timestamp}
  music_releases:
    create:
      notice: The music release has been created
@@ -905,7 +862,6 @@ en:
        search: Search
      empty: Music Releases will appear here
      table_headers:
-        approved: Approved
        composers_count: No. Composers
        file_infos_count: No. Files
        name: Name
@@ -916,9 +872,6 @@ en:
    music_release:
      actions:
        manage: Manage
-        review: Review
-      messages:
-        approved_tooltip: Approved by %{user} on %{timestamp}
    new:
      heading: Import Music Release
    update:
@@ -1037,16 +990,6 @@ en:
          heading: Licensor/Owner Contact Information
        signature:
          heading: Signature
-    amendments:
-      create:
-        amendment_already_signed_message: Release amendment is already signed!
-        amendment_signed_message: Release amendment signed successfully! Thank you
-      new:
-        amendment:
-          heading: Amendment
-        copy_url: Copy sign amendment URL
-        signature:
-          heading: Signature
    appearance_releases:
      create: 
        notice: Your release has been signed. Thank you!
@@ -1086,16 +1029,6 @@ en:
    broadcasts:
      show:
        alert: That broadcast is no longer available
-    contract_templates:
-      contract_template:
-        actions:
-          sign: Sign
-        no_fee: No Fee
-      index:
-        heading: Release Templates
-        table_headers:
-          release_type: Type of Release
-          signed_release_count: No. Signed Releases
    location_releases:
      create: 
        notice: Your release has been signed. Thank you!
@@ -1328,7 +1261,6 @@ en:
        search: Search
      empty: Talent Releases will appear here
      table_headers:
-        approved: Approved
        email: Email
        name: Name
        notes: Notes
@@ -1340,9 +1272,6 @@ en:
    talent_release:
      actions:
        manage: Manage
-        review: Review
-      messages:
-        approved_tooltip: Approved by %{user} on %{timestamp}
    update:
      notice: The talent release has been updated
  task_requests:
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -108,17 +108,6 @@ es:
    blank_contracts:
      create:
        number_of_copies_invalid_notice: Please enter valid number greater than 0 (ES)
-    contract_template:
-      actions:
-        duplicate: Duplicate (ES)
-        edit: Edit (ES)
-    duplicate:
-      name_prefix: Copy of %{template_name} (ES)
-    duplicates:
-      create:
-        error: Failed to duplicate release template (ES)
-    edit:
-      heading: Edit Contract Template (ES)
    form:
      custom_fields:
        heading: Medical Questionnaire (ES)
@@ -145,20 +134,12 @@ es:
        manage_large_audience: Easily manage large audiences with the crowd control feature (ES)
        print_QR_code: Print out release QR codes (ES)
        releases_automatically_organized: Releases are automatically organized as they’re submitted (ES)
-    update:
-      notice: The release template has been updated (ES)
  contracts:
-    amendment_page:
-      description_labels:
-        amendment_clause: Amendment Clause (ES)
-        amendment_signature: Amendment Signature (ES)
-        amendment_signer_name: Amendment Signer Name (ES)
-      heading: Amendment (ES)
    for_office_use_only:
      description_labels:
        date_issued: Date Issued (ES)
+        employee_issued_to: Employee Issued To (ES)
        issued_by: Issued By (ES)
-        issued_to: Issued To (ES)
        producer: Producer (ES)
        production: Production (ES)
      heading: For Office Use Only (ES)
@@ -213,7 +194,6 @@ es:
  helpers:
    help:
      contract_template:
-        amendment_clause: Leave blank if not required for this contract (ES)
        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)
@@ -329,8 +309,6 @@ es:
      broadcast:
        create: Create Live Stream (ES)
        update: Save Changes (ES)
-      contract_template:
-        update: Save changes (ES)
      create: 'Crear %{model}'
      medical_release:
        update: Approve (ES)
@@ -345,12 +323,6 @@ es:
        notes: Notes (ES)
        signed_at: Date Signed (ES)
        tags: Tags (ES)
-    location_release:
-      actions:
-        sign_amendment: Sign Amendment (ES)
-      messages:
-        amendment_not_signed_tooltip: Amendment not yet signed (ES)
-        amendment_signed_tooltip: Amendment Signed (ES)
  material_releases:
    form:
      photos:
@@ -397,16 +369,6 @@ es:
        signed_at: Date Signed (ES)
        tags: Tags (ES)
  public:
-    amendments:
-      create:
-        amendment_already_signed_message: Release amendment is already signed! (ES)
-        amendment_signed_message: Release amendment signed successfully! Thank you (ES)
-      new:
-        amendment:
-          heading: Amendment
-        copy_url: Copy sign amendment URL (ES)
-        signature:
-          heading: Signature (ES)
    appearance_releases:
      create:
        notice: La autorización está firmada. ¡Gracias!
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -22,9 +22,6 @@ Rails.application.routes.draw do
  concern :file_infoable do
    resource :file_infos, only: [:edit, :update]
  end
-  concern :approvable do
-    resource :approvals, only: [:new, :create]
-  end

  constraints AdminSignedInConstraint.new do
    namespace :admin do
@@ -59,10 +56,9 @@ Rails.application.routes.draw do
      resources :talent_releases, except: [:show], concerns: [:contractable, :notable, :photoable]
      resources :medical_releases, except: [:show], concerns: [:contractable, :notable, :photoable]
      resources :misc_releases, except: [:show], concerns: [:contractable, :notable, :photoable]
-      resources :contract_templates, only: [:index, :new, :create, :edit, :update, :destroy] do
+      resources :contract_templates, only: [:index, :new, :create, :destroy] do
        resource :qr_codes, only: [:show], controller: "contract_templates/qr_codes"
        resource :blank_contracts, only: [:show, :new, :create], controller: "contract_templates/blank_contracts"
-        resource :duplicates, only: [:create], controller: "contract_templates/duplicates"
      end
      resource :release_template_imports, only: [:new, :create]
      resources :project_memberships, only: [:index, :create, :destroy]
@@ -124,13 +120,11 @@ Rails.application.routes.draw do
    scope module: :public do
      resources :accounts, only: [] do
        resources :projects, only: [] do
-          resources :contract_templates, only: [:index] do
+          resources :contract_templates, only: [] do
            resources :talent_releases, only: [:new, :create]
            resources :appearance_releases, only: [:new, :create]
            resources :acquired_media_releases, only: [:new, :create]
-            resources :location_releases, only: [:new, :create] do
-              resources :amendments, only: [:new, :create]
-            end
+            resources :location_releases, only: [:new, :create]
            resources :material_releases, only: [:new, :create]
            resources :medical_releases, only: [:new, :create]
            resources :misc_releases, only: [:new, :create]
@@ -146,7 +140,12 @@ Rails.application.routes.draw do
    ALL_RELEASES = RELEASES + [:music_releases]

    ALL_RELEASES.each do |release|
-      resources release, only: [], concerns: [:taggable, :approvable]
+      resources release, only: [], concerns: :taggable
+    end
+
+    # Customization for medical releases
+    resources :medical_releases, only: [], concerns: :taggable do
+      resource :approvals, only: [:new, :create]
    end

    resources :bulk_taggings, only: [:new, :create]
--- a/db/migrate/20200715084927_add_approval_fields_to_music_releases.rb
+++ b/db/migrate/20200715084927_add_approval_fields_to_music_releases.rb
@@ -1,7 +0,0 @@
-class AddApprovalFieldsToMusicReleases < ActiveRecord::Migration[6.0]
-  def change
-    add_column :music_releases, :approved_by_user_name, :text
-    add_column :music_releases, :approved_by_user_email, :text
-    add_column :music_releases, :approved_at, :timestamp
-  end
-end
--- a/db/migrate/20200716055453_add_approval_fields_to_misc_releases.rb
+++ b/db/migrate/20200716055453_add_approval_fields_to_misc_releases.rb
@@ -1,7 +0,0 @@
-class AddApprovalFieldsToMiscReleases < ActiveRecord::Migration[6.0]
-  def change
-    add_column :misc_releases, :approved_by_user_name, :text
-    add_column :misc_releases, :approved_by_user_email, :text
-    add_column :misc_releases, :approved_at, :timestamp
-  end
-end
--- a/db/migrate/20200716075851_add_approval_fields_to_acquired_media_releases.rb
+++ b/db/migrate/20200716075851_add_approval_fields_to_acquired_media_releases.rb
@@ -1,7 +0,0 @@
-class AddApprovalFieldsToAcquiredMediaReleases < ActiveRecord::Migration[6.0]
-  def change
-    add_column :acquired_media_releases, :approved_by_user_name, :text
-    add_column :acquired_media_releases, :approved_by_user_email, :text
-    add_column :acquired_media_releases, :approved_at, :timestamp
-  end
-end
--- a/db/migrate/20200716083706_add_approval_fields_to_material_releases.rb
+++ b/db/migrate/20200716083706_add_approval_fields_to_material_releases.rb
@@ -1,7 +0,0 @@
-class AddApprovalFieldsToMaterialReleases < ActiveRecord::Migration[6.0]
-  def change
-    add_column :material_releases, :approved_by_user_name, :text
-    add_column :material_releases, :approved_by_user_email, :text
-    add_column :material_releases, :approved_at, :timestamp
-  end
-end
--- a/db/migrate/20200716094927_add_approval_fields_to_location_releases.rb
+++ b/db/migrate/20200716094927_add_approval_fields_to_location_releases.rb
@@ -1,7 +0,0 @@
-class AddApprovalFieldsToLocationReleases < ActiveRecord::Migration[6.0]
-  def change
-    add_column :location_releases, :approved_by_user_name, :text
-    add_column :location_releases, :approved_by_user_email, :text
-    add_column :location_releases, :approved_at, :timestamp
-  end
-end
--- a/db/migrate/20200716103525_add_approval_fields_to_talent_releases.rb
+++ b/db/migrate/20200716103525_add_approval_fields_to_talent_releases.rb
@@ -1,7 +0,0 @@
-class AddApprovalFieldsToTalentReleases < ActiveRecord::Migration[6.0]
-  def change
-    add_column :talent_releases, :approved_by_user_name, :text
-    add_column :talent_releases, :approved_by_user_email, :text
-    add_column :talent_releases, :approved_at, :timestamp
-  end
-end
--- a/db/migrate/20200716105723_add_approval_fields_to_appearance_releases.rb
+++ b/db/migrate/20200716105723_add_approval_fields_to_appearance_releases.rb
@@ -1,7 +0,0 @@
-class AddApprovalFieldsToAppearanceReleases < ActiveRecord::Migration[6.0]
-  def change
-    add_column :appearance_releases, :approved_by_user_name, :text
-    add_column :appearance_releases, :approved_by_user_email, :text
-    add_column :appearance_releases, :approved_at, :timestamp
-  end
-end
--- a/db/migrate/20200720051634_add_shoot_location_time_zone_to_broadcasts.rb
+++ b/db/migrate/20200720051634_add_shoot_location_time_zone_to_broadcasts.rb
@@ -1,5 +0,0 @@
-class AddShootLocationTimeZoneToBroadcasts < ActiveRecord::Migration[6.0]
-  def change
-    add_column :broadcasts, :shoot_location_time_zone, :string, default: "UTC"
-  end
-end
--- a/db/migrate/20200720131309_add_full_live_stream_playback_url_to_broadcasts.rb
+++ b/db/migrate/20200720131309_add_full_live_stream_playback_url_to_broadcasts.rb
@@ -1,5 +0,0 @@
-class AddFullLiveStreamPlaybackUrlToBroadcasts < ActiveRecord::Migration[6.0]
-  def change
-    add_column :broadcasts, :full_live_stream_playback_uid, :string
-  end
-end
--- a/db/migrate/20200721140821_add_amendment_signer_details_to_location_releases.rb
+++ b/db/migrate/20200721140821_add_amendment_signer_details_to_location_releases.rb
@@ -1,5 +0,0 @@
-class AddAmendmentSignerDetailsToLocationReleases < ActiveRecord::Migration[6.0]
-  def change
-    add_column :location_releases, :amendment_signer_name, :string
-  end
-end
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -158,10 +158,7 @@ CREATE TABLE public.acquired_media_releases (
    description text,
    person_first_name character varying,
    person_last_name character varying,
-    signed_at timestamp without time zone,
-    approved_by_user_name text,
-    approved_by_user_email text,
-    approved_at timestamp without time zone
+    signed_at timestamp without time zone
 );


@@ -341,10 +338,7 @@ CREATE TABLE public.appearance_releases (
    guardian_2_address_city character varying,
    guardian_2_address_state character varying,
    guardian_2_address_zip character varying,
-    guardian_2_address_country character varying,
-    approved_by_user_name text,
-    approved_by_user_email text,
-    approved_at timestamp without time zone
+    guardian_2_address_country character varying
 );


@@ -539,9 +533,7 @@ CREATE TABLE public.broadcasts (
    stream_key character varying,
    stream_playback_uid character varying,
    token character varying,
-    streamer_status integer DEFAULT 0,
-    shoot_location_time_zone character varying DEFAULT 'UTC'::character varying,
-    full_live_stream_playback_uid character varying
+    streamer_status integer DEFAULT 0
 );


@@ -885,11 +877,7 @@ CREATE TABLE public.location_releases (
    filming_ended_on date,
    person_first_name character varying,
    person_last_name character varying,
-    filming_hours text,
-    approved_by_user_name text,
-    approved_by_user_email text,
-    approved_at timestamp without time zone,
-    amendment_signer_name character varying
+    filming_hours text
 );


@@ -978,10 +966,7 @@ CREATE TABLE public.material_releases (
    signed_at timestamp without time zone,
    description text,
    person_first_name character varying,
-    person_last_name character varying,
-    approved_by_user_name text,
-    approved_by_user_email text,
-    approved_at timestamp without time zone
+    person_last_name character varying
 );


@@ -1136,10 +1121,7 @@ CREATE TABLE public.misc_releases (
    question_12_answer text,
    question_13_answer text,
    question_14_answer text,
-    question_15_answer text,
-    approved_by_user_name text,
-    approved_by_user_email text,
-    approved_at timestamp without time zone
+    question_15_answer text
 );


@@ -1195,10 +1177,7 @@ CREATE TABLE public.music_releases (
    restriction_id bigint,
    restriction_text character varying,
    person_first_name character varying,
-    person_last_name character varying,
-    approved_by_user_name text,
-    approved_by_user_email text,
-    approved_at timestamp without time zone
+    person_last_name character varying
 );


@@ -1554,10 +1533,7 @@ CREATE TABLE public.talent_releases (
    guardian_2_address_city character varying,
    guardian_2_address_state character varying,
    guardian_2_address_zip character varying,
-    guardian_2_address_country character varying,
-    approved_by_user_name text,
-    approved_by_user_email text,
-    approved_at timestamp without time zone
+    guardian_2_address_country character varying
 );


@@ -3934,16 +3910,6 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20200702152130'),
 ('20200707155717'),
 ('20200709120630'),
-('20200712181139'),
-('20200715084927'),
-('20200716055453'),
-('20200716075851'),
-('20200716083706'),
-('20200716094927'),
-('20200716103525'),
-('20200716105723'),
-('20200720051634'),
-('20200720131309'),
-('20200721140821');
+('20200712181139');


--- a/spec/channels/broadcasts_channel_spec.rb
+++ b/spec/channels/broadcasts_channel_spec.rb
@@ -24,7 +24,6 @@ RSpec.describe BroadcastsChannel, type: :channel do
        event: "broadcast_stream_update",
        status: broadcast.status,
        playback_url: broadcast.stream_playback_url,
-        full_live_stream_playback_url: broadcast.full_live_stream_playback_url,
        status_content: status_content,
        video_content: video_content,
        streamer_status: broadcast.streamer_status
--- a/spec/controllers/contract_templates/duplicates_controller.rb
+++ b/spec/controllers/contract_templates/duplicates_controller.rb
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe ContractTemplates::DuplicatesController do
-  let(:account) { build(:account) }
-  let(:current_user) { create(:user, :manager, primary_account: account) }
-  let(:project) { create(:project, members: [current_user], account: account) }
-
-  before do
-    sign_in(current_user)
-  end
-
-  describe '#create' do
-    it "responds with redirect to the edit page for newly created duplicate" do
-      contract_template = create(:contract_template, project: project)
-
-      expect do
-        post :create, params: { contract_template_id: contract_template }
-      end.to change(ContractTemplate, :count).by(1)
-
-      new_ct = ContractTemplate.last
-
-      expect(new_ct.name).to eq t('contract_templates.duplicate.name_prefix', template_name: contract_template.name)
-      expect(new_ct.release_type).to eq contract_template.release_type
-
-      expect(response).to redirect_to [:edit, new_ct]
-    end
-  end
-end
--- a/spec/controllers/contract_templates/qr_codes_controller_spec.rb
+++ b/spec/controllers/contract_templates/qr_codes_controller_spec.rb
@@ -5,7 +5,6 @@ describe ContractTemplates::QrCodesController do
  let(:current_user)      { create(:user, :manager, primary_account: account) }
  let(:project) { create(:project, members: [current_user], account: account) }
  let(:contract_template) { create(:contract_template, project: project) }
-  let(:contract_templates) { create_list(:contract_template, 5, project: project)}

  before do
    sign_in(current_user)
@@ -17,13 +16,5 @@ describe ContractTemplates::QrCodesController do

      expect(response).to be_successful
    end
-
-    context "for group qr code" do
-      it "responds with success" do
-        get :show, params: { contract_template_id: contract_templates.first, multi_sign_ids: contract_templates }
-  
-        expect(response).to be_successful
-      end
-    end
  end
 end
--- a/spec/controllers/contract_templates_controller_spec.rb
+++ b/spec/controllers/contract_templates_controller_spec.rb
@@ -118,57 +118,6 @@ describe ContractTemplatesController do
    end
  end

-  describe '#edit' do
-    let(:contract_template) do
-      create(:contract_template,
-             name: 'My Contract Template', fee: 50, release_type: 'appearance',
-             project: project)
-    end
-
-    it 'responds ok' do
-      get :edit, params: { project_id: project, id: contract_template }
-
-      expect(response).to be_successful
-    end
-
-    context 'when current user is an associate' do
-      let(:current_user) { create(:user, :associate) }
-
-      it 'raises exception' do
-        expect do
-          get :edit, params: { project_id: project, id: contract_template }
-        end.to raise_error(Pundit::NotAuthorizedError)
-      end
-    end
-
-
-  end
-
-  describe '#update' do
-    let(:contract_template) do
-      create(:contract_template,
-             name: 'My Contract Template', fee: 50, release_type: 'appearance',
-             project: project)
-    end
-
-    it 'redirects' do
-      patch :update, params: { project_id: project, id: contract_template, contract_template: contract_template_params }
-
-      expect(response).to redirect_to(project_contract_templates_path(project))
-    end
-
-
-    context 'when current user is an associate' do
-      let(:current_user) { create(:user, :associate) }
-
-      it 'raises exception' do
-        expect do
-          patch :update, params: { project_id: project, id: contract_template, contract_template: contract_template_params }
-        end.to raise_error(Pundit::NotAuthorizedError)
-      end
-    end
-  end
-
  describe '#destroy' do
    let!(:contract_template) { create(:contract_template, project: project) }

--- a/spec/controllers/public/amendments_controller_spec.rb
+++ b/spec/controllers/public/amendments_controller_spec.rb
@@ -1,112 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Public::AmendmentsController, type: :controller do
-  let(:user) { create(:user) }
-  let(:account) { user.primary_account }
-  let(:project) { create(:project, account: account) }
-  let(:contract_template) { create(:location_release_contract_template, :with_amendment_clause, project: project) }
-  let(:location_release) { create(:location_release, contract_template: contract_template, project: project) }
-
-  render_views
-
-  describe "#new" do
-    it "shows amendment signing form for non-signed amendment of a release" do
-      expect(location_release.amendment_signed?).to be_falsey
-
-      get :new, params: {
-        account_id: account,
-        project_id: project,
-        contract_template_id: location_release.contract_template,
-        location_release_id: location_release
-      }
-
-      expect(response).to be_successful
-
-      body = CGI.unescape_html(response.body)
-      expect(body).not_to match already_signed_message
-    end
-
-    it "shows already signed message for signed amendment of a release" do
-      signed_release = create(:location_release, :amendment_signed, contract_template: contract_template, project: project)
-
-      expect(signed_release.amendment_signed?).to be_truthy
-
-      get :new, params: {
-        account_id: account,
-        project_id: project,
-        contract_template_id: location_release.contract_template,
-        location_release_id: signed_release
-      }
-
-      expect(response).to be_successful
-
-      body = CGI.unescape_html(response.body)
-      expect(body).to match already_signed_message
-    end
-  end
-
-  describe "#create" do
-    it "signs amendment" do
-      expect(location_release.amendment_signed?).to be_falsey
-
-      post :create, params: {
-        account_id: account,
-        project_id: project,
-        contract_template_id: location_release.contract_template,
-        location_release_id: location_release,
-        location_release: {
-          amendment_signer_name: "Signer Name",
-          amendment_signature_base64: signature_base64
-        }
-      }
-
-      expect(response).to be_successful
-
-      body = CGI.unescape_html(response.body)
-      expect(body).not_to match already_signed_message
-      expect(body).to match signed_successfully_message
-
-      expect(LocationRelease.last.amendment_signed?).to be_truthy
-      expect(LocationRelease.last.amendment_signer_name).to eq "Signer Name"
-    end
-
-    it "shows already signed message for signed amendment of a release" do
-      signed_release = create(:location_release, :amendment_signed, name: "Test Loc", amendment_signer_name: "Big Signer", contract_template: contract_template, project: project)
-
-      expect(signed_release.amendment_signed?).to be_truthy
-
-      post :create, params: {
-        account_id: account,
-        project_id: project,
-        contract_template_id: location_release.contract_template,
-        location_release_id: signed_release,
-        location_release: {
-          amendment_signer_name: "Signer Who",
-          amendment_signature_base64: signature_base64
-        }
-      }
-
-      expect(response).to be_successful
-
-      body = CGI.unescape_html(response.body)
-      expect(body).to match already_signed_message
-
-      expect(signed_release.amendment_signed?).to be_truthy
-      expect(signed_release.amendment_signer_name).to eq "Big Signer"
-    end
-  end
-
-  private
-
-  def already_signed_message
-    t 'public.amendments.create.amendment_already_signed_message'
-  end
-
-  def signed_successfully_message
-    t 'public.amendments.create.amendment_signed_message'
-  end
-
-  def signature_base64
-    @signature_base64 ||= Base64Image.from_image(file_fixture('signature.png')).data_uri
-  end
-end
--- a/spec/controllers/public/contract_templates_controller_spec.rb
+++ b/spec/controllers/public/contract_templates_controller_spec.rb
@@ -1,39 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Public::ContractTemplatesController, type: :controller do
-  render_views
-  
-  let(:account) { create(:account, name: "Dev Account") }
-  let(:project) { create(:project, account: account) }
-  let(:contract_templates) { create_list(:contract_template, 20, project: project) }
-
-  describe '#index' do
-    it 'responds successfully' do
-      get :index, params: { project_id: project, account_id: project.account, contract_template_ids: contract_templates.map(&:id) }
-
-      expect(response).to be_successful
-    end
-
-    it 'renders content if there are contract templates' do
-      contract_template = create(:contract_template,
-                                 name: 'My Contract Template', fee: 50, release_type: 'appearance',
-                                 project: project)
-      sign_path = new_account_project_contract_template_appearance_release_path(project.account, project, contract_template)
-      sign_url = new_account_project_contract_template_appearance_release_url(project.account, project, contract_template)
-
-      get :index, params: { project_id: project, account_id: project.account, contract_template_ids: [contract_template.id] }
-
-      expect(response.body).to have_content('My Contract Template')
-      expect(response.body).to have_link('Sign', href: sign_path)
-    end
-
-    context 'when there are many records' do
-      it 'paginates the table' do
-        get :index, params: { project_id: project, account_id: project.account, contract_template_ids: contract_templates.map(&:id) }
-
-        expect(response.body).to have_link('2', href: account_project_contract_templates_path(project.account, project, contract_template_ids: contract_templates.map(&:id), page: 2))
-      end
-    end
-  end
-end
-
--- a/spec/controllers/stream_notifications_controller_spec.rb
+++ b/spec/controllers/stream_notifications_controller_spec.rb
@@ -4,45 +4,27 @@ RSpec.describe StreamNotificationsController, type: :controller do
  render_views

  let!(:broadcast) { create(:broadcast, :with_stream, skip_create_callback: true, name: "Live Stream") }
-  let(:active_status) { { type: "video.live_stream.active", object: { id: "mux_stream" } } }
-  let(:disconnected_status) { { type: "video.live_stream.disconnected", object: { id: "mux_stream" } } }
-  let(:idle_status) { { type: "video.live_stream.idle", object: { id: "mux_stream" } } }
-  let(:idle_status_for_unknown_broadcast) { { type: "video.live_stream.idle", object: { id: "unknown-id" } } }
-  let(:asset_ready) do
-    {
-      type: "video.asset.static_renditions.ready",
-      object: { id: "asset_uid" },
+  let(:active_status) { {type: "video.live_stream.active", object: { id: "mux_stream" }} }
+  let(:disconnected_status) { {type: "video.live_stream.disconnected", object: { id: "mux_stream" }} }
+  let(:idle_status) { {type: "video.live_stream.idle", object: { id: "mux_stream" }} }
+  let(:idle_status_for_unknown_broadcast) { {type: "video.live_stream.idle", object: { id: "unknown-id" }} }
+  let(:asset_ready) { {
+    type: "video.asset.static_renditions.ready",
+    object: { id: "asset_uid" },
+    data: {
+      playback_ids: [
+        {id: "playback_uid"}
+      ],
+      static_renditions: {
+        files: [{name: "high.mp4"}]
+      }
+    },
+    stream_notification: {
      data: {
-        playback_ids: [
-          { id: "playback_uid" }
-        ],
-        static_renditions: {
-          files: [{ name: "high.mp4" }]
-        }
-      },
-      stream_notification: {
-        data: {
-          live_stream_id: "mux_stream"
-        }
+        live_stream_id: "mux_stream"
      }
    }
-  end
-  let(:full_live_stream_ready) do
-    {
-      type: "video.asset.ready",
-      object: { id: "active_asset_uid" },
-      data: {
-        playback_ids: [
-            { id: "full_live_stream_playback_uid" }
-        ]
-      },
-      stream_notification: {
-        data: {
-          live_stream_id: "mux_stream"
-        }
-      }
-    }
-  end
+  } }

  describe "#create" do
    before do
@@ -72,20 +54,13 @@ RSpec.describe StreamNotificationsController, type: :controller do
    end

    it "creates a broadcast recording when static_renditions.ready is received in notification" do
-      expect do
+      expect {
        post :create, params: asset_ready
-      end.to change(BroadcastRecording, :count).by(1)
+      }.to change(BroadcastRecording, :count).by(1)

      expect(BroadcastsChannel).to have_received(:stream_recording_ready)
    end

-    it "stores full livestream playback uid and updates the broadcast" do
-      post :create, params: full_live_stream_ready
-
-      expect(Broadcast.last.full_live_stream_playback_uid).to eq "full_live_stream_playback_uid"
-      expect(BroadcastsChannel).to have_received(:broadcast_stream_updates).with(be_kind_of(Broadcast))
-    end
-
    it "returns OK response even for non-existing broadcast" do
      post :create, params: idle_status_for_unknown_broadcast

--- a/spec/factories/broadcasts.rb
+++ b/spec/factories/broadcasts.rb
@@ -11,7 +11,6 @@ FactoryBot.define do
      stream_uid "mux_stream"
      stream_key "mux_key"
      stream_playback_uid "mux_playback_id"
-      full_live_stream_playback_uid "full_live_stream_playback_uid"
      status "created"
      streamer_status "idle"
    end
--- a/spec/factories/contract_templates.rb
+++ b/spec/factories/contract_templates.rb
@@ -13,10 +13,6 @@ FactoryBot.define do
      archived_at Time.zone.now
    end

-    trait :with_amendment_clause do
-      amendment_clause "Amendment Legal Language"
-    end
-
    factory :appearance_release_contract_template do
      release_type "appearance" 
    end
--- a/spec/factories/location_releases.rb
+++ b/spec/factories/location_releases.rb
@@ -22,14 +22,6 @@ FactoryBot.define do
      end
    end

-    trait :amendment_signed do
-      amendment_signature do
-        path = Rails.root.join("spec", "fixtures", "files", "signature.png")
-        Rack::Test::UploadedFile.new(path, "image/png")
-      end
-      amendment_signer_name "Amendment Signer"
-    end
-
    trait :non_native do
      contract do
        path = Rails.root.join("spec", "fixtures", "files", "contract.pdf")
--- a/spec/features/user_manages_contract_templates_spec.rb
+++ b/spec/features/user_manages_contract_templates_spec.rb
@@ -30,7 +30,7 @@ RSpec.feature 'User manages contract templates', type: :feature do
    fill_in 'Describe other territory', with: 'North America only'
    select 'In perpetuity', from: 'Term'
    select 'None', from: 'Restriction'
-    click_on create_release_template_button
+    click_on 'Create Release Template'

    expect(page).to have_content(create_contract_template_success_message)
  end
@@ -48,30 +48,18 @@ RSpec.feature 'User manages contract templates', type: :feature do
      fill_in_trix signature_legal_text_field, with: 'LL'

      expect do
-        click_on create_release_template_button
+        click_on 'Create Release Template'
      end.to change(ContractTemplate, :count).by(1)
    end
  end

-  scenario 'location release template has a amendment clause field' do
-    visit new_project_contract_template_path(project)
-
-    fill_in 'Name', with: 'My Release Template'
-    select 'Location Release', from: 'Release type'
-    fill_hidden amendment_clause_field, with: 'Amendment clause text'
-    click_on create_release_template_button
-
-    expect(page).to have_content(create_contract_template_success_message)
-    expect(ContractTemplate.last.amendment_clause.body.to_s).to match /Amendment clause text/
-  end
-
  scenario 'medical release template has a guardian clause field' do
    visit new_project_contract_template_path(project)

    fill_in 'Name', with: 'My Release Template'
    select 'Medical Release', from: 'Release type'
    fill_hidden guardian_clause_field, with: 'Guardian clause text'
-    click_on create_release_template_button
+    click_on 'Create Release Template'

    expect(page).to have_content(create_contract_template_success_message)
    expect(ContractTemplate.last.guardian_clause.body.to_s).to match /Guardian clause text/
@@ -90,7 +78,7 @@ RSpec.feature 'User manages contract templates', type: :feature do

    fill_in_trix 'contract_template_guardian_clause', with: 'Guardian clause text'
    fill_in question_field(1), with: 'How much experience do you have in the industry?'
-    click_on create_release_template_button
+    click_on 'Create Release Template'

    expect(page).to have_content(create_contract_template_success_message)
  end
@@ -197,13 +185,13 @@ RSpec.feature 'User manages contract templates', type: :feature do

    scenario 'Should not allow negative fees' do
      fill_in 'Fee', with: '-200'
-      click_on create_release_template_button
+      click_on 'Create Release Template'
      expect(page).not_to have_content(create_contract_template_success_message)
    end

    scenario 'Should not allow fees with more than 9 digits' do
      fill_in 'Fee', with: '9999999999'
-      click_on create_release_template_button
+      click_on 'Create Release Template'
      expect(page).not_to have_content(create_contract_template_success_message)
    end
  end
@@ -274,93 +262,6 @@ RSpec.feature 'User manages contract templates', type: :feature do
    expect(page).to have_content('Active template')
  end

-  scenario 'edit button is visible for not-signed contract template' do
-    create(:contract_template, project: project)
-
-    visit project_contract_templates_path(project)
-
-    expect(page).to have_link(edit_button_label, exact: true, count: 1)
-  end
-
-  scenario 'edit button is not visible for signed contract template' do
-    ct = create(:contract_template, project: project)
-    create(:appearance_release, contract_template: ct)
-
-    visit project_contract_templates_path(project)
-
-    expect(page).to have_link(edit_button_label, exact: true, count: 0)
-  end
-
-  scenario 'duplicate button is visible for not signed contract template' do
-    create(:contract_template, project: project)
-
-    visit project_contract_templates_path(project)
-
-    expect(page).to have_link(duplicate_button_label, exact: true, count: 1)
-  end
-
-  scenario 'duplicate button is visible for signed contract template' do
-    ct = create(:contract_template, project: project)
-    create(:appearance_release, contract_template: ct)
-
-    visit project_contract_templates_path(project)
-
-    expect(page).to have_link(duplicate_button_label, exact: true, count: 1)
-  end
-
-  scenario 'clicking edit button opens edit page for contract template' do
-    ct = create(:contract_template, project: project)
-
-    visit project_contract_templates_path(project)
-
-    expect(page).to have_content ct.name
-
-    expect(page).not_to have_content 'Updated CT'
-    expect(page).not_to have_content 'Medical'
-
-    click_link edit_button_label
-
-    expect(page).to have_content edit_page_heading
-
-    fill_in name_field, with: 'Updated CT'
-    select 'Medical Release', from: 'Release type'
-    fill_in_trix body_field, with: 'Updated legal text'
-    click_on update_contract_template_button_label
-
-    expect(page).to have_content 'Updated CT'
-    expect(page).to have_content 'Medical'
-  end
-
-  scenario 'clicking duplicate button opens edit page for newly created contract template' do
-    ct = create(:contract_template, project: project)
-
-    visit project_contract_templates_path(project)
-
-    expect(page).to have_content ct.name
-
-    expect(page).not_to have_content 'Modified duplicate'
-    expect(page).not_to have_content 'Misc'
-
-    expect do
-      click_link duplicate_button_label
-    end.to change(ContractTemplate, :count).by(1)
-
-    expect(page).to have_content edit_page_heading
-    name_input = find("##{name_field}")
-    expect(name_input.value).to eq duplicate_release_name(ct.name)
-
-    fill_in name_field, with: 'Modified duplicate'
-    select 'Misc Release', from: 'Release type'
-    fill_in_trix body_field, with: 'Legal text for duplicate'
-    click_on update_contract_template_button_label
-
-    expect(page).to have_content 'Modified duplicate'
-    expect(page).to have_content 'Misc'
-    expect(ct.body.id).not_to eq ContractTemplate.last.body.id
-    expect(ct.guardian_clause.id).not_to eq ContractTemplate.last.guardian_clause.id
-    expect(ct.signature_legal_text.id).not_to eq ContractTemplate.last.signature_legal_text.id
-  end
-
  context 'When the user is associate' do
    let(:current_user) { create(:user, :associate) }

@@ -379,22 +280,6 @@ RSpec.feature 'User manages contract templates', type: :feature do
      expect(page).to have_content schedule_demo
      expect(page).not_to have_content create_release_template
    end
-
-    it 'does not show edit button' do
-      create(:contract_template, project: project)
-
-      visit project_contract_templates_path(project)
-
-      expect(page).to have_link(edit_button_label, exact: true, count: 0)
-    end
-
-    it 'does not show duplicate button' do
-      create(:contract_template, project: project)
-
-      visit project_contract_templates_path(project)
-
-      expect(page).to have_link(duplicate_button_label, exact: true, count: 0)
-    end
  end

  context 'When the user is account manager' do
@@ -415,40 +300,6 @@ RSpec.feature 'User manages contract templates', type: :feature do
      expect(page).to have_content schedule_demo
      expect(page).to have_content create_release_template
    end
-
-    it 'shows edit button when contract template is not signed' do
-      create(:contract_template, project: project)
-
-      visit project_contract_templates_path(project)
-
-      expect(page).to have_link(edit_button_label, exact: true, count: 1)
-    end
-
-    it 'does not show edit button when contract template is signed' do
-      ct = create(:contract_template, project: project)
-      create(:appearance_release, contract_template: ct)
-
-      visit project_contract_templates_path(project)
-
-      expect(page).to have_link(edit_button_label, exact: true, count: 0)
-    end
-
-    it 'shows duplicate button when contract template is not signed' do
-      create(:contract_template, project: project)
-
-      visit project_contract_templates_path(project)
-
-      expect(page).to have_link(duplicate_button_label, exact: true, count: 1)
-    end
-
-    it 'shows duplicate button when contract template is signed' do
-      ct = create(:contract_template, project: project)
-      create(:appearance_release, contract_template: ct)
-
-      visit project_contract_templates_path(project)
-
-      expect(page).to have_link(duplicate_button_label, exact: true, count: 1)
-    end
  end

  private
@@ -477,10 +328,6 @@ RSpec.feature 'User manages contract templates', type: :feature do
    'contract_template_guardian_clause_trix_input_contract_template'
  end

-  def amendment_clause_field
-    'contract_template_amendment_clause_trix_input_contract_template'
-  end
-
  def signature_legal_text_field
    'contract_template_signature_legal_text'
  end
@@ -508,32 +355,4 @@ RSpec.feature 'User manages contract templates', type: :feature do
  def signature_legal_text_trix_field
    'Signature legal text'
  end
-
-  def edit_button_label
-    t 'contract_templates.contract_template.actions.edit'
-  end
-
-  def duplicate_button_label
-    t 'contract_templates.contract_template.actions.duplicate'
-  end
-
-  def edit_page_heading
-    t 'contract_templates.edit.heading'
-  end
-
-  def name_field
-    'contract_template_name'
-  end
-
-  def update_contract_template_button_label
-    t 'helpers.submit.contract_template.update'
-  end
-
-  def duplicate_release_name(template_name = '')
-    t 'contract_templates.duplicate.name_prefix', template_name: template_name
-  end
-
-  def create_release_template_button
-    'Create Release Template'
-  end
 end
--- a/spec/features/user_managing_acquired_media_releases_spec.rb
+++ b/spec/features/user_managing_acquired_media_releases_spec.rb
@@ -213,117 +213,13 @@ feature "User managing acquired_media releases" do
      expect(page).not_to have_link("Edit", exact: true)
    end

-    context "when the user is account manager" do
-      let(:current_user) { create(:user, :account_manager) }
-
-      before do
-        sign_in current_user
-      end
-
-      scenario "Review action in Manage menu is visible" do
-        create(:acquired_media_release_with_contract_template, :native, project: project)
-  
-        visit project_acquired_media_releases_path(project)
-  
-        expect(page).to have_link(review_action, exact: true)
-      end
-  
-      scenario "Reviewing release" do
-        create(:acquired_media_release_with_contract_template, :native, project: project)
-  
-        visit project_acquired_media_releases_path(project)
-  
-        click_link review_action
-  
-        expect(page).to have_content review_page_heading
-        expect(page).to have_content approve_button
-      end
-  
-      scenario "Approved releases have checkmark and non-approved releases don't have checkmarks" do
-        create(:acquired_media_release_with_contract_template, :native, project: project)
-  
-        visit project_acquired_media_releases_path(project)
-        expect(page).to have_css('i.fa.fa-check-circle.fa-2x', count: 0)
-  
-        create(:acquired_media_release_with_contract_template, :native, project: project, approved_by_user_email: "some@email.com", approved_at: DateTime.now)
-        visit project_acquired_media_releases_path(project)
-  
-        expect(page).to have_css('i.fa.fa-check-circle.fa-2x', count: 1)
-      end
-  
-      scenario 'When viewing the contract PDF of approved release there is page for office use only' do
-        acquired_media_release = create(:acquired_media_release_with_contract_template,
-                                 :native,
-                                 project: project,
-                                 person_first_name: 'Jane',
-                                 person_last_name: 'Doe',
-                                 approved_by_user_name: "Big Joe",
-                                 approved_by_user_email: "some@email.com",
-                                 approved_at: DateTime.now)
-  
-        sign_in(current_user)
-        visit project_acquired_media_releases_path(project)
-        click_link *view_release_pdf_link_for(acquired_media_release)
-  
-        expect(content_type).to eq('application/pdf')
-        expect(content_disposition).to include('inline')
-        expect(pdf_body).to have_content for_office_use_only.upcase
-        expect(pdf_body).to have_content producer_label
-        expect(pdf_body).to have_content production_label
-        expect(pdf_body).to have_content issued_to_label
-        expect(pdf_body).to have_content issued_by_label
-        expect(pdf_body).to have_content date_issued
-        expect(pdf_body).to have_content 'Big Joe'
-      end
-  
-      scenario 'When viewing the contract PDF of not approved release there is no page for office use only' do
-        acquired_media_release = create(:acquired_media_release_with_contract_template,
-                                 :native,
-                                 project: project,
-                                 person_first_name: 'Jane',
-                                 person_last_name: 'Doe')
-  
-        sign_in(current_user)
-        visit project_acquired_media_releases_path(project)
-        click_link *view_release_pdf_link_for(acquired_media_release)
-  
-        expect(content_type).to eq('application/pdf')
-        expect(content_disposition).to include('inline')
-        expect(pdf_body).not_to have_content for_office_use_only.upcase
-        expect(pdf_body).not_to have_content producer_label
-        expect(pdf_body).not_to have_content production_label
-        expect(pdf_body).not_to have_content issued_to_label
-        expect(pdf_body).not_to have_content issued_by_label
-        expect(pdf_body).not_to have_content date_issued
-        expect(pdf_body).not_to have_content 'Big Joe'
-      end
-    end
-
-    context "when the user is project manager" do
-      before do
-        sign_in current_user
-      end
-
-      scenario "Review action in Manage menu is not visible" do
-        create(:acquired_media_release_with_contract_template, project: project)
-  
-        visit project_acquired_media_releases_path(project)
-        click_on "Manage"
-  
-        expect(page).not_to have_link(review_action, exact: true)
-      end
-    end
-
    context "when the user is associate" do
      let(:current_user) { create(:user, :associate) }

-      before do
-        sign_in current_user
-      end
-
      scenario "should not show download" do
        collection1 = create(:acquired_media_release_with_contract_template, name: "EDM Music", project: project)

+        sign_in current_user
        visit project_acquired_media_releases_path(project)

        click_on "Manage"
@@ -472,40 +368,4 @@ feature "User managing acquired_media releases" do
  def dummy_signature_legal_text
    'Some signature legal language'
  end
-
-  def review_action
-    t 'acquired_media_releases.acquired_media_release.actions.review'
-  end
-
-  def review_page_heading
-    t 'approvals.new.heading', release_type: "Acquired Media Release"
-  end
-
-  def approve_button
-    t 'approvals.new.actions.approve'
-  end
-
-  def for_office_use_only
-    t 'contracts.for_office_use_only.heading'
-  end
-
-  def producer_label
-    t 'contracts.for_office_use_only.description_labels.producer'
-  end
-
-  def production_label
-    t 'contracts.for_office_use_only.description_labels.production'
-  end
-
-  def issued_to_label
-    t 'contracts.for_office_use_only.description_labels.issued_to'
-  end
-
-  def issued_by_label
-    t 'contracts.for_office_use_only.description_labels.issued_by'
-  end
-
-  def date_issued
-    t 'contracts.for_office_use_only.description_labels.date_issued'
-  end
 end
--- a/spec/features/user_managing_appearance_releases_spec.rb
+++ b/spec/features/user_managing_appearance_releases_spec.rb
@@ -481,131 +481,18 @@ feature 'User managing appearance releases' do
    end
  end

-  context "when the user is account manager" do
-    let(:current_user) { create(:user, :account_manager) }
-
-    before do
-      sign_in current_user
-    end
-
-    scenario "Review action in Manage menu is visible" do
-      create(:appearance_release_with_contract_template, :native, project: project)
-
-      visit project_appearance_releases_path(project)
-
-      expect(page).to have_link(review_action, exact: true)
-    end
-
-    scenario "Reviewing release" do
-      create(:appearance_release_with_contract_template, :native, project: project)
-
-      visit project_appearance_releases_path(project)
-
-      click_link review_action
-
-      expect(page).to have_content review_page_heading
-      expect(page).to have_content approve_button
-    end
-
-    scenario "Approved releases have checkmark and non-approved releases don't have checkmarks" do
-      create(:appearance_release_with_contract_template, :native, project: project)
-
-      visit project_appearance_releases_path(project)
-      expect(page).to have_css('i.fa.fa-check-circle.fa-2x', count: 0)
-
-      create(:appearance_release_with_contract_template, :native, project: project, approved_by_user_email: "some@email.com", approved_at: DateTime.now)
-      visit project_appearance_releases_path(project)
-
-      expect(page).to have_css('i.fa.fa-check-circle.fa-2x', count: 1)
-    end
-
-    scenario 'When viewing the contract PDF of approved release there is page for office use only' do
-      appearance_release = create(:appearance_release_with_contract_template,
-                               :native,
-                               project: project,
-                               person_first_name: 'Jane',
-                               person_last_name: 'Doe',
-                               approved_by_user_name: "Big Joe",
-                               approved_by_user_email: "some@email.com",
-                               approved_at: DateTime.now)
-
-      sign_in(current_user)
-      visit project_appearance_releases_path(project)
-      click_link *view_release_pdf_link_for(appearance_release)
-
-      expect(content_type).to eq('application/pdf')
-      expect(content_disposition).to include('inline')
-      expect(pdf_body).to have_content for_office_use_only.upcase
-      expect(pdf_body).to have_content producer_label
-      expect(pdf_body).to have_content production_label
-      expect(pdf_body).to have_content issued_to_label
-      expect(pdf_body).to have_content issued_by_label
-      expect(pdf_body).to have_content date_issued
-      expect(pdf_body).to have_content 'Big Joe'
-    end
-
-    scenario 'When viewing the contract PDF of not approved release there is no page for office use only' do
-      appearance_release = create(:appearance_release_with_contract_template,
-                               :native,
-                               project: project,
-                               person_first_name: 'Jane',
-                               person_last_name: 'Doe')
-
-      sign_in(current_user)
-      visit project_appearance_releases_path(project)
-      click_link *view_release_pdf_link_for(appearance_release)
-
-      expect(content_type).to eq('application/pdf')
-      expect(content_disposition).to include('inline')
-      expect(pdf_body).not_to have_content for_office_use_only.upcase
-      expect(pdf_body).not_to have_content producer_label
-      expect(pdf_body).not_to have_content production_label
-      expect(pdf_body).not_to have_content issued_to_label
-      expect(pdf_body).not_to have_content issued_by_label
-      expect(pdf_body).not_to have_content date_issued
-      expect(pdf_body).not_to have_content 'Big Joe'
-    end
-  end
-
-  context "when the user is project manager" do
-    before do
-      sign_in current_user
-    end
-
-    scenario "Review action in Manage menu is not visible" do
-      create(:appearance_release_with_contract_template, :native, project: project)
-
-      visit project_appearance_releases_path(project)
-      click_on "Manage"
-
-      expect(page).not_to have_link(review_action, exact: true)
-    end
-  end
-
  context 'when the user is associate' do
    let(:current_user) { create(:user, :associate) }

-    before do
-      sign_in current_user
-    end
-
    scenario 'should not show download' do
      chris = create(:appearance_release_with_contract_template, person_first_name: 'Chris', person_last_name: 'Evans', project: project)

+      sign_in current_user
      visit project_appearance_releases_path(project)

      click_on 'Manage'
      expect(page).not_to have_link('Download', exact: true)
    end
-
-    scenario "Review action in Manage menu is not visible" do
-      create(:appearance_release_with_contract_template, :native, project: project)
-
-      visit project_appearance_releases_path(project)
-      click_on "Manage"
-
-      expect(page).not_to have_link(review_action, exact: true)
-    end
  end

  private
@@ -830,40 +717,4 @@ feature 'User managing appearance releases' do
  def dummy_signature_legal_text
    'Some signature legal language'
  end
-
-  def review_action
-    t 'appearance_releases.appearance_release.actions.review'
-  end
-
-  def review_page_heading
-    t 'approvals.new.heading', release_type: "Appearance Release"
-  end
-
-  def approve_button
-    t 'approvals.new.actions.approve'
-  end
-
-  def for_office_use_only
-    t 'contracts.for_office_use_only.heading'
-  end
-
-  def producer_label
-    t 'contracts.for_office_use_only.description_labels.producer'
-  end
-
-  def production_label
-    t 'contracts.for_office_use_only.description_labels.production'
-  end
-
-  def issued_to_label
-    t 'contracts.for_office_use_only.description_labels.issued_to'
-  end
-
-  def issued_by_label
-    t 'contracts.for_office_use_only.description_labels.issued_by'
-  end
-
-  def date_issued
-    t 'contracts.for_office_use_only.description_labels.date_issued'
-  end
 end
--- a/spec/features/user_managing_broadcasts_spec.rb
+++ b/spec/features/user_managing_broadcasts_spec.rb
@@ -24,12 +24,10 @@ feature 'User managing broadcasts' do

      by 'filling out the form' do
        fill_in broadcast_name_field, with: 'My Broadcast'
-        select_time_zone("New Delhi")
      end

      click_button 'Create Live Stream'
      expect(page).to have_content('A live stream has been created')
-      expect(page).to have_content('New Delhi')
      click_on 'Manage'
      expect(page).to have_link('Copy Stream URL', exact: true)
      expect(page).to have_link('Copy Stream Key', exact: true)
@@ -80,39 +78,6 @@ feature 'User managing broadcasts' do
      expect(page).to have_content token_reset_notice
    end

-    scenario 'Player will not reload if stream is reactivated while user is watching previous recording', js: true do
-      broadcast = create(:broadcast, :with_stream, :with_files, project: project)
-      recording = create(:broadcast_recording, broadcast: broadcast)
-
-      visit project_broadcast_path(project, broadcast)
-
-      expect(page).to have_content stream_idle_message
-
-      broadcast.streamer_status = :recording
-      broadcast.status = :active
-      BroadcastsChannel.broadcast_stream_updates(broadcast)
-
-      expect(page).to have_content stream_begun_message
-      expect(page).to have_selector('div#broadcast_video', count: 1)
-
-      broadcast.streamer_status = :idle
-      broadcast.status = :idle
-      BroadcastsChannel.broadcast_stream_updates(broadcast)
-
-      click_on switch_view_dropdown
-      click_on recording.download_file_name
-
-      expect(page).to have_content stream_idle_message
-      expect(page).to have_selector('div#broadcast_video', count: 1)
-
-      broadcast.streamer_status = :recording
-      broadcast.status = :active
-      BroadcastsChannel.broadcast_stream_updates(broadcast)
-
-      expect(page).to have_content stream_begun_message
-      expect(page).to have_selector('div#broadcast_video', count: 1)
-    end
-
    scenario 'user can go back and forth between live session and previous sessions', js: true do
      broadcast = create(:broadcast, :with_stream, :with_files, project: project)
      recording = create(:broadcast_recording, broadcast: broadcast)
@@ -222,12 +187,6 @@ feature 'User managing broadcasts' do
  def broadcast_name_field
    'broadcast[name]'
  end
-  
-  def select_time_zone(value)
-    if value.present?
-      select value, from: "broadcast[shoot_location_time_zone]"
-    end
-  end

  def click_checkboxes
    all('input[type="checkbox"]')[0].click
@@ -253,14 +212,4 @@ feature 'User managing broadcasts' do
  def token_reset_notice
    t 'broadcasts.update.reset_notice'
  end
-
-  def stream_begun_message
-    'Live stream has begun, click play to watch it'
-  end
-
-  def stream_idle_message
-    'Live stream is waiting to begin'
-  end
-
-
 end
--- a/spec/features/user_managing_location_releases_spec.rb
+++ b/spec/features/user_managing_location_releases_spec.rb
@@ -78,47 +78,6 @@ feature "User managing location releases" do

      expect(page).to have_content dummy_signature_legal_text
    end
-
-    scenario "signing amendment for a not-signed amendment release", js: true do
-      contract_template = create(:location_release_contract_template, :with_amendment_clause, project: project)
-      release = create(:location_release, contract_template: contract_template, project: project)
-
-      expect(release.amendment_signed?).to be_falsey
-
-      visit new_account_project_contract_template_location_release_amendment_path(project.account, project, contract_template, release)
-
-      expect(page).to have_content amendments_heading
-
-      fill_in amendment_signer_name_field, with: 'Big Signer'
-      draw_signature file_fixture("signature.png"), amendment_signature_field
-
-      click_button sign_amendment_button
-
-      expect(page).to have_content signed_successfully_message
-      expect(LocationRelease.find(release.id).amendment_signed?).to be_truthy
-    end
-
-    scenario "opening signing amendment page for a signed amendment release shows already signed message", js: true do
-      contract_template = create(:location_release_contract_template, :with_amendment_clause, project: project)
-      release = create(:location_release, :amendment_signed, contract_template: contract_template, project: project)
-
-      expect(release.amendment_signed?).to be_truthy
-
-      visit new_account_project_contract_template_location_release_amendment_path(project.account, project, contract_template, release)
-
-      expect(page).not_to have_content amendments_heading
-      expect(page).not_to have_content signed_successfully_message
-      expect(page).to have_content already_signed_message
-    end
-
-    scenario "amendment signing form has copy URL button" do
-      contract_template = create(:location_release_contract_template, :with_amendment_clause, project: project)
-      release = create(:location_release, contract_template: contract_template, project: project)
-
-      visit new_account_project_contract_template_location_release_amendment_path(project.account, project, contract_template, release)
-
-      expect(page).to have_content copy_url_button
-    end
  end

  context "when signed in" do
@@ -149,9 +108,9 @@ feature "User managing location releases" do
          fill_in filming_hours_field, with: "04:00 - 22:00"
          click_button create_release_button
          expect(page).to have_content(create_release_notice)
-          expect(page).to have_photo("location_photo.png", visible: :all)
+          expect(page).to have_photo("location_photo.png")

-          click_on manage_button
+          click_on "Manage"
          expect(page).to have_link("Download")
      end
    end
@@ -160,7 +119,7 @@ feature "User managing location releases" do
      location_release = create(:location_release_with_photo, :non_native, project: project)

      visit project_location_releases_path(project)
-      click_on manage_button
+      click_on "Manage"
      click_link *update_location_release_link(location_release)

      within ".dropzone" do
@@ -180,7 +139,7 @@ feature "User managing location releases" do
      location_release = create(:location_release, project: project)

      visit project_location_releases_path(project)
-      click_on manage_button
+      click_on "Manage"

      accept_alert do
        click_link *destroy_location_release_link(location_release)
@@ -213,7 +172,7 @@ feature "User managing location releases" do

      expect(page).to have_content("Needs Photo")

-      click_on manage_button
+      click_on "Manage"
      click_on "Photos"

      expect(page).to have_content("Add Photos")
@@ -223,85 +182,11 @@ feature "User managing location releases" do
      click_on "Save Changes"

      expect(page).to have_content("The release has been updated")
-      expect(page).to have_photo("location_photo.png", visible: :all)
-    end
-
-    scenario "signing amendment for a not-signed amendment release", js: true do
-      contract_template = create(:location_release_contract_template, :with_amendment_clause, project: project)
-      release = create(:location_release, name: "Test Loc", contract_template: contract_template, project: project)
-
-      expect(release.amendment_signed?).to be_falsey
-
-      visit project_location_releases_path(project)
-
-      expect(page).to have_content "Test Loc"
-
-      click_on manage_button
-
-      expect(page).to have_link sign_amendment_link
-
-      new_window = window_opened_by { click_link sign_amendment_link }
-      within_window new_window do
-        expect(page).to have_content amendments_heading
-
-        fill_in amendment_signer_name_field, with: 'Big Signer'
-        draw_signature file_fixture("signature.png"), amendment_signature_field
-
-        click_button sign_amendment_button
-
-        expect(page).to have_content signed_successfully_message
-        expect(LocationRelease.find(release.id).amendment_signed?).to be_truthy
-      end
-    end
-
-    scenario "signed amendment release does not have sign amendment option in manage dropdown", js: true do
-      contract_template = create(:location_release_contract_template, :with_amendment_clause, project: project)
-      release = create(:location_release, :amendment_signed, name: "Test Loc", contract_template: contract_template, project: project)
-
-      expect(release.amendment_signed?).to be_truthy
-
-      visit project_location_releases_path(project)
-
-      expect(page).to have_content "Test Loc"
-
-      click_on manage_button
-
-      expect(page).not_to have_link sign_amendment_link
-    end
-
-    scenario "signed amendment release have checked box in location releases index table", js: true do
-      contract_template = create(:location_release_contract_template, :with_amendment_clause, project: project)
-      not_signed_release = create(:location_release, name: "Not Yet Loc", contract_template: contract_template, project: project)
-      expect(not_signed_release.amendment_signed?).to be_falsey
-
-      visit project_location_releases_path(project)
-
-      expect(page).to have_content "Not Yet Loc"
-      expect(page).to have_css('i.fa.fa-square-o', count: 1)
-      expect(page).to have_css('i.fa.fa-check-square', count: 0)
-
-      signed_release = create(:location_release, :amendment_signed, name: "Signed A Loc", contract_template: contract_template, project: project)
-      expect(signed_release.amendment_signed?).to be_truthy
-
-      visit project_location_releases_path(project)
-
-      expect(page).to have_content "Signed A Loc"
-
-      expect(page).to have_css('i.fa.fa-square-o', count: 1)
-      expect(page).to have_css('i.fa.fa-check-square-o', count: 1)
-    end
-
-    scenario "amendment signing form has copy URL button when user is signed in", js: true do
-      contract_template = create(:location_release_contract_template, :with_amendment_clause, project: project)
-      release = create(:location_release, contract_template: contract_template, project: project)
-
-      visit new_account_project_contract_template_location_release_amendment_path(project.account, project, contract_template, release)
-
-      expect(page).to have_content copy_url_button
+      expect(page).to have_photo("location_photo.png")
    end
  end
  
-  scenario "viewing the contract PDF when amendment is not yet signed" do
+  scenario "viewing the contract PDF" do
    location_release = create(:location_release_with_contract_template_and_photo, 
                              :native,
                              project: project,
@@ -313,13 +198,16 @@ feature "User managing location releases" do
                                      content: "Note 1", 
                                      user: build(:user, email: "jane.doe@test.com"),
                                      email: "jane.doe@test.com",
-                                      created_at: DateTime.new(2020, 2, 21, 12, 0, 0),), 
+                                      created_at: DateTime.new(2020, 2, 21, 12, 0, 0),
+                                      ), 
                                build(:note, 
                                      content: "Note 2", 
                                      user: build(:user, email: "john.doe@test.com"),
                                      email: "john.doe@test.com",
-                                      created_at: DateTime.new(2020, 2, 20, 11, 0, 0),),
-                              ])
+                                      created_at: DateTime.new(2020, 2, 20, 11, 0, 0),
+                                      ),
+                              ]
+                             )

    sign_in(current_user)
    visit project_location_releases_path(project)
@@ -328,8 +216,6 @@ feature "User managing location releases" do
    expect(content_type).to eq("application/pdf")
    expect(content_disposition).to include("inline")
    expect(pdf_filename).to include("benny-s-burritos")
-
-    expect(pdf_body).not_to have_content amendment_page_heading
    expect(pdf_body).to have_content("Benny's Burritos")
    expect(pdf_body).to have_content("NOTES")
    expect(pdf_body).to have_content("Note 1")
@@ -346,159 +232,18 @@ feature "User managing location releases" do
    expect(pdf_body).to have_content("06:00 - 20:00")
  end

-  scenario "viewing the contract PDF when amendment is signed" do
-    contract_template = create(:location_release_contract_template, :with_amendment_clause, project: project)
-    location_release = create(:location_release,
-                              :amendment_signed,
-                              :native,
-                              contract_template: contract_template,
-                              project: project,
-                              name: "Test Loc")
-
-    sign_in(current_user)
-    visit project_location_releases_path(project)
-    click_link *view_release_pdf_link_for(location_release)
-
-    expect(content_type).to eq("application/pdf")
-    expect(content_disposition).to include("inline")
-    expect(pdf_filename).to include("test-loc")
-
-    expect(pdf_body).to have_content("Test Loc")
-
-    expect(pdf_body).to have_content amendment_page_heading
-    expect(pdf_body).to have_content amendment_clause_label
-    expect(pdf_body).to have_content amendment_signer_name_label
-    expect(pdf_body).to have_content amendment_signature_label
-
-    expect(pdf_body).to have_content contract_template.amendment_clause.to_plain_text
-    expect(pdf_body).to have_content location_release.amendment_signer_name
-  end
-
-  context "when the user is account manager" do
-    let(:current_user) { create(:user, :account_manager) }
-
-    before do
-      sign_in current_user
-    end
-
-    scenario "Review action in Manage menu is visible" do
-      create(:location_release_with_contract_template, :native, project: project)
-
-      visit project_location_releases_path(project)
-
-      expect(page).to have_link(review_action, exact: true)
-    end
-
-    scenario "Reviewing release" do
-      create(:location_release_with_contract_template, :native, project: project)
-
-      visit project_location_releases_path(project)
-
-      click_link review_action
-
-      expect(page).to have_content review_page_heading
-      expect(page).to have_content approve_button
-    end
-
-    scenario "Approved releases have checkmark and non-approved releases don't have checkmarks" do
-      create(:location_release_with_contract_template, :native, project: project)
-
-      visit project_location_releases_path(project)
-      expect(page).to have_css('i.fa.fa-check-circle.fa-2x', count: 0)
-
-      create(:location_release_with_contract_template, :native, project: project, approved_by_user_email: "some@email.com", approved_at: DateTime.now)
-      visit project_location_releases_path(project)
-
-      expect(page).to have_css('i.fa.fa-check-circle.fa-2x', count: 1)
-    end
-
-    scenario 'When viewing the contract PDF of approved release there is page for office use only' do
-      location_release = create(:location_release_with_contract_template,
-                               :native,
-                               project: project,
-                               person_first_name: 'Jane',
-                               person_last_name: 'Doe',
-                               approved_by_user_name: "Big Joe",
-                               approved_by_user_email: "some@email.com",
-                               approved_at: DateTime.now)
-
-      sign_in(current_user)
-      visit project_location_releases_path(project)
-      click_link *view_release_pdf_link_for(location_release)
-
-      expect(content_type).to eq('application/pdf')
-      expect(content_disposition).to include('inline')
-      expect(pdf_body).to have_content for_office_use_only.upcase
-      expect(pdf_body).to have_content producer_label
-      expect(pdf_body).to have_content production_label
-      expect(pdf_body).to have_content issued_to_label
-      expect(pdf_body).to have_content issued_by_label
-      expect(pdf_body).to have_content date_issued
-      expect(pdf_body).to have_content 'Big Joe'
-    end
-
-    scenario 'When viewing the contract PDF of not approved release there is no page for office use only' do
-      location_release = create(:location_release_with_contract_template,
-                               :native,
-                               project: project,
-                               person_first_name: 'Jane',
-                               person_last_name: 'Doe')
-
-      sign_in(current_user)
-      visit project_location_releases_path(project)
-      click_link *view_release_pdf_link_for(location_release)
-
-      expect(content_type).to eq('application/pdf')
-      expect(content_disposition).to include('inline')
-      expect(pdf_body).not_to have_content for_office_use_only.upcase
-      expect(pdf_body).not_to have_content producer_label
-      expect(pdf_body).not_to have_content production_label
-      expect(pdf_body).not_to have_content issued_to_label
-      expect(pdf_body).not_to have_content issued_by_label
-      expect(pdf_body).not_to have_content date_issued
-      expect(pdf_body).not_to have_content 'Big Joe'
-    end
-  end
-
-  context "when the user is project manager" do
-    before do
-      sign_in current_user
-    end
-
-    scenario "Review action in Manage menu is not visible" do
-      create(:location_release_with_contract_template, :native, project: project)
-
-      visit project_location_releases_path(project)
-      click_on manage_button
-
-      expect(page).not_to have_link(review_action, exact: true)
-    end
-  end
-
  context "when the user is associate" do
    let(:current_user) { create(:user, :associate) }

-    before do
-      sign_in current_user
-    end
-
    scenario "should not show download" do
      create(:location_release_with_contract_template, name: "Cheers", project: project)

+      sign_in current_user
      visit project_location_releases_path(project)

-      click_on manage_button
+      click_on "Manage"
      expect(page).not_to have_link("Download", exact: true)
    end
-
-    scenario "Review action in Manage menu is not visible" do
-      create(:location_release_with_contract_template, :native, project: project)
-
-      visit project_location_releases_path(project)
-      click_on manage_button
-
-      expect(page).not_to have_link(review_action, exact: true)
-    end
  end

  private
@@ -579,8 +324,8 @@ feature "User managing location releases" do
    "location_release[filming_hours]"
  end

-  def have_photo(filename, attr: "src", visible: true)
-    have_selector("img[#{attr}*='#{filename}']", visible: visible)
+  def have_photo(filename, attr: "src")
+    have_selector("img[#{attr}*='#{filename}']")
  end

  def import_location_release_link(project)
@@ -641,92 +386,4 @@ feature "User managing location releases" do
  def dummy_signature_legal_text
    'Some signature legal language'
  end
-
-  def review_action
-    t 'location_releases.location_release.actions.review'
-  end
-
-  def review_page_heading
-    t 'approvals.new.heading', release_type: "Location Release"
-  end
-
-  def approve_button
-    t 'approvals.new.actions.approve'
-  end
-
-  def for_office_use_only
-    t 'contracts.for_office_use_only.heading'
-  end
-
-  def producer_label
-    t 'contracts.for_office_use_only.description_labels.producer'
-  end
-
-  def production_label
-    t 'contracts.for_office_use_only.description_labels.production'
-  end
-
-  def issued_to_label
-    t 'contracts.for_office_use_only.description_labels.issued_to'
-  end
-
-  def issued_by_label
-    t 'contracts.for_office_use_only.description_labels.issued_by'
-  end
-
-  def date_issued
-    t 'contracts.for_office_use_only.description_labels.date_issued'
-  end
-
-  def amendments_heading
-    t 'public.amendments.new.amendment.heading'
-  end
-
-  def amendment_signer_name_field
-    'location_release[amendment_signer_name]'
-  end
-
-  def amendment_signature_field
-    'location_release_amendment_signature_base64'
-  end
-
-  def sign_amendment_button
-    t 'shared.submit_release_long'
-  end
-
-  def already_signed_message
-    t 'public.amendments.create.amendment_already_signed_message'
-  end
-
-  def signed_successfully_message
-    t 'public.amendments.create.amendment_signed_message'
-  end
-
-  def manage_button
-    t 'location_releases.location_release.actions.manage'
-  end
-
-  def sign_amendment_link
-    t 'location_releases.location_release.actions.sign_amendment'
-  end
-
-  def copy_url_button
-    t 'public.amendments.new.copy_url'
-  end
-
-  def amendment_page_heading
-    t 'contracts.amendment_page.heading'
-  end
-
-  def amendment_signer_name_label
-    t 'contracts.amendment_page.description_labels.amendment_signer_name'
-  end
-
-  def amendment_clause_label
-    t 'contracts.amendment_page.description_labels.amendment_clause'
-  end
-
-  def amendment_signature_label
-    t 'contracts.amendment_page.description_labels.amendment_signature'
-  end
 end
--- a/spec/features/user_managing_material_releases_spec.rb
+++ b/spec/features/user_managing_material_releases_spec.rb
@@ -234,131 +234,18 @@ feature "User managing material releases" do
    end
  end

-  context "when the user is account manager" do
-    let(:current_user) { create(:user, :account_manager) }
-
-    before do
-      sign_in current_user
-    end
-
-    scenario "Review action in Manage menu is visible" do
-      create(:material_release_with_contract_template, :native, project: project)
-
-      visit project_material_releases_path(project)
-
-      expect(page).to have_link(review_action, exact: true)
-    end
-
-    scenario "Reviewing release" do
-      create(:material_release_with_contract_template, :native, project: project)
-
-      visit project_material_releases_path(project)
-
-      click_link review_action
-
-      expect(page).to have_content review_page_heading
-      expect(page).to have_content approve_button
-    end
-
-    scenario "Approved releases have checkmark and non-approved releases don't have checkmarks" do
-      create(:material_release_with_contract_template, :native, project: project)
-
-      visit project_material_releases_path(project)
-      expect(page).to have_css('i.fa.fa-check-circle.fa-2x', count: 0)
-
-      create(:material_release_with_contract_template, :native, project: project, approved_by_user_email: "some@email.com", approved_at: DateTime.now)
-      visit project_material_releases_path(project)
-
-      expect(page).to have_css('i.fa.fa-check-circle.fa-2x', count: 1)
-    end
-
-    scenario 'When viewing the contract PDF of approved release there is page for office use only' do
-      material_release = create(:material_release_with_contract_template,
-                               :native,
-                               project: project,
-                               person_first_name: 'Jane',
-                               person_last_name: 'Doe',
-                               approved_by_user_name: "Big Joe",
-                               approved_by_user_email: "some@email.com",
-                               approved_at: DateTime.now)
-
-      sign_in(current_user)
-      visit project_material_releases_path(project)
-      click_link *view_release_pdf_link_for(material_release)
-
-      expect(content_type).to eq('application/pdf')
-      expect(content_disposition).to include('inline')
-      expect(pdf_body).to have_content for_office_use_only.upcase
-      expect(pdf_body).to have_content producer_label
-      expect(pdf_body).to have_content production_label
-      expect(pdf_body).to have_content issued_to_label
-      expect(pdf_body).to have_content issued_by_label
-      expect(pdf_body).to have_content date_issued
-      expect(pdf_body).to have_content 'Big Joe'
-    end
-
-    scenario 'When viewing the contract PDF of not approved release there is no page for office use only' do
-      material_release = create(:material_release_with_contract_template,
-                               :native,
-                               project: project,
-                               person_first_name: 'Jane',
-                               person_last_name: 'Doe')
-
-      sign_in(current_user)
-      visit project_material_releases_path(project)
-      click_link *view_release_pdf_link_for(material_release)
-
-      expect(content_type).to eq('application/pdf')
-      expect(content_disposition).to include('inline')
-      expect(pdf_body).not_to have_content for_office_use_only.upcase
-      expect(pdf_body).not_to have_content producer_label
-      expect(pdf_body).not_to have_content production_label
-      expect(pdf_body).not_to have_content issued_to_label
-      expect(pdf_body).not_to have_content issued_by_label
-      expect(pdf_body).not_to have_content date_issued
-      expect(pdf_body).not_to have_content 'Big Joe'
-    end
-  end
-
-  context "when the user is project manager" do
-    before do
-      sign_in current_user
-    end
-
-    scenario "Review action in Manage menu is not visible" do
-      create(:material_release_with_contract_template, :native, project: project)
-
-      visit project_material_releases_path(project)
-      click_on "Manage"
-
-      expect(page).not_to have_link(review_action, exact: true)
-    end
-  end
-
  context "when the user is associate" do
    let(:current_user) { create(:user, :associate) }

-    before do
-      sign_in current_user
-    end
-
    scenario "should not show download" do
      create(:material_release_with_contract_template, name: "Apple MacBook Air", project: project)

+      sign_in current_user
      visit project_material_releases_path(project)

      click_on "Manage"
      expect(page).not_to have_link("Download", exact: true)
    end
-
-    scenario "Review action in Manage menu is not visible" do
-      create(:material_release_with_contract_template, :native, project: project)
-
-      visit project_material_releases_path(project)
-      click_on "Manage"
-
-      expect(page).not_to have_link(review_action, exact: true)
-    end
  end

  private
@@ -506,40 +393,4 @@ feature "User managing material releases" do
  def dummy_signature_legal_text
    'Some signature legal language'
  end
-
-  def review_action
-    t 'material_releases.material_release.actions.review'
-  end
-
-  def review_page_heading
-    t 'approvals.new.heading', release_type: "Material Release"
-  end
-
-  def approve_button
-    t 'approvals.new.actions.approve'
-  end
-
-  def for_office_use_only
-    t 'contracts.for_office_use_only.heading'
-  end
-
-  def producer_label
-    t 'contracts.for_office_use_only.description_labels.producer'
-  end
-
-  def production_label
-    t 'contracts.for_office_use_only.description_labels.production'
-  end
-
-  def issued_to_label
-    t 'contracts.for_office_use_only.description_labels.issued_to'
-  end
-
-  def issued_by_label
-    t 'contracts.for_office_use_only.description_labels.issued_by'
-  end
-
-  def date_issued
-    t 'contracts.for_office_use_only.description_labels.date_issued'
-  end
 end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bilal	c17f41525d	fix MR comment	2020-07-15 19:03:35 +02:00
Bilal	d12cec8487	remove validation and add specs	2020-07-15 12:25:54 +02:00
Bilal	bde18ab0f1	add Chat Now button	2020-07-15 12:25:54 +02:00
Bilal	fc320a3421	rebase	2020-07-15 12:25:54 +02:00