add specs

app/assets/javascripts/channels/broadcasts.coffee.erb

@@ -21,11 +21,13 @@ $(document).on "turbolinks:load", ->
 
     refreshBroadcastVideo: (data) ->
       $("#broadcast_updates").html data.status_content
-      if data.streamer_status == 'recording' && data.status == 'active'
+      stream_selected = $("#broadcast_video").data('videoType') == 'stream';
+      if data.streamer_status == 'recording' && data.status == 'active' && stream_selected
         $("#broadcast_video").html data.video_content
         new (Clappr.Player)(
+          <%= "baseUrl: 'http://cdn.clappr.io/latest'," if Rails.env.test? %>
           parentId: '#broadcast_video'
-          source: data.playback_url
+          source: data.full_live_stream_playback_url
           width: '100%',
           height: '100%',
           mute: true,

app/assets/javascripts/directory_files_input.js

@@ -0,0 +1,9 @@
+$(document).on("turbolinks:load", function() {
+    $("#upload_directory_files").on('click', function(e){
+        const newFilesCount = $('input[name = "directory[files][]"][type = "hidden"]').length;
+
+        if (newFilesCount === 0){
+            e.preventDefault();
+        }
+    });
+});

app/assets/javascripts/group_qr_code.js

@@ -0,0 +1,50 @@
+$(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');
+  }
+}

app/assets/javascripts/stream_player.js.erb

@@ -3,7 +3,7 @@ $(document).on("click", "[data-behavior=play_recording]", function() {
         return false;
     }
 
-    console.warn('Play prev : ', playback_url);
+    $("#broadcast_video").data('videoType', 'recording');
 
     var playback_url = $(this).attr("data-playback-url")
     $("#broadcast_video").empty();
@@ -23,4 +23,6 @@ $(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").data('videoType', 'stream'); });

app/assets/javascripts/update_required_status.js

@@ -0,0 +1,13 @@
+$(document).on("turbolinks:load", function() {
+    $("[data-behavior=update-required-status]").click(function(e) {
+        const required = !!($(this)[0] && $(this)[0].checked);
+
+
+        $("[data-required-tag=guardian]").each(function(index, element) {
+            const labelForField = element.previousSibling;
+
+            element.required = required;
+            labelForField.classList.add("required");
+        });
+    });
+});

app/channels/broadcasts_channel.rb

@@ -16,6 +16,7 @@ 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

app/controllers/acquired_media_releases_controller.rb

@@ -56,35 +56,74 @@ class AcquiredMediaReleasesController < ApplicationController
     end
   end
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_company
+      person_email
+      person_title
+      person_address_street1
+      person_address_street2
+      person_address_city
+      person_address_state
+      person_address_zip
+      person_address_country
+    ]
+  end
+
+  def guardian_params
+    %i[
+      guardian_first_name
+      guardian_last_name
+      guardian_phone
+      guardian_email
+      guardian_photo
+      guardian_address_street1
+      guardian_address_street2
+      guardian_address_city
+      guardian_address_state
+      guardian_address_zip
+      guardian_address_country
+    ]
+  end
+
+  def second_guardian_params
+    %i[
+      guardian_2_first_name
+      guardian_2_last_name
+      guardian_2_phone
+      guardian_2_email
+      guardian_2_photo
+      guardian_2_address_street1
+      guardian_2_address_street2
+      guardian_2_address_city
+      guardian_2_address_state
+      guardian_2_address_zip
+      guardian_2_address_country
+    ]
+  end
+
   def acquired_media_release_params
-    params.require(:acquired_media_release).permit(
-      :name,
-      :territory,
-      :term,
-      :person_first_name,
-      :person_last_name,
-      :person_phone,
-      :person_email,
-      :person_company,
-      :person_title,
-      :person_address_street1,
-      :person_address_street2,
-      :person_address_city,
-      :person_address_state,
-      :person_address_zip,
-      :person_address_country,
-      :contract,
-      :applicable_medium_id, :applicable_medium_text,
-      :territory_id, :territory_text,
-      :term_id, :term_text,
-      :restriction_id, :restriction_text,
-      categories: [],
-      file_infos_attributes: [
-        :filename,
-        :content_type,
-        :byte_size
-      ]
-    )
+    params.require(:acquired_media_release).permit(person_params,
+                                                   guardian_params,
+                                                   second_guardian_params,
+                                                   :minor,
+                                                   :name,
+                                                   :territory,
+                                                   :term,
+                                                   :contract,
+                                                   :applicable_medium_id, :applicable_medium_text,
+                                                   :territory_id, :territory_text,
+                                                   :term_id, :term_text,
+                                                   :restriction_id, :restriction_text,
+                                                   categories: [],
+                                                   file_infos_attributes: %i[
+                                                     filename
+                                                     content_type
+                                                     byte_size
+                                                   ])
   end
 
   def build_acquired_media_release(attrs = {})

app/controllers/api/api_controller.rb

@@ -17,7 +17,9 @@ class Api::ApiController < ActionController::Base
   def return_error(exception)
     raise exception if Rails.env.test? 
 
-    logger.error "==Handled======="
+    Raven.capture_exception(exception)
+
+    logger.error "==Handled======"
     logger.error exception.message
     logger.error exception.backtrace.join("\n")
     logger.error "==Handled=======" 

app/controllers/api/medical_releases_controller.rb

@@ -0,0 +1,11 @@
+class Api::MedicalReleasesController < Api::ReleasesController
+  deserializable_resource :medical_release, only: [:create, :update]
+
+  def model_name
+    "medical_release"
+  end
+
+  def attributes_for_index
+    [:name]
+  end
+end

app/controllers/api/misc_releases_controller.rb

@@ -0,0 +1,11 @@
+class Api::MiscReleasesController < Api::ReleasesController
+  deserializable_resource :misc_release, only: [:create, :update]
+
+  def model_name
+    "misc_release"
+  end
+
+  def attributes_for_index
+    [:name]
+  end
+end

app/controllers/api/sync_controller.rb

@@ -10,8 +10,10 @@ class Api::SyncController < Api::ApiController
     @appearance_releases = (AppearanceRelease.where(project: accessible_projects))
     @location_releases = (LocationRelease.where(project: accessible_projects))
     @material_releases = (MaterialRelease.where(project: accessible_projects))
+    @medical_releases = MedicalRelease.where(project: accessible_projects)
+    @misc_releases = MiscRelease.where(project: accessible_projects)
     @talent_releases = (TalentRelease.where(project: accessible_projects))
-    @notes = notes_query(Note.where(notable: @appearance_releases + @location_releases + @material_releases + @talent_releases + @acquired_media_releases ))
+    @notes = notes_query(Note.where(notable: @appearance_releases + @location_releases + @material_releases + @medical_releases + @misc_releases + @talent_releases + @acquired_media_releases ))
 
     render json: {
       data: {
@@ -22,6 +24,8 @@ class Api::SyncController < Api::ApiController
         appearance_releases: releases_query(@appearance_releases),
         location_releases: releases_query(@location_releases),
         material_releases: releases_query(@material_releases),
+        medical_releases: releases_query(@medical_releases),
+        misc_releases: releases_query(@misc_releases),
         talent_releases: releases_query(@talent_releases),
         notes: @notes
       }

app/controllers/api/user_token_controller.rb

@@ -1,14 +1,23 @@
+# frozen_string_literal: true
+
+require './lib/knock_monkeypatch'
+
 class Api::UserTokenController < Knock::AuthTokenController
+  include Oath::ControllerHelpers
+
   skip_before_action :verify_authenticity_token
+  before_action :sign_in_user
 
   rescue_from Exception, :with => :return_error
 
   # Catch exception and return JSON-formatted error
   def return_error(exception)
+    Raven.capture_exception(exception)
+
     logger.error "==Handled======="
     logger.error exception.message
     logger.error exception.backtrace.join("\n")
-    logger.error "==Handled=======" 
+    logger.error "==Handled======="
     case exception
     when ActiveRecord::RecordNotFound
       @status = 404
@@ -25,12 +34,18 @@ class Api::UserTokenController < Knock::AuthTokenController
     end
 
     # for some reason render json_errors is not working
-    # simulating JSON API support 
-    render json: { 
+    # simulating JSON API support
+    render json: {
       errors: [{
         status: @status.to_s,
         title: @message
       }]
     }
   end
+
+  private
+
+  def sign_in_user
+    sign_in(entity)
+  end
 end

app/controllers/approvals_controller.rb

@@ -0,0 +1,28 @@
+class ApprovalsController < ApplicationController
+  before_action :set_releasable
+  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)
+    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
+  end
+end

app/controllers/broadcasts_controller.rb

@@ -3,7 +3,7 @@ class BroadcastsController < ApplicationController
 
   before_action :set_project
   before_action :build_broadcast, only: [:new, :create]
-  before_action :set_broadcast, only: [:show, :destroy, :update]
+  before_action :set_broadcast, only: [:show, :destroy, :update, :destroy_file]
   before_action :set_multi_view_broadcasts, only: [:show]
   before_action :show_splash_screen, only: :index
 
@@ -33,11 +33,13 @@ class BroadcastsController < ApplicationController
   end
 
   def update
-    @broadcast.update(broadcast_params)
-    @files = @broadcast.files.order("created_at DESC").paginate(page: 1)
+    unless params.has_key?(:broadcast)
+      @broadcast.regenerate_token
+      redirect_to([@project, @broadcast], notice: t('.reset_notice')) and return
+    end
 
-    pagination_content = ApplicationController.render html: helpers.will_paginate(@files, params: { active_tab: params[:active_tab], page: params[:page], active_files_tab: params[:active_files_tab] })
-    BroadcastsChannel.broadcast_file_upload_updates(@broadcast, @files, pagination_content)
+    @broadcast.update(broadcast_params)
+    update_files_section
   end
 
   def destroy
@@ -48,14 +50,29 @@ class BroadcastsController < ApplicationController
     end
   end
 
+  def destroy_file
+    authorize Broadcast
+    file = ActiveStorage::Attachment.find(params[:file_id])
+    file.destroy
+
+    update_files_section
+  end
+
   private
 
+  def update_files_section
+    @files = @broadcast.files.order("created_at DESC").paginate(page: 1)
+
+    pagination_content = ApplicationController.render html: helpers.will_paginate(@files, params: { active_tab: params[:active_tab], page: params[:page], active_files_tab: params[:active_files_tab] })
+    BroadcastsChannel.broadcast_file_upload_updates(@broadcast, @files, pagination_content)
+  end
+
   def show_splash_screen
     render :splash if broadcasts.count.zero?
   end
 
   def broadcast_params
-    params.require(:broadcast).permit(:name, files: [])
+    params.require(:broadcast).permit(:name, :shoot_location_time_zone, files: [])
   end
 
   def set_project

app/controllers/contract_templates/duplicates_controller.rb

@@ -0,0 +1,33 @@
+# 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

app/controllers/contract_templates/qr_codes_controller.rb

@@ -16,7 +16,12 @@ class ContractTemplates::QrCodesController < ApplicationController
   end
 
   def qr_code
-    authorize QrCode.build_from_contract_template(@contract_template)
+    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
   end
 
   def download_attributes

app/controllers/contract_templates_controller.rb

@@ -5,8 +5,9 @@ class ContractTemplatesController < ApplicationController
 
   layout 'project'
 
-  before_action :set_project, except: [:destroy]
-  before_action :set_contract_template, only: [:destroy]
+  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 :show_splash_screen, only: :index
 
   def index
@@ -32,6 +33,20 @@ 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')
@@ -39,6 +54,10 @@ 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
@@ -62,18 +81,19 @@ class ContractTemplatesController < ApplicationController
   def contract_template_params
     params
       .require(:contract_template)
-      .permit(:name, :release_type, :body, :guardian_clause, :fee,
+      .permit(:name, :release_type, :body, :guardian_clause,
+              :signature_legal_text, :fee, :amendment_clause,
               :applicable_medium_id, :applicable_medium_text,
               :territory_id, :territory_text,
-              :term_id, :term_text,
+              :term_id, :term_text, :accessibility,
               :restriction_id, :restriction_text,
-              :question_1_text, :question_2_text, 
-              :question_3_text, :question_4_text, 
-              :question_5_text, :question_6_text, 
-              :question_7_text, :question_8_text, 
+              :question_1_text, :question_2_text,
+              :question_3_text, :question_4_text,
+              :question_5_text, :question_6_text,
+              :question_7_text, :question_8_text,
               :question_9_text, :question_10_text,
-              :question_11_text, :question_12_text, 
-              :question_13_text, :question_14_text, 
+              :question_11_text, :question_12_text,
+              :question_13_text, :question_14_text,
               :question_15_text)
   end
 

app/controllers/material_releases_controller.rb

@@ -50,11 +50,58 @@ class MaterialReleasesController < ApplicationController
 
   private
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_company
+      person_email
+      person_title
+      person_address_street1
+      person_address_street2
+      person_address_city
+      person_address_state
+      person_address_zip
+      person_address_country
+    ]
+  end
+
+  def guardian_params
+    %i[
+      guardian_first_name
+      guardian_last_name
+      guardian_phone
+      guardian_email
+      guardian_photo
+      guardian_address_street1
+      guardian_address_street2
+      guardian_address_city
+      guardian_address_state
+      guardian_address_zip
+      guardian_address_country
+    ]
+  end
+
+  def second_guardian_params
+    %i[
+      guardian_2_first_name
+      guardian_2_last_name
+      guardian_2_phone
+      guardian_2_email
+      guardian_2_photo
+      guardian_2_address_street1
+      guardian_2_address_street2
+      guardian_2_address_city
+      guardian_2_address_state
+      guardian_2_address_zip
+      guardian_2_address_country
+    ]
+  end
+
   def material_release_params
-    params.require(:material_release).permit(
+    params.require(:material_release).permit(person_params, guardian_params, second_guardian_params, :minor,
       :name, :address_street1, :address_street2, :address_city, :address_state, :address_zip, :address_country,
-      :person_first_name, :person_last_name, :person_title, :person_company, :person_phone, :person_email,
-      :person_address_street1, :person_address_street2, :person_address_city, :person_address_state, :person_address_zip, :person_address_country,
       :applicable_medium_id, :applicable_medium_text,
       :territory_id, :territory_text,
       :term_id, :term_text,

app/controllers/public/acquired_media_releases_controller.rb

@@ -41,31 +41,70 @@ class Public::AcquiredMediaReleasesController < Public::BaseController
     end
   end
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_fax
+      person_email
+      person_title
+      person_address_street1
+      person_address_street2
+      person_address_city
+      person_address_state
+      person_address_zip
+      person_address_country
+    ]
+  end
+
+  def guardian_params
+    %i[
+      guardian_first_name
+      guardian_last_name
+      guardian_phone
+      guardian_email
+      guardian_photo
+      guardian_address_street1
+      guardian_address_street2
+      guardian_address_city
+      guardian_address_state
+      guardian_address_zip
+      guardian_address_country
+    ]
+  end
+
+  def second_guardian_params
+    %i[
+      guardian_2_first_name
+      guardian_2_last_name
+      guardian_2_phone
+      guardian_2_email
+      guardian_2_photo
+      guardian_2_address_street1
+      guardian_2_address_street2
+      guardian_2_address_city
+      guardian_2_address_state
+      guardian_2_address_zip
+      guardian_2_address_country
+    ]
+  end
+
   def acquired_media_release_params
-    params.require(:acquired_media_release).permit(
-      :name, 
-      :description,
-      :person_first_name,
-      :person_last_name,
-      :person_email,
-      :person_title,
-      :person_phone,
-      :person_fax,
-      :person_address_street1, 
-      :person_address_street2, 
-      :person_address_city, 
-      :person_address_state, 
-      :person_address_zip, 
-      :person_address_country,
-      :signature_base64,
-      :locale, :contract_template,
-      categories: [],
-      file_infos_attributes: [
-        :filename,
-        :content_type,
-        :byte_size
-      ]
-    )
+    params.require(:acquired_media_release).permit(person_params,
+                                                   guardian_params,
+                                                   second_guardian_params,
+                                                   :minor,
+                                                   :name,
+                                                   :description,
+                                                   :signature_base64,
+                                                   :locale, :contract_template,
+                                                   categories: [],
+                                                   file_infos_attributes: %i[
+                                                     filename
+                                                     content_type
+                                                     byte_size
+                                                   ])
   end
 
   def acquired_media_release_params_with_locale

app/controllers/public/amendments_controller.rb

@@ -0,0 +1,47 @@
+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

app/controllers/public/contract_templates_controller.rb

@@ -0,0 +1,18 @@
+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

app/controllers/public/material_releases_controller.rb

@@ -39,11 +39,59 @@ class Public::MaterialReleasesController < Public::BaseController
     authorize material_releases.build(params)
   end
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_email
+      person_title
+      person_company
+      person_address_street1
+      person_address_street2
+      person_address_city
+      person_address_state
+      person_address_zip
+      person_address_country
+    ]
+  end
+
+  def guardian_params
+    %i[
+      guardian_first_name
+      guardian_last_name
+      guardian_phone
+      guardian_email
+      guardian_photo
+      guardian_address_street1
+      guardian_address_street2
+      guardian_address_city
+      guardian_address_state
+      guardian_address_zip
+      guardian_address_country
+    ]
+  end
+
+  def second_guardian_params
+    %i[
+      guardian_2_first_name
+      guardian_2_last_name
+      guardian_2_phone
+      guardian_2_email
+      guardian_2_photo
+      guardian_2_address_street1
+      guardian_2_address_street2
+      guardian_2_address_city
+      guardian_2_address_state
+      guardian_2_address_zip
+      guardian_2_address_country
+    ]
+  end
+
+
   def material_release_params
-    params.require(:material_release).permit(
+    params.require(:material_release).permit(person_params, guardian_params, second_guardian_params, :minor,
       :name, :address_street1, :address_street2, :address_city, :address_state, :address_zip, :address_country,
-      :person_first_name, :person_last_name, :person_title, :person_company, :person_phone, :person_email,
-      :person_address_street1, :person_address_street2, :person_address_city, :person_address_state, :person_address_zip, :person_address_country,
       :signature_base64,
       :locale, :contract_template, :description, photos: []
     )

app/controllers/stream_notifications_controller.rb

@@ -14,6 +14,10 @@ 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
@@ -28,8 +32,9 @@ class StreamNotificationsController < ApplicationController
       asset_uid = notification.dig(:object, :id)
       playback_uid = notification.dig(:data, :playback_ids, 0, :id)
       file_name = notification.dig(:data, :static_renditions, :files, -1, :name)
+      duration = notification.dig(:data, :duration)
 
-      recording = @broadcast.broadcast_recordings.create!(asset_uid: asset_uid, asset_playback_uid: playback_uid, file_name: file_name)
+      recording = @broadcast.broadcast_recordings.create!(asset_uid: asset_uid, asset_playback_uid: playback_uid, file_name: file_name, duration: duration)
       recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
 
       link = helpers.link_to(recording.broadcast_name.titleize, recording.download_url, target: "_blank")
@@ -58,7 +63,8 @@ class StreamNotificationsController < ApplicationController
   end
 
   def set_broadcast
-    if notification_type == "video.asset.static_renditions.ready"
+    case notification_type
+    when "video.asset.static_renditions.ready", "video.asset.ready"
       live_stream_id = notification.dig(:stream_notification, :data, :live_stream_id)
       @broadcast = Broadcast.find_by(stream_uid: live_stream_id)
     else

app/helpers/tooltip_helper.rb

@@ -5,4 +5,12 @@ module TooltipHelper
       concat tag.div(class: "tooltip-inner")
     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}]"
+    else
+      release.approved_by_user_email
+    end
+  end
 end

app/jobs/generate_contracts_zip_job.rb

@@ -6,8 +6,8 @@ class GenerateContractsZipJob < ApplicationJob
   before_perform do |job|
     @project = job.arguments.first
     @download = job.arguments.second
-    release_type = job.arguments.third
-    @folder_name = "#{@project.name.parameterize}_#{get_release_name(release_type).gsub('_', '-')}"
+    @release_type = job.arguments.third
+    @folder_name = "#{@project.name.parameterize}_#{get_release_name(@release_type).gsub('_', '-')}"
     @download.update!(name: @folder_name, status: :pending)
   end
 
@@ -20,9 +20,14 @@ class GenerateContractsZipJob < ApplicationJob
         files.each do |attachment|
           zipfile.add(attachment, File.join("#{dir}/", attachment))
         end
+
+        if @release_type.constantize.include?(CsvExportable)
+          csv_file = generate_csv releases
+          zipfile.get_output_stream("#{@folder_name}.csv") { |f| f.puts(csv_file) }
+        end
       end
 
-      @download.file.attach(io: File.open(zipfile_name), filename: @folder_name)
+      @download.file.attach(io: File.open(zipfile_name), filename: "#{@folder_name}.zip")
     end
   rescue StandardError => e
     Rails.logger.error("Failed to generate download for project (##{project.id}) with release type #{release_type}\n" + e.message)
@@ -43,6 +48,19 @@ class GenerateContractsZipJob < ApplicationJob
 
   private
 
+  def generate_csv(releases)
+    release_class = @release_type.constantize
+    headers = release_class.csv_headers
+
+    CSV.generate(headers: true) do |csv|
+      csv << headers
+      releases.each do |release|
+        csv_row_data = release.to_csv_row
+        csv << csv_row_data
+      end
+    end
+  end
+
   def get_release_name(release_type)
     release_type.constantize.model_name.plural
   end

app/models/acquired_media_release.rb

@@ -9,6 +9,18 @@ class AcquiredMediaRelease < ApplicationRecord
   include Signable
   include Syncable
   include PersonName
+  include CsvExportable
+  include Approvable
+  include GuardianPhotoable
+  include SecondGuardianPhotoable
+  include GuardianName
+  include SecondGuardianName
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name file_infos_count]
+    end
+  end
 
   has_many :file_infos, as: :releasable, dependent: :destroy
 
@@ -25,6 +37,38 @@ class AcquiredMediaRelease < ApplicationRecord
                 %w(person_address_country country) 
               ]
 
+  composed_of :guardian_address,
+              class_name: 'Address',
+              mapping: [
+                  %w[guardian_address_street1 street1],
+                  %w[guardian_address_street2 street2],
+                  %w[guardian_address_city city],
+                  %w[guardian_address_state state],
+                  %w[guardian_address_zip zip],
+                  %w[guardian_address_country country]
+              ]
+
+  composed_of :guardian_2_address,
+              class_name: 'Address',
+              mapping: [
+                  %w[guardian_2_address_street1 street1],
+                  %w[guardian_2_address_street2 street2],
+                  %w[guardian_2_address_city city],
+                  %w[guardian_2_address_state state],
+                  %w[guardian_2_address_zip zip],
+                  %w[guardian_2_address_country country]
+              ]
+
+  # We don't care for the argument but method WILL receive option name
+  # when called from inside with_option block, hence * argument
+  def self.face_photo_acceptable_content_types(*)
+    ['image/png', 'image/jpeg']
+  end
+
+  def self.acceptable_import_file_extensions
+    ['.png', '.jpeg', '.jpg', '.pdf']
+  end
+
   validates :name, presence: true
   validates :person_email, email: true, allow_blank: true
 
@@ -46,8 +90,8 @@ class AcquiredMediaRelease < ApplicationRecord
   # CATEGORIES = ["Artwork", "Film Footage", "Video Footage", "Still Photograph"].freeze
   CATEGORIES = ["Film Footage", "Video Footage", "Still Photograph"].freeze
 
-  def minor?
-    false
+  def second_guardian_present?
+    guardian_2_first_name.present?
   end
 
   def contact_person
@@ -57,4 +101,8 @@ class AcquiredMediaRelease < ApplicationRecord
   def uses_edl?
     true
   end
+
+  def file_infos_count
+    file_infos.any? ? file_infos.size : I18n.t('acquired_media_releases.acquired_media_release.no_media')
+  end
 end

app/models/appearance_release.rb

@@ -15,6 +15,14 @@ class AppearanceRelease < ApplicationRecord
   include SecondGuardianPhotoable
   include GuardianName
   include SecondGuardianName
+  include CsvExportable
+  include Approvable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name contact_info]
+    end
+  end
 
   has_one_attached :person_photo
 

app/models/broadcast.rb

@@ -30,6 +30,10 @@ 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

app/models/broadcast_recording.rb

@@ -14,6 +14,6 @@ class BroadcastRecording < ApplicationRecord
   end
 
   def download_file_name
-    "#{broadcast_name}_Date_#{created_at.strftime("%Y-%m-%d")}_Time_#{created_at.strftime("%T")}".parameterize
+    "#{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
   end
 end

app/models/concerns/amendmenable.rb

@@ -0,0 +1,32 @@
+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

app/models/concerns/approvable.rb

@@ -0,0 +1,17 @@
+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

app/models/concerns/csv_exportable.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module CsvExportable
+  extend ActiveSupport::Concern
+
+  COMMON_HEADERS = %i[approved? notes tags signed_at].freeze
+  COMMON_VALUES = %w[clean_notes clean_tags signed_on].freeze
+
+  included do
+    class << self
+      def custom_csv_exportable_headers
+        []
+      end
+
+      def csv_headers
+        headers = custom_csv_exportable_headers + COMMON_HEADERS
+
+        headers.map do |header|
+          I18n.t("#{model_name.plural}.index.table_headers.#{header}")
+        end
+      end
+    end
+
+    def to_csv_row
+      (self.class.custom_csv_exportable_headers + COMMON_VALUES).map do |function|
+        send(function)
+      end
+    end
+
+    private
+
+    def contact_info
+      contact_info = ''
+      contact_info += "#{person_address}; " if person_address.present?
+      contact_info += "P: #{person_phone}; " if person_phone.present?
+      contact_info += "E: #{person_email}" if person_email.present?
+      contact_info.delete_suffix '; '
+    end
+
+    def clean_notes
+      notes = ''
+      self.notes.order_by_recent.each do |note|
+        notes += "#{note.content}(#{note.email}), "
+      end
+      notes.delete_suffix ', '
+    end
+
+    def clean_tags
+      tags = ''
+      self.tags.each do |tag|
+        tags += "#{tag.name}, "
+      end
+      tags.delete_suffix ', '
+    end
+  end
+end

app/models/contract_template.rb

@@ -21,6 +21,8 @@ class ContractTemplate < ApplicationRecord
   monetize :fee_cents
   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
@@ -42,6 +44,8 @@ class ContractTemplate < ApplicationRecord
   scope :non_archived, -> { where(archived_at: nil) }
   scope :order_by_name, -> { order(:name) }
 
+  enum accessibility: [:public_template, :private_template]
+
   def fee?
     !fee.zero?
   end
@@ -65,4 +69,14 @@ class ContractTemplate < ApplicationRecord
   def has_questionnaire?
     (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
+  end
 end

app/models/location_release.rb

@@ -10,6 +10,15 @@ class LocationRelease < ApplicationRecord
   include Syncable
   include Taggable
   include PersonName
+  include CsvExportable
+  include Approvable
+  include Amendmenable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name address]
+    end
+  end
 
   composed_of :address,
               mapping: [

app/models/material_release.rb

@@ -10,8 +10,21 @@ class MaterialRelease < ApplicationRecord
   include Syncable
   include Taggable
   include PersonName
-  
-  composed_of :person_address, 
+  include CsvExportable
+  include Approvable
+  include GuardianPhotoable
+  include SecondGuardianPhotoable
+  include GuardianName
+  include SecondGuardianName
+
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name]
+    end
+  end
+
+  composed_of :person_address,
               class_name: "Address",
               mapping: [
                 %w(person_address_street1 street1),
@@ -22,6 +35,39 @@ class MaterialRelease < ApplicationRecord
                 %w(person_address_country country)
               ]
 
+  composed_of :guardian_address,
+              class_name: 'Address',
+              mapping: [
+                  %w[guardian_address_street1 street1],
+                  %w[guardian_address_street2 street2],
+                  %w[guardian_address_city city],
+                  %w[guardian_address_state state],
+                  %w[guardian_address_zip zip],
+                  %w[guardian_address_country country]
+              ]
+
+  composed_of :guardian_2_address,
+              class_name: 'Address',
+              mapping: [
+                  %w[guardian_2_address_street1 street1],
+                  %w[guardian_2_address_street2 street2],
+                  %w[guardian_2_address_city city],
+                  %w[guardian_2_address_state state],
+                  %w[guardian_2_address_zip zip],
+                  %w[guardian_2_address_country country]
+              ]
+
+  # We don't care for the argument but method WILL receive option name
+  # when called from inside with_option block, hence * argument
+  def self.face_photo_acceptable_content_types(*)
+    ['image/png', 'image/jpeg']
+  end
+
+  def self.acceptable_import_file_extensions
+    ['.png', '.jpeg', '.jpg', '.pdf']
+  end
+
+
   validates :name, presence: true
   validates :person_email, email: true, allow_blank: true
 
@@ -30,17 +76,17 @@ class MaterialRelease < ApplicationRecord
     validates :signature, attached: true
   end
 
-  searchable_on %i[ 
-    name 
+  searchable_on %i[
+    name
     person_address_street1 person_address_street2 person_address_city person_address_state person_address_zip person_address_country
   ]
 
   def contact_person
     @contact_person ||= Contact.new(person_name, person_address, person_email, person_phone)
   end
-  
-  def minor?
-    false
+
+  def second_guardian_present?
+    guardian_2_first_name.present?
   end
 
   def uses_edl?

app/models/medical_release.rb

@@ -11,18 +11,48 @@ class MedicalRelease < ApplicationRecord
   include SecondGuardianPhotoable
   include GuardianName
   include SecondGuardianName
+  include CsvExportable
+  include Approvable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name contact_info]
+    end
+  end
 
   NUMBER_OF_CUSTOM_FIELDS = 15
 
-  composed_of :person_address, 
+  composed_of :person_address,
               class_name: "Address",
-              mapping: [ 
-                %w(person_address_street1 street1), 
-                %w(person_address_street2 street2), 
-                %w(person_address_city city), 
-                %w(person_address_state state), 
-                %w(person_address_zip zip), 
-                %w(person_address_country country) 
+              mapping: [
+                %w[person_address_street1 street1],
+                %w[person_address_street2 street2],
+                %w[person_address_city city],
+                %w[person_address_state state],
+                %w[person_address_zip zip],
+                %w[person_address_country country]
+              ]
+
+  composed_of :guardian_address,
+              class_name: 'Address',
+              mapping: [
+                %w[guardian_address_street1 street1],
+                %w[guardian_address_street2 street2],
+                %w[guardian_address_city city],
+                %w[guardian_address_state state],
+                %w[guardian_address_zip zip],
+                %w[guardian_address_country country]
+              ]
+
+  composed_of :guardian_2_address,
+              class_name: 'Address',
+              mapping: [
+                %w[guardian_2_address_street1 street1],
+                %w[guardian_2_address_street2 street2],
+                %w[guardian_2_address_city city],
+                %w[guardian_2_address_state state],
+                %w[guardian_2_address_zip zip],
+                %w[guardian_2_address_country country]
               ]
 
   def self.face_photo_acceptable_content_types
@@ -32,6 +62,7 @@ class MedicalRelease < ApplicationRecord
   # These validations apply to all releases
   validates :person_first_name, :person_last_name, presence: true
   validates :person_email, email: true, allow_blank: true
+  validate :valid_answers
 
   acts_as_taggable_on :internal_tags, :tags
 
@@ -76,4 +107,15 @@ class MedicalRelease < ApplicationRecord
   def contract_file_name
     "#{project.name.parameterize}_#{contract_template.release_type}_#{(signed_at || created_at).strftime("%Y.%m.%d")}_#{release_number}_#{filename_suffix.parameterize}"
   end
+
+  private
+
+  def valid_answers
+    (1..ContractTemplate::NUMBER_OF_CUSTOM_FIELDS).each do |index|
+      if contract_template && contract_template["question_#{index}_text"].present? &&
+         public_send("question_#{index}_answer").blank?
+        errors.add("question_#{index}", I18n.t('medical_releases.custom_validation_errors.question_answer_is_required'))
+      end
+    end
+  end
 end

app/models/misc_release.rb

@@ -9,6 +9,14 @@ class MiscRelease < ApplicationRecord
   include PersonName
   include GuardianName
   include GuardianPhotoable
+  include CsvExportable
+  include Approvable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name contact_info]
+    end
+  end
 
   NUMBER_OF_CUSTOM_FIELDS = 15
 

app/models/music_release.rb

@@ -7,7 +7,15 @@ class MusicRelease < ApplicationRecord
   include Searchable
   include Taggable
   include PersonName
-  
+  include CsvExportable
+  include Approvable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name file_infos_count composers_count publishers_count]
+    end
+  end
+
   has_many :file_infos, as: :releasable, dependent: :destroy
   has_many :composers, dependent: :destroy
   has_many :publishers, dependent: :destroy
@@ -72,6 +80,18 @@ class MusicRelease < ApplicationRecord
     false
   end
 
+  def file_infos_count
+    file_infos.size
+  end
+
+  def composers_count
+    composers.size
+  end
+
+  def publishers_count
+    publishers.size
+  end
+
   private
 
   def publisher_percentages_add_up_to_100

app/models/qr_code.rb

@@ -10,7 +10,19 @@ class QrCode
     url       = Rails.application.routes.url_helpers.url_for(route)
     filename  = [contract_template.project.name, contract_template.name].map(&:parameterize).join("_")
 
-    new(url, filename)
+    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")

app/models/talent_release.rb

@@ -14,6 +14,14 @@ class TalentRelease < ApplicationRecord
   include SecondGuardianPhotoable
   include GuardianName
   include SecondGuardianName
+  include CsvExportable
+  include Approvable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name phone email]
+    end
+  end
 
   composed_of :person_address, 
               class_name: "Address",
@@ -86,6 +94,14 @@ class TalentRelease < ApplicationRecord
     person_name
   end
 
+  def phone
+    person_phone
+  end
+
+  def email
+    person_email
+  end
+
   def filename_suffix
     "#{person_last_name} #{person_first_name}"
   end
@@ -95,7 +111,7 @@ class TalentRelease < ApplicationRecord
   end
 
   def uses_edl?
-    false
+    true
   end
 
   def second_guardian_present?

app/models/task_request.rb

@@ -6,5 +6,5 @@ class TaskRequest < ApplicationRecord
 
   scope :order_by_recent, -> { order(created_at: :desc) }
 
-  validates :time_allowed, numericality: { only_integer: true, greater_than_or_equal_to: 2 }
+  validates :time_allowed, numericality: { only_integer: true, greater_than_or_equal_to: 2 }, allow_blank: true
 end

app/policies/acquired_media_release_policy.rb

@@ -30,4 +30,12 @@ class AcquiredMediaReleasePolicy < ApplicationPolicy
   def download_multiple?
     true
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end

app/policies/appearance_release_policy.rb

@@ -26,4 +26,12 @@ class AppearanceReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end

app/policies/broadcast_policy.rb

@@ -18,4 +18,12 @@ class BroadcastPolicy < ApplicationPolicy
   def update?
     true
   end
+
+  def destroy_file?
+    if user.nil? || user.user.nil?
+      return false
+    end
+
+    user.manager? || user.account_manager?
+  end
 end

app/policies/contract_template_policy.rb

@@ -3,8 +3,10 @@ class ContractTemplatePolicy < ApplicationPolicy
     def resolve
       if user.account_manager?
         scope.left_outer_joins(:project).where(projects: {account: user.account})
-      else
+      elsif user.manager?
         scope.left_outer_joins(project: :project_memberships).where(project_memberships: { user_id: user.id })
+      else
+        scope.public_template.left_outer_joins(project: :project_memberships).where(project_memberships: { user_id: user.id })
       end
     end
   end
@@ -21,6 +23,18 @@ 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

app/policies/location_release_policy.rb

@@ -34,4 +34,16 @@ 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

app/policies/material_release_policy.rb

@@ -34,4 +34,12 @@ class MaterialReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end

app/policies/medical_release_policy.rb

@@ -15,6 +15,14 @@ class MedicalReleasePolicy < ReleasePolicy
     user.manager? || user.account_manager?
   end
 
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
+
   def edit_photos?
     true
   end

app/policies/misc_release_policy.rb

@@ -38,4 +38,12 @@ class MiscReleasePolicy < ReleasePolicy
   def download_multiple?
     download_single?
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end

app/policies/music_release_policy.rb

@@ -22,4 +22,12 @@ class MusicReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end

app/policies/talent_release_policy.rb

@@ -34,4 +34,12 @@ class TalentReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end

app/views/acquired_media_releases/_acquired_media_release.html.erb

@@ -1,5 +1,13 @@
 <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>
@@ -35,6 +43,9 @@
         <% 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 %>

app/views/acquired_media_releases/_form.html.erb

@@ -1,6 +1,10 @@
 <%= errors_summary_for acquired_media_release %>
 <%= bootstrap_form_with model: model, local: true do |form| %>
   <%= field_set_tag content_tag(:span, t(".acquired_media_details.heading"), class: "h6 text-muted text-uppercase") do %>
+    <%= form.form_group :minor do %>
+      <%= form.check_box :minor, label: t("helpers.label.talent_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+    <% end %>
+
     <div class="form-row">
       <%= form.text_field :name, required: true, wrapper_class: "col-12" %>
     </div>
@@ -9,6 +13,28 @@
         <%= form.check_box :categories, { multiple: true, label: category }, category, false %>
       <% end %>
     <% end %>
+
+    <div class="<%= class_string("collapse" => !acquired_media_release.minor?) %>" data-ujs-target="guardian-fields">
+      <%= card_field_set_tag t(".guardian_info.heading") do %>
+        <div class="form-row">
+          <%= form.text_field :guardian_first_name, required: acquired_media_release.minor?, wrapper_class: "col-sm-3" %>
+          <%= form.text_field :guardian_last_name, required: acquired_media_release.minor?, wrapper_class: "col-sm-3" %>
+          <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %>
+          <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %>
+        </div>
+        <%= render "shared/address_fields", form: form, subject: "guardian" %>
+      <% end %>
+
+      <%= card_field_set_tag t(".guardian_2_info.heading") do %>
+        <div class="form-row">
+          <%= form.text_field :guardian_2_first_name, wrapper_class: "col-sm-3" %>
+          <%= form.text_field :guardian_2_last_name, wrapper_class: "col-sm-3" %>
+          <%= form.phone_field :guardian_2_phone, wrapper_class: "col-sm-6" %>
+          <%= form.text_field :guardian_2_email, wrapper_class: "col-sm-6" %>
+        </div>
+        <%= render "shared/address_fields", form: form, subject: "guardian_2" %>
+      <% end %>
+    </div>
   <% end %>
 
   <hr>
@@ -19,6 +45,44 @@
       <strong>For optimal accuracy, please ensure video file names and photo file names match the source file name in the editing sequence.</strong>
     </div>
     <%= render "shared/file_infos_dropzone", form: form, releasable: acquired_media_release %>
+
+    <div class="<%= class_string("collapse" => !acquired_media_release.minor?) %>" data-ujs-target="guardian-fields">
+      <br>
+      <div class="text-left">
+        <p><%= t(".photos.guardian_photo.heading") %></p>
+        <div id="guardian-photo-preview" class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-photo-input]">
+          <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+            <span>No photo yet</span>
+          </div>
+        </div>
+        <% if acquired_media_release.guardian_photo.attached? %>
+          <%= javascript_tag nonce: true do %>
+            App.PhotoPreview.set("#guardian-photo-preview", "<%= url_for(acquired_media_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>");
+          <% end %>
+        <% end %>
+        <div class="d-inline-block">
+          <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if acquired_media_release.guardian_photo.attached?%>
+          <%= form.file_field :guardian_photo, hide_label: true, data: { ujs_target: "guardian-photo-input" }, help: "PNG or JPG only", accept: acquired_media_release.class.face_photo_acceptable_content_types.join(",") %>
+        </div>
+
+        <p><%= t(".photos.guardian_2_photo.heading") %></p>
+        <div id="guardian-2-photo-preview" class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-2-photo-input]">
+          <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+            <span>No photo yet</span>
+          </div>
+        </div>
+        <% if acquired_media_release.guardian_2_photo.attached? %>
+          <%= javascript_tag nonce: true do %>
+            App.PhotoPreview.set("#guardian-2-photo-preview", "<%= url_for(acquired_media_release.guardian_2_photo.variant(auto_orient: true, resize: '200x200')) %>");
+          <% end %>
+        <% end %>
+        <div class="d-inline-block">
+          <%= form.hidden_field :guardian_2_photo, value: form.object.guardian_2_photo.signed_id if acquired_media_release.guardian_2_photo.attached?%>
+          <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, help: "PNG or JPG only", accept: acquired_media_release.class.face_photo_acceptable_content_types.join(",") %>
+        </div>
+      </div>
+      <hr>
+    </div>
   <% end %>
 
   <hr>

app/views/acquired_media_releases/index.html.erb

@@ -26,6 +26,7 @@
     <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>

app/views/appearance_releases/_appearance_release.html.erb

@@ -1,5 +1,13 @@
 <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) %>
@@ -39,6 +47,9 @@
         <% 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 %>

app/views/appearance_releases/index.html.erb

@@ -44,6 +44,7 @@
     <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>

app/views/approvals/new.html.erb

@@ -0,0 +1,15 @@
+<div class="card shadow-sm">
+  <%= card_header text: t(".heading", release_type: @releasable_param.name.titleize), close_action_path: [@project, "#{@releasable_param.name.pluralize}"] %>
+  <div class="card-body">
+    <embed class="embeded-contract-preview" type="application/pdf" src="<%= url_for [@releasable, :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| %>
+      <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" %>
+        <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>
+      </div>
+    <% end %>
+  </div>
+</div>

app/views/broadcasts/_broadcast.html.erb

@@ -3,6 +3,9 @@
   <td>
     <%= broadcast.name %>
   </td>
+  <td>
+    <%= broadcast.shoot_location_time_zone %>
+  </td>
   <td>
     <%= broadcast.status.titleize %>
   </td>

app/views/broadcasts/_file.html.erb

@@ -1,12 +1,25 @@
-<li class="my-2" id="<%= dom_id(file) %>">
-  <% if file.variable? %>
-    <%= link_to image_tag(file.variant(resize_and_pad: [300, 300, background: "#F7F8F9"]), class: "bg-light img-thumbnail img-fluid"), file, target: "_blank" %>
-  <% else %>
-    <div class="border rounded bg-light text-muted d-flex justify-content-center align-items-center fix-h-and-w">
-      <%= link_to file, target: "_blank" do %>
-        <%= fa_icon("file", style: "font-size: 2rem") %>
-        <div class="mt-2"><%= file.filename %></div>
+<div class="row">
+  <% broadcast = file.record %>
+  <% show_delete = controller.class.module_parent.to_s == "Public" ? false : policy(broadcast).destroy_file? %>
+  <% file_class = show_delete ? "col-8" : "col-12" %>
+  <div class="<%= file_class %>">
+    <li class="my-2" id="<%= dom_id(file) %>">
+      <% if file.variable? %>
+        <%= link_to image_tag(file.variant(resize_and_pad: [300, 300, background: "#F7F8F9"]), class: "bg-light img-thumbnail img-fluid"), file, target: "_blank" %>
+      <% else %>
+        <div class="border rounded bg-light text-muted d-flex justify-content-center align-items-center img-fluid fix-h-and-w">
+          <%= link_to file, target: "_blank" do %>
+            <%= fa_icon("file", style: "font-size: 2rem") %>
+            <div class="mt-2"><%= file.filename %></div>
+          <% end %>
+        </div>
       <% end %>
+    </li>
+  </div>
+  <% if show_delete %>
+    <div class="col-4 align-self-center p-0 m-0">
+      <% url = url_for [:destroy_file, broadcast.project, broadcast, { file_id: file.id }] %>
+      <%= link_to fa_icon("trash fw", text: t('.actions.delete_file')), url, class: "btn btn-danger", remote: true, method: :delete, data: { confirm: t('.confirm_delete') } %>
     </div>
   <% end %>
-</li>
+</div>

app/views/broadcasts/_form.html.erb

@@ -2,6 +2,7 @@
 
 <%= 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" %>

app/views/broadcasts/_video.html.erb

@@ -1,7 +1,7 @@
 <% if broadcast.streamer_recording? && broadcast.active? %>
-  <div id="broadcast_video" class="embed-responsive-item"></div>
+  <div id="broadcast_video" class="embed-responsive-item" data-video-type="stream"></div>
 <% else %>
-  <div id="broadcast_video" class="embed-responsive-item">
+  <div id="broadcast_video" class="embed-responsive-item" data-video-type="stream">
     <table class="w-100 h-100 bg-secondary">
       <tbody>
         <tr>

app/views/broadcasts/index.html.erb

@@ -22,6 +22,7 @@
       <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>
@@ -32,7 +33,7 @@
         <%= render @broadcasts %>
       <% else %>
         <tr>
-          <td colspan="5" class="py-4 text-center text-muted"><%= t(".empty") %></td>
+          <td colspan="6" class="py-4 text-center text-muted"><%= t(".empty") %></td>
         </tr>
       <% end %>
     </tbody>

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), "#", class: "dropdown-item active" %>
+              <%= link_to fa_icon("check", text: @broadcast.name.titleize), "#", data: { behavior: "play_stream"}, class: "dropdown-item active" %>
               <% @multi_view_broadcasts.each do |broadcast| %>
                 <% if broadcast.id != @broadcast.id %>
-                  <%= link_to broadcast.name.titleize, broadcast.url, class: class_string("dropdown-item", "active" => @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) %>
                 <% end %>
               <% end %>
               <h5 class="dropdown-header">Previous Sessions</h5>
@@ -102,6 +102,7 @@
                         <i class="fa fa-clipboard"></i>
                         Copy URL
                       </button>
+                      <%= link_to t('.actions.reset_url'), [@project, @broadcast], method: :patch, class: "btn btn-danger" %>
                     </div>
                   <% else %>
                     <input type="text" class="form-control" value="<%= broadcast_url(@broadcast.token) %>" readonly>
@@ -110,6 +111,7 @@
                         <i class="fa fa-clipboard"></i>
                         Copy URL
                       </button>
+                      <%= link_to t('.actions.reset_url'), [@project, @broadcast], method: :patch, class: "btn btn-danger" %>
                     </div>
                   <% end %>
                 </div>

app/views/broadcasts/splash.html.erb

@@ -18,15 +18,7 @@
       <div class="card-body p-0">
         <div class="embed-responsive embed-responsive-16by9">
           <div class="embed-responsive-item">
-            <table class="w-100 h-100 bg-secondary">
-              <tbody>
-              <tr>
-                <td class="text-center align-middle text-white">
-                  Video tutorial will be available soon
-                </td>
-              </tr>
-              </tbody>
-            </table>
+            <div style="padding:56.25% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/435943632" style="position:absolute;top:0;left:0;width:100%;height:100%;" frameborder="0" allow="autoplay; fullscreen" allowfullscreen></iframe></div><script src="https://player.vimeo.com/api/player.js"></script>
           </div>
         </div>
       </div>

app/views/contract_templates/_contract_template.html.erb

@@ -1,4 +1,5 @@
 <tr>
+  <td data-behavior="select_contract_template"><%= check_box_tag "contract_template_ids[]", contract_template.id, false %></td>
   <td>
     <%= contract_template.name %>
   </td>
@@ -15,10 +16,16 @@
   <td>
     <%= contract_template.releases.size %>
   </td>
-  <td class="text-right">
+  <td class="text-right" nowrap>
     <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 %>
@@ -27,7 +34,7 @@
           <%= link_to fa_icon("print", text: "Print"), [:new, contract_template, :blank_contracts], class: "dropdown-item", target: :_blank %>
         <% end %>
         <% if policy(contract_template).destroy? %>
-          <%= link_to fa_icon("archive", text: "Archive"), contract_template, class: "dropdown-item", method: :delete, data: { confirm: "Are you sure?" } %>
+          <%= link_to fa_icon("trash", text: "Delete"), contract_template, class: "dropdown-item", method: :delete, data: { confirm: "Are you sure?" } %>
         <% end %>
       </div>
     </div>

app/views/contract_templates/_form.html.erb

@@ -1,8 +1,12 @@
-<%= bootstrap_form_with model: [project, contract_template], local: true do |form| %>
+<%= bootstrap_form_with model: model, 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) } }, 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(acquired_media appearance talent material 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" %>
+    </div>
+    <div class="form-row mb-3">
+      <%= form.radio_button :accessibility, :public_template, label: "Public", wrapper_class: "mr-3" %>
+      <%= form.radio_button :accessibility, :private_template, label: "Private" %>
     </div>
     <div class="form-row" id="fee_field">
       <%= form.number_field :fee, min:"0", max:"99999999", step: "0.01", prepend: "$", wrapper_class: "col-sm-6" %>
@@ -25,6 +29,16 @@
         <%= 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 %>
+      <% end %>
+    </div>
   <% end %>
 
   <%= field_set_tag content_tag(:span, t(".custom_fields.heading"), class: "h6 text-muted text-uppercase"), id: "custom_fields", style: "display: none;" do %>

app/views/contract_templates/edit.html.erb

@@ -0,0 +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: @contract_template, project: @project, contract_template: @contract_template %>
+  </div>
+</div>

app/views/contract_templates/index.html.erb

@@ -5,12 +5,14 @@
     <%= 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>

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", project: @project, contract_template: @contract_template %>
+    <%= render "form", model: [@project, @contract_template], project: @project, contract_template: @contract_template %>
   </div>
 </div>

app/views/contract_templates/splash.html.erb

@@ -6,7 +6,8 @@
 
   <%= link_to t(".actions.book_demo"), 'https://meetings.hubspot.com/bray2', class: "btn btn-primary border align-self-center h-50 ml-auto mr-2 pb-2", target: '_blank' %>
   <% if policy(ContractTemplate).new? %>
-    <%= link_to t(".actions.create_template"), [:new, @project, :contract_template], class: "btn btn-success border align-self-center h-50 pb-2" %>
+    <%= link_to t(".actions.create_template"), [:new, @project, :contract_template], class: "btn btn-success border align-self-center h-50 mr-2 pb-2" %>
+    <%= link_to t(".actions.import_template"), [:new, @project, :release_template_imports], class: "btn btn-light border align-self-center h-50 pb-2" %>
 <% end %>
 </div>
 
@@ -18,15 +19,7 @@
       <div class="card-body p-0">
         <div class="embed-responsive embed-responsive-16by9">
           <div class="embed-responsive-item">
-            <table class="w-100 h-100 bg-secondary">
-              <tbody>
-              <tr>
-                <td class="text-center align-middle text-white">
-                  Video tutorial will be available soon
-                </td>
-              </tr>
-              </tbody>
-            </table>
+            <div style="padding:56.25% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/435942851" style="position:absolute;top:0;left:0;width:100%;height:100%;" frameborder="0" allow="autoplay; fullscreen" allowfullscreen></iframe></div><script src="https://player.vimeo.com/api/player.js"></script>
           </div>
         </div>
       </div>
@@ -55,4 +48,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

app/views/contracts/_amendment_page.html.erb

@@ -0,0 +1,19 @@
+<% 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>

app/views/contracts/_for_office_use_only.erb

@@ -0,0 +1,13 @@
+<% if preview %>
+  <h1>PREVIEW ONLY</h1>
+<% end %>
+
+<p class="heading"><strong><u><%= t '.heading' %></u></strong></p>
+
+<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.issued_by'), releasable.approved_by_user_name %>
+  <%= description_list_pair t('.description_labels.date_issued'), releasable.approved_at %>
+</dl>

app/views/contracts/_signature_page.html.erb

@@ -18,10 +18,14 @@
     <% end %>
     </dd>
   <% end %>
-  <%= description_list_pair_for releasable, :name, append: ":" %>
-  <%= description_list_pair "Contact Address:", releasable.contact_person.address %>
-  <%= description_list_pair "Contact Phone:", releasable.contact_person.phone %>
-  <%= description_list_pair "Contact Email:", releasable.contact_person.email %>
+  <%= description_list_pair t(".labels.#{releasable.model_name.param_key}.name", default: "Name"), releasable.name, append: ":" %>
+  <% if releasable.model_name == "LocationRelease" %>
+    <%= description_list_pair "Location Address:", releasable.address %>
+    <%= description_list_pair "Owner Name", releasable.person_name, append: ":" %>
+  <% end %>
+  <%= description_list_pair t(".labels.#{releasable.model_name.param_key}.contact_person_address", default: "Contact Address"), releasable.contact_person.address, append: ":" %>
+  <%= description_list_pair t(".labels.#{releasable.model_name.param_key}.contact_person_phone", default: "Contact Phone"), releasable.contact_person.phone, append: ":" %>
+  <%= description_list_pair t(".labels.#{releasable.model_name.param_key}.contact_person_email", default: "Contact Email"), releasable.contact_person.email, append: ":" %>
   <% if releasable.model_name == "AppearanceRelease" %>
     <%= description_list_pair "Person Date of Birth:", releasable&.person_date_of_birth&.strftime("%D") %>
   <% end %>

app/views/contracts/pdf.html.erb

@@ -25,6 +25,19 @@
 <div class="page">
   <%= 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? %>
+  <div class="page">
+    <%= render "contracts/for_office_use_only", releasable: releasable, preview: preview %>
+  </div>
+<% end %>
+
 <% if releasable.class == AcquiredMediaRelease %>
   <div class="page">
     <%= render "contracts/files", release: releasable, preview: preview %>

app/views/directories/_file_form.html.erb

@@ -3,6 +3,6 @@
     <%= render "shared/files_dropzone_fields", form: form, directory: directory %>
   <% end %>
   <div class="pt-3">
-    <%= form.submit t(".submit"), class: "btn btn-block btn-success", data: { disable_with: t("shared.disable_with") } %>
+    <%= form.submit t(".submit"), id: "upload_directory_files", class: "btn btn-block btn-success", data: { disable_with: t("shared.disable_with") } %>
   </div>
 <% end %>

app/views/location_releases/_location_release.html.erb

@@ -1,5 +1,13 @@
 <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" %>
@@ -22,6 +30,17 @@
     <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">
@@ -36,9 +55,15 @@
         <% 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 %>

app/views/location_releases/index.html.erb

@@ -26,13 +26,14 @@
     <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.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><%= t(".table_headers.signed_at") %></th>
+        <th><%= t(".table_headers.amendment_signed") %></th>
         <th></th>
       </tr>
     </thead>

app/views/material_releases/_form.html.erb

@@ -12,6 +12,9 @@
   <hr>
 
   <%= field_set_tag content_tag(:span, t(".signer_details.heading"), class: "h6 text-muted text-uppercase") do %>
+    <%= form.form_group :minor do %>
+      <%= form.check_box :minor, label: t("helpers.label.material_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+    <% end %>
     <div class="form-row">
       <%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %>
       <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %>
@@ -21,6 +24,28 @@
       <%= form.text_field :person_title, wrapper_class: "col-sm-6" %>
     </div>
     <%= render "shared/address_fields", form: form, subject: "person" %>
+
+    <div class="<%= class_string("collapse" => !material_release.minor?) %>" data-ujs-target="guardian-fields">
+      <%= card_field_set_tag t(".guardian_info.heading") do %>
+        <div class="form-row">
+          <%= form.text_field :guardian_first_name, required: material_release.minor?, wrapper_class: "col-sm-3" %>
+          <%= form.text_field :guardian_last_name, required: material_release.minor?, wrapper_class: "col-sm-3" %>
+          <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %>
+          <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %>
+        </div>
+        <%= render "shared/address_fields", form: form, subject: "guardian" %>
+      <% end %>
+
+      <%= card_field_set_tag t(".guardian_2_info.heading") do %>
+        <div class="form-row">
+          <%= form.text_field :guardian_2_first_name, wrapper_class: "col-sm-3" %>
+          <%= form.text_field :guardian_2_last_name, wrapper_class: "col-sm-3" %>
+          <%= form.phone_field :guardian_2_phone, wrapper_class: "col-sm-6" %>
+          <%= form.text_field :guardian_2_email, wrapper_class: "col-sm-6" %>
+        </div>
+        <%= render "shared/address_fields", form: form, subject: "guardian_2" %>
+      <% end %>
+    </div>
   <% end %>
 
   <hr>
@@ -34,6 +59,44 @@
 
   <%= field_set_tag content_tag(:span, t(".photos.heading"), class: "h6 text-muted text-uppercase") do %>
     <%= render "shared/photos_dropzone_fields", form: form, release: material_release %>
+
+    <div class="<%= class_string("collapse" => !material_release.minor?) %>" data-ujs-target="guardian-fields">
+      <br>
+      <div class="text-left">
+        <p><%= t(".photos.guardian_photo.heading") %></p>
+        <div id="guardian-photo-preview" class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-photo-input]">
+          <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+            <span>No photo yet</span>
+          </div>
+        </div>
+        <% if material_release.guardian_photo.attached? %>
+          <%= javascript_tag nonce: true do %>
+            App.PhotoPreview.set("#guardian-photo-preview", "<%= url_for(material_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>");
+          <% end %>
+        <% end %>
+        <div class="d-inline-block">
+          <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if material_release.guardian_photo.attached?%>
+          <%= form.file_field :guardian_photo, hide_label: true, data: { ujs_target: "guardian-photo-input" }, help: "PNG or JPG only", accept: material_release.class.face_photo_acceptable_content_types.join(",") %>
+        </div>
+
+        <p><%= t(".photos.guardian_2_photo.heading") %></p>
+        <div id="guardian-2-photo-preview" class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-2-photo-input]">
+          <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+            <span>No photo yet</span>
+          </div>
+        </div>
+        <% if material_release.guardian_2_photo.attached? %>
+          <%= javascript_tag nonce: true do %>
+            App.PhotoPreview.set("#guardian-2-photo-preview", "<%= url_for(material_release.guardian_2_photo.variant(auto_orient: true, resize: '200x200')) %>");
+          <% end %>
+        <% end %>
+        <div class="d-inline-block">
+          <%= form.hidden_field :guardian_2_photo, value: form.object.guardian_2_photo.signed_id if material_release.guardian_2_photo.attached?%>
+          <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, help: "PNG or JPG only", accept: material_release.class.face_photo_acceptable_content_types.join(",") %>
+        </div>
+      </div>
+      <hr>
+    </div>
   <% end %>
 
   <div class="row align-items-center text-center mt-4">

app/views/material_releases/_material_release.html.erb

@@ -1,5 +1,13 @@
 <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" %>
@@ -36,6 +44,9 @@
         <% 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 %>

app/views/material_releases/index.html.erb

@@ -26,6 +26,7 @@
     <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>

app/views/medical_releases/_medical_release.html.erb

@@ -1,5 +1,13 @@
 <tr id="<%= dom_id(medical_release) %>">
   <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) %>
+      <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>
+    <% end %>
+  </td>
   <td>
     <% if medical_release.photo.attached? %>
       <%= image_tag medium_variant(medical_release.photo), class: "img-fluid" %>
@@ -37,6 +45,9 @@
         <% if policy(medical_release.tags).new? %>
           <%= link_to fa_icon("tags fw", text: "Tags"), [:new, medical_release, :acts_as_taggable_on_tag], class: "dropdown-item", remote: true %>
         <% end %>
+        <% if policy(MedicalRelease).review? %>
+          <%= link_to fa_icon("search fw", text: t('.actions.review')), new_medical_release_approvals_path(medical_release), class: "dropdown-item" %>
+        <% end %>
         <% if policy(MedicalRelease).download_single? && policy(Contract).show? && (medical_release.contract.attached? || medical_release.contract_template.present?) %>
           <%= link_to fa_icon("download fw", text: "Download"), [medical_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>
         <% end %>

app/views/medical_releases/index.html.erb

@@ -22,6 +22,7 @@
     <thead class="thead-light">
       <tr>
         <th data-behavior="all-selectable"><%= check_box_tag "medical_release_ids[]", false, false %></th>
+        <th><%= t '.table_headers.approved'%></th>
         <th></th>
         <th><%= MedicalRelease.human_attribute_name(:person_name) %></th>
         <th><%= MedicalRelease.human_attribute_name(:contact_info) %></th>

app/views/medical_releases/review.html.erb

@@ -0,0 +1,15 @@
+<div class="card shadow-sm">
+  <%= 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 [@medical_release, :contracts, format: "pdf"] %>" width="90%" height="1200" />
+
+    <%= bootstrap_form_with model: @medical_release, method: :patch, url: [:approve, @medical_release], local: true do |form| %>
+      <div class="row align-items-center text-center mt-4">
+        <%= 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>
+      </div>
+    <% end %>
+  </div>
+</div>

app/views/misc_releases/_misc_release.html.erb

@@ -1,5 +1,13 @@
 <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" %>
@@ -36,6 +44,9 @@
         <% 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 %>

app/views/misc_releases/index.html.erb

@@ -22,6 +22,7 @@
     <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>

app/views/music_releases/_music_release.html.erb

@@ -1,5 +1,13 @@
 <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>
@@ -36,6 +44,9 @@
         <% 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 %>

app/views/music_releases/index.html.erb

@@ -25,6 +25,7 @@
     <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>

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

@@ -13,6 +13,17 @@
 
       <hr>
 
+      <% unless @contract_template.guardian_clause.blank? %>
+        <%= form.form_group :minor do %>
+          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+        <% end %>
+
+        <%= card_field_set_tag t(".guardian_clause.heading") do %>
+          <p><%= @contract_template.guardian_clause %></p>
+        <% end %>
+        <hr>
+      <% end %>
+
       <%= card_field_set_tag t(".acquired_media_info.heading") do %>
         <div class="form-row">
           <%= form.text_field :name, required: true, wrapper_class: "col-12" %>
@@ -49,8 +60,93 @@
 
       <hr>
 
+      <% unless @contract_template.guardian_clause.blank? %>
+        <div class="<%= class_string("collapse" => !@acquired_media_release.minor?) %>" data-ujs-target="guardian-fields">
+          <%= card_field_set_tag t(".guardian_info.heading") do %>
+            <div class="form-row">
+              <%= form.text_field :guardian_first_name, required: @acquired_media_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_last_name, required: @acquired_media_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.phone_field :guardian_phone, required: @acquired_media_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_email, required: @acquired_media_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+            </div>
+            <%= render "shared/address_fields", form: form, subject: "guardian", required: @acquired_media_release.minor?, data: { required_tag: "guardian" } %>
+          <% end %>
+
+          <hr>
+
+          <%= card_field_set_tag t(".guardian_photo.heading") do %>
+            <div class="alert alert-warning font-weight-bold"><%= t ".guardian_photo.instructions" %></div>
+            <div class="text-center">
+              <div class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-photo-input]">
+                <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+                  <span><%= t ".photo.no_photo" %></span>
+                </div>
+              </div>
+              <div class="d-inline-block text-left">
+                <% if @acquired_media_release.guardian_photo.attached? %>
+                  <%= javascript_tag nonce: true do %>
+                    App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(@acquired_media_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>");
+                  <% end %>
+                <% end %>
+                <div class="hidden-file-input">
+                  <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if @acquired_media_release.guardian_photo.attached? %>
+                  <%= form.file_field :guardian_photo, required: @acquired_media_release.minor?, hide_label: true, data: { ujs_target: "guardian-photo-input" }, accept: @acquired_media_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %>
+                </div>
+                <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "trigger-click", target: "[data-ujs-target=guardian-photo-input]" } %>
+              </div>
+              <p class="p-2 font-weight-bold">
+                <small class="text-muted"><%= t ".photo.warning" %></small>
+              </p>
+            </div>
+          <% end %>
+
+          <hr>
+
+          <%= card_field_set_tag t(".guardian_2_info.heading") do %>
+            <div class="form-row">
+              <%= form.text_field :guardian_2_first_name, wrapper_class: "col-sm-3" %>
+              <%= form.text_field :guardian_2_last_name, wrapper_class: "col-sm-3" %>
+              <%= form.phone_field :guardian_2_phone, wrapper_class: "col-sm-6" %>
+              <%= form.text_field :guardian_2_email, wrapper_class: "col-sm-6" %>
+            </div>
+            <%= render "shared/address_fields", form: form, subject: "guardian_2" %>
+          <% end %>
+
+          <hr>
+
+          <%= card_field_set_tag t(".guardian_2_photo.heading") do %>
+            <div class="alert alert-warning font-weight-bold"><%= t ".guardian_2_photo.instructions" %></div>
+            <div class="text-center">
+              <div class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-2-photo-input]">
+                <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+                  <span><%= t ".photo.no_photo" %></span>
+                </div>
+              </div>
+              <div class="d-inline-block text-left">
+                <% if @acquired_media_release.guardian_2_photo.attached? %>
+                  <%= javascript_tag nonce: true do %>
+                    App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(@acquired_media_release.guardian_2_photo.variant(auto_orient: true, resize: '200x200')) %>");
+                  <% end %>
+                <% end %>
+                <div class="hidden-file-input">
+                  <%= form.hidden_field :guardian_2_photo, value: form.object.guardian_2_photo.signed_id if @acquired_media_release.guardian_2_photo.attached? %>
+                  <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, accept: @acquired_media_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %>
+                </div>
+                <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "trigger-click", target: "[data-ujs-target=guardian-2-photo-input]" } %>
+              </div>
+              <p class="p-2 font-weight-bold">
+                <small class="text-muted"><%= t ".photo.warning" %></small>
+              </p>
+            </div>
+          <% end %>
+
+          <hr>
+
+        </div>
+      <% end %>
+
       <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form %>
+        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
       <% end %>
 
       <div class="mt-5">

app/views/public/amendments/create.html.erb

@@ -0,0 +1,3 @@
+<% 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>

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

@@ -0,0 +1,30 @@
+<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>

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

@@ -16,7 +16,7 @@
 
       <% unless @contract_template.guardian_clause.blank? %>
         <%= form.form_group :minor do %>
-          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
         <% end %>
 
         <%= card_field_set_tag t(".guardian_clause.heading") do %>
@@ -72,12 +72,12 @@
         <div class="<%= class_string("collapse" => !@appearance_release.minor?) %>" data-ujs-target="guardian-fields">
           <%= card_field_set_tag t(".guardian_info.heading") do %>
             <div class="form-row">
-              <%= form.text_field :guardian_first_name, required: @appearance_release.minor?, wrapper_class: "col-sm-3" %>
-              <%= form.text_field :guardian_last_name, required: @appearance_release.minor?, wrapper_class: "col-sm-3" %>
-              <%= form.phone_field :guardian_phone, required: @appearance_release.minor?, wrapper_class: "col-sm-6" %>
-              <%= form.text_field :guardian_email, required: @appearance_release.minor?, wrapper_class: "col-sm-6" %>
+              <%= form.text_field :guardian_first_name, required: @appearance_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_last_name, required: @appearance_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.phone_field :guardian_phone, required: @appearance_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_email, required: @appearance_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
             </div>
-            <%= render "shared/address_fields", form: form, subject: "guardian", required: @appearance_release.minor? %>
+            <%= render "shared/address_fields", form: form, subject: "guardian", required: @appearance_release.minor?, data: { required_tag: "guardian" } %>
           <% end %>
 
           <hr>
@@ -156,7 +156,7 @@
       <% end %>
 
       <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form %>
+        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
       <% end %>
 
       <div class="mt-5">

app/views/public/contract_templates/_contract_template.html.erb

@@ -0,0 +1,8 @@
+<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>

app/views/public/contract_templates/index.html.erb

@@ -0,0 +1,27 @@
+<% 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>

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

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

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

@@ -13,6 +13,17 @@
 
       <hr>
 
+      <% unless @contract_template.guardian_clause.blank? %>
+        <%= form.form_group :minor do %>
+          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+        <% end %>
+
+        <%= card_field_set_tag t(".guardian_clause.heading") do %>
+          <p><%= @contract_template.guardian_clause %></p>
+        <% end %>
+        <hr>
+      <% end %>
+
       <%= card_field_set_tag t(".release_info.heading") do %>
         <div class="form-row">
           <%= form.text_field :name, required: true, wrapper_class: "col-12" %>
@@ -40,8 +51,93 @@
 
       <hr>
 
+      <% unless @contract_template.guardian_clause.blank? %>
+        <div class="<%= class_string("collapse" => !@material_release.minor?) %>" data-ujs-target="guardian-fields">
+          <%= card_field_set_tag t(".guardian_info.heading") do %>
+            <div class="form-row">
+              <%= form.text_field :guardian_first_name, required: @material_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_last_name, required: @material_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.phone_field :guardian_phone, required: @material_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_email, required: @material_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+            </div>
+            <%= render "shared/address_fields", form: form, subject: "guardian", required: @material_release.minor?, data: { required_tag: "guardian" } %>
+          <% end %>
+
+          <hr>
+
+          <%= card_field_set_tag t(".guardian_photo.heading") do %>
+            <div class="alert alert-warning font-weight-bold"><%= t ".guardian_photo.instructions" %></div>
+            <div class="text-center">
+              <div class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-photo-input]">
+                <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+                  <span><%= t ".photo.no_photo" %></span>
+                </div>
+              </div>
+              <div class="d-inline-block text-left">
+                <% if @material_release.guardian_photo.attached? %>
+                  <%= javascript_tag nonce: true do %>
+                    App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(@material_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>");
+                  <% end %>
+                <% end %>
+                <div class="hidden-file-input">
+                  <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if @material_release.guardian_photo.attached? %>
+                  <%= form.file_field :guardian_photo, required: @material_release.minor?, hide_label: true, data: { ujs_target: "guardian-photo-input" }, accept: @material_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %>
+                </div>
+                <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "trigger-click", target: "[data-ujs-target=guardian-photo-input]" } %>
+              </div>
+              <p class="p-2 font-weight-bold">
+                <small class="text-muted"><%= t ".photo.warning" %></small>
+              </p>
+            </div>
+          <% end %>
+
+          <hr>
+
+          <%= card_field_set_tag t(".guardian_2_info.heading") do %>
+            <div class="form-row">
+              <%= form.text_field :guardian_2_first_name, wrapper_class: "col-sm-3" %>
+              <%= form.text_field :guardian_2_last_name, wrapper_class: "col-sm-3" %>
+              <%= form.phone_field :guardian_2_phone, wrapper_class: "col-sm-6" %>
+              <%= form.text_field :guardian_2_email, wrapper_class: "col-sm-6" %>
+            </div>
+            <%= render "shared/address_fields", form: form, subject: "guardian_2" %>
+          <% end %>
+
+          <hr>
+
+          <%= card_field_set_tag t(".guardian_2_photo.heading") do %>
+            <div class="alert alert-warning font-weight-bold"><%= t ".guardian_2_photo.instructions" %></div>
+            <div class="text-center">
+              <div class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-2-photo-input]">
+                <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+                  <span><%= t ".photo.no_photo" %></span>
+                </div>
+              </div>
+              <div class="d-inline-block text-left">
+                <% if @material_release.guardian_2_photo.attached? %>
+                  <%= javascript_tag nonce: true do %>
+                    App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(@material_release.guardian_2_photo.variant(auto_orient: true, resize: '200x200')) %>");
+                  <% end %>
+                <% end %>
+                <div class="hidden-file-input">
+                  <%= form.hidden_field :guardian_2_photo, value: form.object.guardian_2_photo.signed_id if @material_release.guardian_2_photo.attached? %>
+                  <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, accept: @material_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %>
+                </div>
+                <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "trigger-click", target: "[data-ujs-target=guardian-2-photo-input]" } %>
+              </div>
+              <p class="p-2 font-weight-bold">
+                <small class="text-muted"><%= t ".photo.warning" %></small>
+              </p>
+            </div>
+          <% end %>
+
+          <hr>
+
+        </div>
+      <% end %>
+
       <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, instruction: 'For Owner or Authorized Signatory' %>
+        <%= render "shared/signature_fields", form: form, instruction: 'For Owner or Authorized Signatory', signature_legal_text: @contract_template.signature_legal_text %>
       <% end %>
 
       <div class="mt-5">

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

@@ -16,7 +16,7 @@
 
       <% unless @contract_template.guardian_clause.blank? %>
         <%= form.form_group :minor do %>
-          <%= form.check_box :minor, label: t("helpers.label.medical_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+          <%= form.check_box :minor, label: t("helpers.label.medical_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
         <% end %>
 
         <%= card_field_set_tag t(".guardian_clause.heading") do %>
@@ -30,7 +30,7 @@
           <% (1..MedicalRelease::NUMBER_OF_CUSTOM_FIELDS).each do |n| %>
             <% if @contract_template.public_send("question_#{n}_text").present? %>
               <div class="form-row">
-                <%= form.text_area "question_#{n}_answer", wrapper_class: "col-sm-12", label: @contract_template.public_send("question_#{n}_text") %>
+                <%= form.text_area "question_#{n}_answer", required: true, wrapper_class: "col-sm-12", label: @contract_template.public_send("question_#{n}_text") %>
               </div>
             <% end %>
           <% end %>
@@ -59,14 +59,12 @@
         <div class="<%= class_string("collapse" => !@medical_release.minor?) %>" data-ujs-target="guardian-fields">
           <%= card_field_set_tag t(".guardian_info.heading") do %>
             <div class="form-row">
-              <%= form.text_field :guardian_first_name, required: @medical_release.minor?, wrapper_class: "col-sm-3" %>
-              <%= form.text_field :guardian_last_name, required: @medical_release.minor?, wrapper_class: "col-sm-3" %>
-              <%= form.phone_field :guardian_phone, required: @medical_release.minor?, wrapper_class: "col-sm-6" %>
+              <%= form.text_field :guardian_first_name, required: @medical_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_last_name, required: @medical_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.phone_field :guardian_phone, required: @medical_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_email, required: @medical_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
             </div>
-            <div class="form-row">
-              <%= form.text_field :guardian_email, required: @medical_release.minor?, wrapper_class: "col-sm-6" %>
-            </div>
-            <%= render "shared/address_fields", form: form, subject: "guardian", required: @medical_release.minor? %>
+            <%= render "shared/address_fields", form: form, subject: "guardian", required: @medical_release.minor?, data: { required_tag: "guardian" } %>
           <% end %>
 
           <hr>
@@ -147,7 +145,7 @@
       <% end %>
 
       <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form %>
+        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
       <% end %>
 
       <div class="mt-5">

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

@@ -11,7 +11,7 @@
 
       <% unless @contract_template.guardian_clause.blank? %>
         <%= form.form_group :minor do %>
-          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
         <% end %>
 
         <%= card_field_set_tag t(".guardian_clause.heading") do %>
@@ -39,9 +39,7 @@
           <%= form.text_field :person_first_name, required: true, wrapper_class: "col-sm-6" %>
           <%= form.text_field :person_last_name, required: true, wrapper_class: "col-sm-6" %>
           <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
-        </div>
-        <div class="form-row">
-          <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
+          <%= form.email_field :person_email, required: true, wrapper_class: "col-sm-6" %>
         </div>
         <%= render "shared/address_fields", form: form, subject: "person" %>
       <% end %>
@@ -56,14 +54,12 @@
         <div class="<%= class_string("collapse" => !@misc_release.minor?) %>" data-ujs-target="guardian-fields">
           <%= card_field_set_tag t(".guardian_info.heading") do %>
             <div class="form-row">
-              <%= form.text_field :guardian_first_name, required: @misc_release.minor?, wrapper_class: "col-sm-3" %>
-              <%= form.text_field :guardian_last_name, required: @misc_release.minor?, wrapper_class: "col-sm-3" %>
-              <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %>
+              <%= form.text_field :guardian_first_name, required: @misc_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_last_name, required: @misc_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_email, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
             </div>
-            <div class="form-row">
-              <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %>
-            </div>
-            <%= render "shared/address_fields", form: form, subject: "guardian" %>
+            <%= render "shared/address_fields", form: form, subject: "guardian", data: { required_tag: "guardian" } %>
           <% end %>
 
           <hr>
@@ -99,7 +95,7 @@
       <% end %>
 
       <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form %>
+        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
       <% end %>
 
       <div class="mt-5">

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

@@ -16,7 +16,7 @@
 
       <% unless @contract_template.guardian_clause.blank? %>
         <%= form.form_group :minor do %>
-          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
         <% end %>
 
         <%= card_field_set_tag t(".guardian_clause.heading") do %>
@@ -46,12 +46,12 @@
         <div class="<%= class_string("collapse" => !@talent_release.minor?) %>" data-ujs-target="guardian-fields">
           <%= card_field_set_tag t(".guardian_info.heading") do %>
             <div class="form-row">
-              <%= form.text_field :guardian_first_name, required: @talent_release.minor?, wrapper_class: "col-sm-3" %>
-              <%= form.text_field :guardian_last_name, required: @talent_release.minor?, wrapper_class: "col-sm-3" %>
-              <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %>
-              <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %>
+              <%= form.text_field :guardian_first_name, required: @talent_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_last_name, required: @talent_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_email, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
             </div>
-            <%= render "shared/address_fields", form: form, subject: "guardian" %>
+            <%= render "shared/address_fields", form: form, subject: "guardian", data: { required_tag: "guardian" } %>
           <% end %>
 
           <hr>
@@ -131,7 +131,7 @@
       <% end %>
 
       <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form %>
+        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
       <% end %>
 
       <div class="mt-5">

app/views/shared/_address_fields.html.erb

@@ -1,14 +1,15 @@
 <% field_name_prefix = subject.present? ? "#{subject}_" : "" %>
 <% required = required || false %>
+<% data = data || nil %>
 
 <div class="form-row">
-  <%= form.text_field "#{field_name_prefix}address_street1", required: required, wrapper_class: "col-sm-6" %>
+  <%= form.text_field "#{field_name_prefix}address_street1", required: required, wrapper_class: "col-sm-6", data: data %>
   <%= form.text_field "#{field_name_prefix}address_street2", wrapper_class: "col-sm-6" %>
 </div>
 <div class="form-row">
-  <%= form.text_field "#{field_name_prefix}address_city", required: required, wrapper_class: "col-sm-6" %>
-  <%= form.text_field "#{field_name_prefix}address_state", required: required, wrapper_class: "col-sm-3" %>
-  <%= form.text_field "#{field_name_prefix}address_zip", required: required, wrapper_class: "col-sm-3" %>
+  <%= form.text_field "#{field_name_prefix}address_city", required: required, wrapper_class: "col-sm-6", data: data %>
+  <%= form.text_field "#{field_name_prefix}address_state", required: required, wrapper_class: "col-sm-3", data: data %>
+  <%= form.text_field "#{field_name_prefix}address_zip", required: required, wrapper_class: "col-sm-3", data: data %>
 </div>
 <%= form.form_group "#{field_name_prefix}address_country" do %>
   <%= form.label "#{field_name_prefix}address_country" %>

app/views/shared/_signature_fields.html.erb

@@ -1,3 +1,4 @@
+<% 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] %>
@@ -6,10 +7,14 @@
   </small>
 <% end %>
 
-<%= form.hidden_field :signature_base64, data: { ujs_target: "signature-input" } %>
+<%= form.hidden_field signature_field, 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" %>
   <% end %>
 </div>
+<br>
 
+<% if local_assigns[:signature_legal_text] && signature_legal_text.present? %>
+  <div class="alert alert-warning font-weight-bold"><%= signature_legal_text %></div>
+<% end %>