From 932d60dbf1b87e04bd78fc467e1319855308a88b Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Thu, 1 Dec 2011 14:19:44 +1300 Subject: [PATCH] [SIGNED-OFF] Bug 7278 : Additional Materials Part 2: This patch shows the message at checkout and checkin How to test: * Add a note in cataloguing * Check it displays at checkout and checkin * Check items without a note don't display anything Signed-off-by: Katrin Fischer --- circ/circulation.pl | 1 + circ/returns.pl | 1 + .../prog/en/modules/circ/circulation.tt | 7 +++++++ .../intranet-tmpl/prog/en/modules/circ/returns.tt | 6 ++++++ 4 files changed, 15 insertions(+), 0 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index c95e59b..9e1c321 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -296,6 +296,7 @@ if ($barcode) { unless($issueconfirmed){ # Get the item title for more information my $getmessageiteminfo = GetBiblioFromItemNumber(undef,$barcode); + $template->{VARS}->{'additional_materials'} = $getmessageiteminfo->{'materials'}; $template->param( itemhomebranch => $getmessageiteminfo->{'homebranch'} ); # pass needsconfirmation to template if issuing is possible and user hasn't yet confirmed. diff --git a/circ/returns.pl b/circ/returns.pl index 98d310e..167bc5f 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -238,6 +238,7 @@ if ($barcode) { itemtype => $biblio->{'itemtype'}, ccode => $biblio->{'ccode'}, itembiblionumber => $biblio->{'biblionumber'}, + additional_materials => $biblio->{'materials'} ); my %input = ( diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 5627109..9f856ac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -226,6 +226,13 @@ function refocus(calendar) { [% IF ( dateexpiry ) %]
Patron's account has been renewed until [% dateexpiry %]
[% END %] + +[% IF additional_materials %] +
Note about the accompanying materials:
+ [% additional_materials %] +
+[% END %] + [% IF ( NEEDSCONFIRMATION ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 70367ae..507b8e8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -54,6 +54,12 @@ function Dopop(link) {
+[% IF additional_materials %] +
Note about the accompanying materials:
+ [% additional_materials %] +
+[% END %] + [% IF ( collectionItemNeedsTransferred ) %]
This item is part of a Rotating Collection and needs to be Transferred to [% collectionBranch %]
[% END %] -- 1.7.5.4