@@ -, +, @@ --- .../prog/en/includes/patron-title.inc | 29 ++++++++++++++----- .../prog/en/modules/members/member.tt | 2 +- 2 files changed, 22 insertions(+), 9 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc @@ -1,10 +1,23 @@ -[% IF category_type == 'I' %] - [% surname %] [% IF othernames %] ([% othernames %]) [% END %] -[% ELSE %] - [% IF invert_name %] - [% surname %], [% firstname %] +[% IF ( borrower.borrowernumber ) %] + [% IF borrower.category_type == 'I' %] + [% borrower.surname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %] [% ELSE %] - [% firstname %] [% surname %] + [% IF invert_name %] + [% borrower.surname %], [% borrower.firstname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %] + [% ELSE %] + [% borrower.firstname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %] [% borrower.surname %] + [% END %] [% END %] -[% END %] -([% cardnumber %]) + ([% borrower.cardnumber %]) +[% ELSIF ( borrowernumber ) %] + [% IF category_type == 'I' %] + [% surname %] [% IF othernames %] ([% othernames %]) [% END %] + [% ELSE %] + [% IF invert_name %] + [% surname %], [% firstname %] [% IF othernames %] ([% othernames %]) [% END %] + [% ELSE %] + [% firstname %] [% IF othernames %] ([% othernames %]) [% END %] [% surname %] + [% END %] + [% END %] + ([% cardnumber %]) +[% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -62,7 +62,7 @@ [% resultsloo.cardnumber %] - [% INCLUDE 'patron-title.inc' category_type = resultsloo.category_type firstname = resultsloo.firstname surname = resultsloo.surname othernames = resultsloo.othernames cardnumber = resultsloo.cardnumber invert_name = 1%] + [% INCLUDE 'patron-title.inc' borrowernumber = resultsloo.borrowernumber category_type = resultsloo.category_type firstname = resultsloo.firstname surname = resultsloo.surname othernames = resultsloo.othernames cardnumber = resultsloo.cardnumber invert_name = 1%]
[% IF ( resultsloo.streetnumber ) %][% resultsloo.streetnumber %] [% END %][% resultsloo.address %][% IF ( resultsloo.address2 ) %]
[% resultsloo.address2 %][% END %][% IF ( resultsloo.city ) %]
[% resultsloo.city %][% IF ( resultsloo.state ) %],[% END %][% END %][% IF ( resultsloo.state ) %] [% resultsloo.state %][% END %] [% IF ( resultsloo.zipcode ) %] [% resultsloo.zipcode %][% END %][% IF ( resultsloo.country ) %], [% resultsloo.country %][% END %] [% resultsloo.category_description %] ([% resultsloo.category_type %]) --