diff --git a/app/controllers/appearance_releases_controller.rb b/app/controllers/appearance_releases_controller.rb
index a05e958..2035e00 100644
--- a/app/controllers/appearance_releases_controller.rb
+++ b/app/controllers/appearance_releases_controller.rb
@@ -78,7 +78,7 @@ class AppearanceReleasesController < ApplicationController
end
def appearance_release_params
- params.require(:appearance_release).permit(:contract, :guardian_address, :guardian_first_name, :guardian_last_name, :guardian_phone, :guardian_photo, :guardian_email, :minor,
+ params.require(:appearance_release).permit(:contract, :guardian_address_old, :guardian_first_name, :guardian_last_name, :guardian_phone, :guardian_photo, :guardian_email, :minor,
:person_address, :person_first_name, :person_last_name, :person_phone, :person_email, :person_photo,
:applicable_medium_id, :applicable_medium_text,
:territory_id, :territory_text,
diff --git a/app/controllers/public/appearance_releases_controller.rb b/app/controllers/public/appearance_releases_controller.rb
index 4bd3d9f..499ab2a 100644
--- a/app/controllers/public/appearance_releases_controller.rb
+++ b/app/controllers/public/appearance_releases_controller.rb
@@ -39,9 +39,25 @@ class Public::AppearanceReleasesController < Public::BaseController
authorize appearance_releases.build(params)
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 appearance_release_params
params.require(:appearance_release).permit(:person_address, :person_first_name, :person_last_name, :person_phone, :person_email, :person_photo,
- :guardian_address, :guardian_first_name, :guardian_last_name, :guardian_phone, :guardian_email, :guardian_photo, :minor,
+ guardian_params, :minor,
:signature_base64, :person_date_of_birth,
:locale, :contract_template,)
end
diff --git a/app/models/appearance_release.rb b/app/models/appearance_release.rb
index 9a587c7..a3441c3 100644
--- a/app/models/appearance_release.rb
+++ b/app/models/appearance_release.rb
@@ -16,6 +16,18 @@ class AppearanceRelease < ApplicationRecord
has_one_attached :person_photo
+ 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]
+ ]
+
+
# These validations apply to all releases
validates :person_email, email: true, allow_blank: true
validates :person_first_name, :person_last_name, presence: true
@@ -73,6 +85,19 @@ class AppearanceRelease < ApplicationRecord
searchable_on %i[person_first_name person_last_name person_address person_email person_phone]
+ def guardian_address
+ return self.guardian_address_old if self.guardian_address_old.present?
+
+ Address.new(
+ self.guardian_address_street1,
+ self.guardian_address_street2,
+ self.guardian_address_city,
+ self.guardian_address_state,
+ self.guardian_address_zip,
+ self.guardian_address_country
+ ).to_s(format: :full)
+ end
+
# All releases must respond to the following messages
def name
person_name
diff --git a/app/views/appearance_releases/_form.html.erb b/app/views/appearance_releases/_form.html.erb
index 0f9d150..e8a0457 100644
--- a/app/views/appearance_releases/_form.html.erb
+++ b/app/views/appearance_releases/_form.html.erb
@@ -23,7 +23,7 @@
<%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %>
- <%= form.text_field :guardian_address, wrapper_class: "col-sm-6" %>
+ <%= form.text_field :guardian_address_old, wrapper_class: "col-sm-6" %>
<% end %>
diff --git a/app/views/public/appearance_releases/new.html.erb b/app/views/public/appearance_releases/new.html.erb
index a612e02..69c0603 100644
--- a/app/views/public/appearance_releases/new.html.erb
+++ b/app/views/public/appearance_releases/new.html.erb
@@ -79,9 +79,7 @@
<%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %>
-
- <%= form.text_field :guardian_address, wrapper_class: "col-sm-6" %>
-
+ <%= render "shared/address_fields", form: form, subject: "guardian" %>
<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7073de2..d716704 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -336,6 +336,13 @@ en:
person_last_name: Last name
person_name: Name
person_phone: Phone number
+ guardian_address_old: Guardian address
+ guardian_address_city: Guardian city
+ guardian_address_country: Guardian country
+ guardian_address_state: Guardian state
+ guardian_address_street1: Guardian address
+ guardian_address_street2: Guardian address (Line 2)
+ guardian_address_zip: Guardian zip code
location_release:
address_city: City
address_country: Country
diff --git a/config/locales/es.yml b/config/locales/es.yml
index be353f4..d1467a8 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -116,6 +116,7 @@ es:
label:
appearance_release:
guardian_address: Dirección del tutor legal
+ guardian_address_old: Dirección del tutor legal
guardian_name: Nómbre del tutor legal
guardian_phone: Número de teléfono del tutor legal
minor: El firmante es un menor
@@ -123,6 +124,12 @@ es:
person_email: Dirección de correo electrónico
person_name: Nómbre
person_phone: Número de teléfono
+ guardian_address_city: Guardian city (ES)
+ guardian_address_country: Guardian country (ES)
+ guardian_address_state: Guardian state (ES)
+ guardian_address_street1: Dirección del tutor legal
+ guardian_address_street2: Dirección del tutor legal (Línea 2)
+ guardian_address_zip: Guardian zip code (ES)
project:
client_name: Nómbre del cliente del proyecto
description: Descripción del proyecto
diff --git a/db/migrate/20200616124214_rename_appearance_release_guardian_address_column.rb b/db/migrate/20200616124214_rename_appearance_release_guardian_address_column.rb
new file mode 100644
index 0000000..4d14700
--- /dev/null
+++ b/db/migrate/20200616124214_rename_appearance_release_guardian_address_column.rb
@@ -0,0 +1,5 @@
+class RenameAppearanceReleaseGuardianAddressColumn < ActiveRecord::Migration[6.0]
+ def change
+ rename_column :appearance_releases, :guardian_address, :guardian_address_old
+ end
+end
diff --git a/db/migrate/20200616124401_add_guardian_address_components_to_appearance_releases.rb b/db/migrate/20200616124401_add_guardian_address_components_to_appearance_releases.rb
new file mode 100644
index 0000000..4e9a814
--- /dev/null
+++ b/db/migrate/20200616124401_add_guardian_address_components_to_appearance_releases.rb
@@ -0,0 +1,11 @@
+class AddGuardianAddressComponentsToAppearanceReleases < ActiveRecord::Migration[6.0]
+ def change
+ add_column :appearance_releases, :guardian_address_street1, :string
+ add_column :appearance_releases, :guardian_address_street2, :string
+ add_column :appearance_releases, :guardian_address_city, :string
+ add_column :appearance_releases, :guardian_address_state, :string
+ add_column :appearance_releases, :guardian_address_zip, :string
+ add_column :appearance_releases, :guardian_address_country, :string
+
+ end
+end
diff --git a/spec/controllers/public/appearance_releases_controller_spec.rb b/spec/controllers/public/appearance_releases_controller_spec.rb
index 3130922..a0f9a7e 100644
--- a/spec/controllers/public/appearance_releases_controller_spec.rb
+++ b/spec/controllers/public/appearance_releases_controller_spec.rb
@@ -120,7 +120,20 @@ describe Public::AppearanceReleasesController do
def minor_appearance_release_params(with_guardian_photo = true)
minor_type = with_guardian_photo ? :minor_with_guardian_photo : :minor
- attributes_for(:appearance_release, minor_type).merge(signature_param)
+ attributes_for(:appearance_release, minor_type)
+ .except(:guardian_address_old)
+ .merge(signature_param, guardian_address_params)
+ end
+
+ def guardian_address_params
+ {
+ guardian_address_street1: "St1",
+ guardian_address_street2: "St2",
+ guardian_address_city: "City",
+ guardian_address_state: "State",
+ guardian_address_zip: "ZIP",
+ guardian_address_country: "Country"
+ }
end
def signature_param
diff --git a/spec/factories/appearance_releases.rb b/spec/factories/appearance_releases.rb
index afcec4e..ffaffb8 100644
--- a/spec/factories/appearance_releases.rb
+++ b/spec/factories/appearance_releases.rb
@@ -31,7 +31,12 @@ FactoryBot.define do
minor true
guardian_first_name "Jamie"
guardian_last_name "Doe"
- guardian_address "100 Test Lane, New York, 10001"
+ guardian_address_street1 "St1"
+ guardian_address_street2 "St2"
+ guardian_address_city "City"
+ guardian_address_state "State"
+ guardian_address_zip "ZIP"
+ guardian_address_country "Country"
guardian_phone "123-555-1234"
guardian_email "guardian@galaxy.all"
end
@@ -40,9 +45,15 @@ FactoryBot.define do
minor true
guardian_first_name "Jamie"
guardian_last_name "Doe"
- guardian_address "100 Test Lane, New York, 10001"
guardian_phone "123-555-1234"
guardian_email "guardian@galaxy.all"
+ # guardian_address_street1 "St1"
+ # guardian_address_street2 "St2"
+ # guardian_address_city "City"
+ # guardian_address_state "State"
+ # guardian_address_zip "ZIP"
+ # guardian_address_country "Country"
+ guardian_address_old "St1 St2 City State ZIP Country"
guardian_photo do
path = Rails.root.join("spec", "fixtures", "files", "pratt.jpg")
Rack::Test::UploadedFile.new(path, "image/jpeg")
diff --git a/spec/models/contract_template_preview_spec.rb b/spec/models/contract_template_preview_spec.rb
index 7cdf8ec..472bcd2 100644
--- a/spec/models/contract_template_preview_spec.rb
+++ b/spec/models/contract_template_preview_spec.rb
@@ -54,7 +54,12 @@ describe ContractTemplatePreview do
'person_phone' => '00 111 222 333 4444',
'updated_at' => nil,
'minor' => true,
- 'guardian_address' => 'Street 3, Street 4, City-2, State-2 112233, Country-2',
+ 'guardian_address_old' => nil,
+ 'guardian_address_street1' => 'Street 3',
+ 'guardian_address_street2' => 'Street 4',
+ 'guardian_address_city' => 'City-2',
+ 'guardian_address_state' => 'State-2',
+ 'guardian_address_zip' => '112233',
"guardian_first_name" => nil,
"guardian_last_name" => nil,
"guardian_name_old" => nil,