Commit 2654a486 authored by Markus Koller's avatar Markus Koller
Browse files

Merge branch 'changes/consistent-pdf-info' into 'develop'

Changes/consistent pdf info

See merge request !543
parents f35a6119 a34b8302
Pipeline #16707 passed with stage
in 51 minutes and 28 seconds
......@@ -10,7 +10,7 @@ class Certificate < ApplicationRecord
self.hours ||= volunteer.hours.total_hours
self.minutes ||= volunteer.hours.minutes_rest
self.volunteer_contact ||= convert_volunteer_contact
self.institution ||= DEFAULT_INSTITUTION
self.institution ||= DEFAULT_INSTITUTION + ", #{user&.profile.contact.primary_phone}"
self.duration_start = volunteer.min_assignment_date
self.duration_end = volunteer.max_assignment_date
end
......@@ -28,7 +28,7 @@ class Certificate < ApplicationRecord
end
DEFAULT_INSTITUTION = "**AOZ** Zürich, Flüelastrasse 32, 8047 Zürich \r\n"\
'044 415 67 35, info@aoz-freiwillige.ch'.freeze
'freiwillige@aoz.ch'.freeze
DEFAULT_FUNCTION = 'Förderung der sozialen und beruflichen Integration von Asylsuchenden, '\
'Geflüchteten und Migrant/innen'.freeze
......
......@@ -7,12 +7,19 @@ html
.col-xs-3
.pdf-logo-image
= wicked_pdf_image_tag 'AOZ_Logo.svg'
.col-xs-4
.col-xs-3
b= t('pdf_header.title').html_safe
.col-xs-2
.col-xs-3
= t('pdf_header.address').html_safe
.col-xs-3
= t('pdf_header.contact').html_safe
- if controller_name == 'assignments'
== t('pdf_header.contact', phone: @assignment&.creator.profile.contact.primary_phone)
- elsif controller_name == 'group_offers'
== t('pdf_header.contact', phone: @group_offer&.creator.profile.contact.primary_phone)
- elsif controller_name == 'billing_expenses'
== t('pdf_header.contact', phone: @billing_expense&.user.profile.contact.primary_phone)
- else
== t('pdf_header.contact', phone: '044 415 66 72')
.container
= yield
......@@ -798,8 +798,8 @@ de:
not_authorized: Sie sind nicht berechtigt diese Aktion durchzuführen.
password_reset_instructions: Ich möchte mein Passwort zurücksetzen
pdf_header:
address: Fluelastrasse 32<br>8047 Zurich<br>www.aoz.ch
contact: Telefon 044 415 66 72<br>Telefax n.v.<br>jeannine.stauffer@aoz.ch
address: Fluelastrasse 32<br>8047 Zurich<br>www.aoz.ch/freiwilligenarbeit
contact: Telefon %{phone}<br>Telefax n.v.<br>freiwillige@aoz.ch
title: Fachstelle Freiwilligenarbeit
performance_reports: &id-performance-reports-de-keys
categories: &id-performance-scope-categories
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment