From df5ed65893c488f52a49051e707bb97623978567 Mon Sep 17 00:00:00 2001 From: Srdjan Jankovic Date: Mon, 10 Oct 2011 15:20:50 +1300 Subject: [PATCH] bug_6303: Display Organisation and Parent Organisation names when viewing a borrower of type organistaion --- C4/Members.pm | 22 ++++++++++--------- circ/circulation.pl | 9 ++++--- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +- .../prog/en/includes/patron-title.inc | 6 +++++ .../prog/en/modules/circ/circulation.tt | 21 ++++++++++--------- .../prog/en/modules/members/boraccount.tt | 4 +- .../prog/en/modules/members/member.tt | 4 ++- .../prog/en/modules/members/moremember.tt | 10 +++++++- .../prog/en/modules/members/notices.tt | 6 ++-- .../prog/en/modules/members/readingrec.tt | 4 +- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 17 +++++++++++--- .../opac-tmpl/prog/en/includes/patron-title.inc | 5 ++++ koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 7 ++++- .../opac-tmpl/prog/en/modules/opac-userupdate.tt | 7 ++++- members/boraccount.pl | 3 +- members/moremember.pl | 8 ++---- members/readingrec.pl | 1 + opac/opac-user.pl | 3 ++ tools/viewlog.pl | 3 ++ 19 files changed, 93 insertions(+), 49 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc create mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/patron-title.inc diff --git a/C4/Members.pm b/C4/Members.pm index 1730d6c..08bc65c 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -353,11 +353,11 @@ sub GetMemberDetails { my $query; my $sth; if ($borrowernumber) { - $sth = $dbh->prepare("SELECT borrowers.*,category_type,categories.description,reservefee FROM borrowers LEFT JOIN categories ON borrowers.categorycode=categories.categorycode WHERE borrowernumber=?"); + $sth = $dbh->prepare("SELECT borrowers.*,category_type,categories.description,reservefee,enrolmentperiod FROM borrowers LEFT JOIN categories ON borrowers.categorycode=categories.categorycode WHERE borrowernumber=?"); $sth->execute($borrowernumber); } elsif ($cardnumber) { - $sth = $dbh->prepare("SELECT borrowers.*,category_type,categories.description,reservefee FROM borrowers LEFT JOIN categories ON borrowers.categorycode=categories.categorycode WHERE cardnumber=?"); + $sth = $dbh->prepare("SELECT borrowers.*,category_type,categories.description,reservefee,enrolmentperiod FROM borrowers LEFT JOIN categories ON borrowers.categorycode=categories.categorycode WHERE cardnumber=?"); $sth->execute($cardnumber); } else { @@ -380,14 +380,16 @@ sub GetMemberDetails { $borrower->{'flags'} = $flags; $borrower->{'authflags'} = $accessflagshash; - # find out how long the membership lasts - $sth = - $dbh->prepare( - "select enrolmentperiod from categories where categorycode = ?"); - $sth->execute( $borrower->{'categorycode'} ); - my $enrolment = $sth->fetchrow; - $borrower->{'enrolmentperiod'} = $enrolment; - + # For the purposes of making templates easier, we'll define a + # 'showname' which is the alternate form the user's first name if + # 'other name' is defined. + if ($borrower->{category_type} eq 'I') { + $borrower->{'showname'} = $borrower->{'othernames'}; + $borrower->{'showname'} .= " $borrower->{'firstname'}" if $borrower->{'firstname'}; + } else { + $borrower->{'showname'} = $borrower->{'firstname'}; + } + return ($borrower); #, $flags, $accessflagshash); } diff --git a/circ/circulation.pl b/circ/circulation.pl index 98fee97..bbcef51 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -629,10 +629,9 @@ my (undef, $roadttype_hashref) = &GetRoadTypes(); my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'}; my $fast_cataloging = 0; - if (defined getframeworkinfo('FA')) { +if (defined getframeworkinfo('FA')) { $fast_cataloging = 1 - } -my $attributes = GetBorrowerAttributes($borrowernumber); +} $template->param( lib_messages_loop => $lib_messages_loop, @@ -647,6 +646,8 @@ $template->param( printername => $printer, firstname => $borrower->{'firstname'}, surname => $borrower->{'surname'}, + showname => $borrower->{'showname'}, + category_type => $borrower->{'category_type'}, dateexpiry => format_date($newexpiry), expiry => format_date($borrower->{'dateexpiry'}), categorycode => $borrower->{'categorycode'}, @@ -662,6 +663,7 @@ $template->param( country => $borrower->{'country'}, phone => $borrower->{'phone'} || $borrower->{'mobile'}, cardnumber => $borrower->{'cardnumber'}, + othernames => $borrower->{'othernames'}, amountold => $amountold, barcode => $barcode, stickyduedate => $stickyduedate, @@ -682,7 +684,6 @@ $template->param( circview => 1, soundon => C4::Context->preference("SoundOn"), fast_cataloging => $fast_cataloging, - extendedattributes => $attributes, ); # save stickyduedate to session diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index a9fd453..af11b08 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -1,5 +1,5 @@ [% IF ( borrowernumber ) %] -
[% firstname %] [% surname %] ([% cardnumber %])
+
[% INCLUDE 'patron-title.inc' %]