From 1e1c3ec91b615c31a36c6bd2af0ea4f9f916c6c2 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Thu, 23 Apr 2015 11:54:40 +0200 Subject: [PATCH] Bug 11999: Check for age restriction in CanBookBeReserved + improve t/db_dependent/Reserves.t to make tests pass on UNIMARC installation Maxreserves and alreadyreserved works on ILSDI Maxreserves works also on staff and opac Already reserves works also on staff and opac tests on t/db_dependent/Reserves.t and t/db_dependent/Holds.t passe (using koha_ut db) Signed-off-by: Alex Arnaud --- C4/Reserves.pm | 6 ++++++ t/db_dependent/Reserves.t | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/C4/Reserves.pm b/C4/Reserves.pm index f484c4c..0ed7882 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -442,6 +442,12 @@ sub CanBookBeReserved{ return 'tooManyReserves'; } + # Check for the age restriction + my $biblioData = C4::Biblio::GetBiblioData( $biblionumber ); + my $borrower = C4::Members::GetMember(borrowernumber => $borrowernumber); + my ($ageRestriction, $daysToAgeRestriction) = C4::Circulation::GetAgeRestriction( $biblioData->{agerestriction}, $borrower ); + return 'ageRestricted' if $daysToAgeRestriction && $daysToAgeRestriction > 0; + my $items = GetItemnumbersForBiblio($biblionumber); #get items linked via host records my @hostitems = get_hostitemnumbers_of($biblionumber); diff --git a/t/db_dependent/Reserves.t b/t/db_dependent/Reserves.t index 37d90d9..f6cafb8 100755 --- a/t/db_dependent/Reserves.t +++ b/t/db_dependent/Reserves.t @@ -50,7 +50,11 @@ my $dbh = C4::Context->dbh; my $builder = t::lib::TestBuilder->new; # Somewhat arbitrary field chosen for age restriction unit tests. Must be added to db before the framework is cached -$dbh->do("update marc_subfield_structure set kohafield='biblioitems.agerestriction' where tagfield='521' and tagsubfield='a'"); +$dbh->do(q| + INSERT INTO marc_subfield_structure (frameworkcode, tagfield, tagsubfield, kohafield) + VALUES ('', '521', 'a', 'biblioitems.agerestriction') + ON DUPLICATE KEY UPDATE kohafield = VALUES(kohafield) +|); ## Setup Test # Add branches -- 2.1.4