From 9c6f2a16cb5a6ac2d80ed205db691148d8b5ba66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> Date: Tue, 14 Jun 2016 07:07:05 +0200 Subject: [PATCH] Bug 16729: Use member-display-address-style*-includes when printing user summary 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 <mehdi@inlibro.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- .../intranet-tmpl/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 2100a1f..f087760 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 @@ <h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">Account summary: [% firstname %] [% surname %] ([% cardnumber %])</a></h3> <ul> - <li>[% address %]<br />[% address2 %]</li> - <li>[% city %], [% zipcode %]</li> + [% IF Koha.Preference( 'AddressFormat' ) %] + [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] + [% ELSE %] + [% INCLUDE 'member-display-address-style-us.inc' %] + [% END %] <li>[% IF ( phone ) %][% phone %][% ELSE %](no phone number on file)[% END %]</li> <li>[% IF ( email ) %][% email %][% ELSE %](no primary email on file)[% END %]</li> [% IF ( emailpro ) %] -- 2.8.1