diff --git a/app/models/appearance_release.rb b/app/models/appearance_release.rb index 00576e1..324296e 100644 --- a/app/models/appearance_release.rb +++ b/app/models/appearance_release.rb @@ -20,7 +20,7 @@ class AppearanceRelease < ApplicationRecord class << self def custom_csv_exportable_headers - %i[name contact_info] + %i[approved? name contact_info] end end diff --git a/app/models/concerns/csv_exportable.rb b/app/models/concerns/csv_exportable.rb index 7709d8f..4bf3704 100644 --- a/app/models/concerns/csv_exportable.rb +++ b/app/models/concerns/csv_exportable.rb @@ -28,11 +28,16 @@ module CsvExportable end private + def owner_info - contact_info(name: person_name, address: person_address, phone: person_phone, email: person_email) + compact_contact_info(name: person_name, address: person_address, phone: person_phone, email: person_email) end - def contact_info(name: nil, address: nil, phone: nil, email: nil) + def contact_info + owner_info + end + + def compact_contact_info(name: nil, address: nil, phone: nil, email: nil) contact_info = '' contact_info += "#{name}; " if name.present? contact_info += "#{address}; " if address.present? diff --git a/config/locales/en.yml b/config/locales/en.yml index 21c983a..13a9701 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -176,6 +176,7 @@ en: imported_appearance_release_missing_attachment: Person photo or contract missing for imported appearance release table_headers: approved: Approved + approved?: Approved contact_info: Contact info name: Name notes: Notes diff --git a/config/locales/es.yml b/config/locales/es.yml index 483a5d8..3486cb5 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -71,6 +71,8 @@ es: notes: "" signed_at: "" tags: "" + approved: Approved (ES) + approved?: Approved (ES) shared: imported_appearance_release_contract_name: Contrato Importado imported_appearance_release_headshot_name: Retrato Importado