diff --git a/config/locales/en.yml b/config/locales/en.yml index f4dc09b..89104db 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -511,6 +511,8 @@ en: person_last_name: Last name person_name: Name person_phone: Phone number + contract_template: + amendment_clause: Additional Contract Clause location_release: address_city: City address_country: Country @@ -842,7 +844,7 @@ en: empty: Location Releases will appear here table_headers: address: Address - amendment_signed: Amendment + amendment_signed: Additional Clause approved: Approved name: Location Name notes: Notes @@ -852,7 +854,7 @@ en: actions: manage: Manage review: Review - sign_amendment: Sign Amendment + sign_amendment: Sign Additional Clause messages: amendment_not_signed_tooltip: Amendment not yet signed amendment_signed_tooltip: Amendment Signed @@ -1134,7 +1136,7 @@ en: amendment_signed_message: Release amendment signed successfully! Thank you new: amendment: - heading: Amendment + heading: Additional Clause copy_url: Copy sign amendment URL signature: heading: Signature diff --git a/config/locales/es.yml b/config/locales/es.yml index 9e1f967..d13d797 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -285,6 +285,8 @@ es: person_email: Dirección de correo electrónico person_name: Nómbre person_phone: Número de teléfono + contract_template: + amendment_clause: Additional Contract Clause (ES) material_release: guardian_2_address_city: Guardian 2 city (ES) guardian_2_address_country: Guardian 2 country (ES) @@ -408,13 +410,13 @@ es: index: table_headers: address: Address (ES) - amendment_signed: Amendment (ES) + amendment_signed: Additional Clause (ES) notes: Notes (ES) signed_at: Date Signed (ES) tags: Tags (ES) location_release: actions: - sign_amendment: Sign Amendment (ES) + sign_amendment: Sign Additional Clause (ES) messages: amendment_not_signed_tooltip: Amendment not yet signed (ES) amendment_signed_tooltip: Amendment Signed (ES) @@ -500,7 +502,7 @@ es: amendment_signed_message: Release amendment signed successfully! Thank you (ES) new: amendment: - heading: Amendment + heading: Additional Clause (ES) copy_url: Copy sign amendment URL (ES) signature: heading: Signature (ES) diff --git a/db/structure.sql b/db/structure.sql index 7246f09..5e3e9ce 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -9,20 +9,6 @@ SET xmloption = content; SET client_min_messages = warning; SET row_security = off; --- --- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: - --- - -CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog; - - --- --- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: - --- - -COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language'; - - -- -- Name: fuzzystrmatch; Type: EXTENSION; Schema: -; Owner: - -- @@ -1475,6 +1461,7 @@ CREATE TABLE public.settings ( -- CREATE SEQUENCE public.settings_id_seq + AS integer START WITH 1 INCREMENT BY 1 NO MINVALUE @@ -1510,6 +1497,7 @@ CREATE TABLE public.taggings ( -- CREATE SEQUENCE public.taggings_id_seq + AS integer START WITH 1 INCREMENT BY 1 NO MINVALUE @@ -1540,6 +1528,7 @@ CREATE TABLE public.tags ( -- CREATE SEQUENCE public.tags_id_seq + AS integer START WITH 1 INCREMENT BY 1 NO MINVALUE diff --git a/spec/features/user_managing_location_releases_spec.rb b/spec/features/user_managing_location_releases_spec.rb index 3eb55de..1c4052b 100644 --- a/spec/features/user_managing_location_releases_spec.rb +++ b/spec/features/user_managing_location_releases_spec.rb @@ -87,7 +87,7 @@ feature "User managing location releases" do visit new_account_project_contract_template_location_release_amendment_path(project.account, project, contract_template, release) - expect(page).to have_content amendments_heading + expect(page).to have_content amendments_heading.upcase fill_in amendment_signer_name_field, with: 'Big Signer' draw_signature file_fixture("signature.png"), amendment_signature_field @@ -250,7 +250,7 @@ feature "User managing location releases" do new_window = window_opened_by { click_link sign_amendment_link } within_window new_window do - expect(page).to have_content amendments_heading + expect(page).to have_content amendments_heading.upcase fill_in amendment_signer_name_field, with: 'Big Signer' draw_signature file_fixture("signature.png"), amendment_signature_field