From 546b95aee4fd4065090f4337a2e3e910f2767b39 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc=20V=C3=A9ron?= Date: Tue, 14 Jun 2016 07:07:05 +0200 Subject: [PATCH] Bug 16729: Use member-display-address-style*-includes when printing user summary MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch replaces the address part in moremember-print.tt to print identical address information as displayed on the screen (including street numer, formatted as required by syspref 'AddressFormat' To test: - Apply patch - Search for a user with all address information filled - Verify that 'Print summmary' displays the same information as displayed on the screen. - Change value of syspref 'AdressFormat' - Verify that address format on 'Print summary' changes as appropriate Signed-off-by: mehdi Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 555f40626ab34eccadec66091e54e203a9be4440) Signed-off-by: Frédéric Demians --- .../prog/en/modules/members/moremember-print.tt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt index 2100a1fe9d..f0877608fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt @@ -14,8 +14,11 @@

Account summary: [% firstname %] [% surname %] ([% cardnumber %])

    -
  • [% address %]
    [% address2 %]
  • -
  • [% city %], [% zipcode %]
  • + [% IF Koha.Preference( 'AddressFormat' ) %] + [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] + [% ELSE %] + [% INCLUDE 'member-display-address-style-us.inc' %] + [% END %]
  • [% IF ( phone ) %][% phone %][% ELSE %](no phone number on file)[% END %]
  • [% IF ( email ) %][% email %][% ELSE %](no primary email on file)[% END %]
  • [% IF ( emailpro ) %] -- 2.39.5