#!/usr/bin/perl
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
+
use Modern::Perl;
+
use Koha::DateUtils;
use DateTime::Duration;
use C4::Biblio;
use C4::Circulation;
use C4::Items;
use C4::Context;
+use C4::Reserves;
-use Test::More tests => 27;
+use Test::More tests => 32;
BEGIN {
use_ok('C4::Circulation');
MARC::Field->new( '952', '0', '0', a => $samplebranch1->{branchcode} ) );
my ( $biblionumber, $biblioitemnumber ) = C4::Biblio::AddBiblio( $record, '' );
+my $barcode_1 = 'barcode_1';
+my $barcode_2 = 'barcode_2';
my @sampleitem1 = C4::Items::AddItem(
{
- barcode => 'barcode_1',
+ barcode => $barcode_1,
itemcallnumber => 'callnumber1',
homebranch => $samplebranch1->{branchcode},
holdingbranch => $samplebranch1->{branchcode},
my $item_id1 = $sampleitem1[2];
my @sampleitem2 = C4::Items::AddItem(
{
- barcode => 'barcode_2',
+ barcode => $barcode_2,
itemcallnumber => 'callnumber2',
homebranch => $samplebranch2->{branchcode},
holdingbranch => $samplebranch2->{branchcode},
$sth->execute;
my $countissue = $sth -> fetchrow_array;
is ($countissue ,0, "there is no issue");
-my $datedue1 = C4::Circulation::AddIssue( $borrower_1, 'barcode_1', $daysago10,0, $today, '' );
+my $issue1 = C4::Circulation::AddIssue( $borrower_1, $barcode_1, $daysago10,0, $today, '' );
+is( ref $issue1, 'Koha::Schema::Result::Issue',
+ 'AddIssue returns a Koha::Schema::Result::Issue object' );
+my $datedue1 = dt_from_string( $issue1->date_due() );
like(
$datedue1,
qr/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/,
- "AddRenewal returns a date"
+ "Koha::Schema::Result::Issue->date_due() returns a date"
);
my $issue_id1 = $dbh->last_insert_id( undef, undef, 'issues', undef );
-my $datedue2 = C4::Circulation::AddIssue( $borrower_1, 'nonexistent_barcode' );
-is( $datedue2, undef, "AddIssue returns undef if no datedue is specified" );
+my $issue2 = C4::Circulation::AddIssue( $borrower_1, 'nonexistent_barcode' );
+is( $issue2, undef, "AddIssue returns undef if no datedue is specified" );
my $issue_id2 = $dbh->last_insert_id( undef, undef, 'issues', undef );
$sth->execute;
my @renewcount;
#Test GetRenewCount
-$datedue2 = C4::Circulation::AddIssue( $borrower_1, 'barcode_1' );
-isnt( $datedue2, undef, "AddIssue does not return undef if datedue is specified" );
+my $issue3 = C4::Circulation::AddIssue( $borrower_1, $barcode_1 );
#Without anything in DB
@renewcount = C4::Circulation::GetRenewCount();
is_deeply(
);
$dbh->do("DELETE FROM old_issues");
-AddReturn('barcode_1');
+AddReturn($barcode_1);
my $return = $dbh->selectrow_hashref("SELECT DATE(returndate) AS return_date, CURRENT_DATE() AS today FROM old_issues LIMIT 1" );
ok( $return->{return_date} eq $return->{today}, "Item returned with no return date specified has todays date" );
$dbh->do("DELETE FROM old_issues");
-C4::Circulation::AddIssue( $borrower_1, 'barcode_1', $daysago10, 0, $today );
-AddReturn('barcode_1', undef, undef, undef, '2014-04-01 23:42');
+C4::Circulation::AddIssue( $borrower_1, $barcode_1, $daysago10, 0, $today );
+AddReturn($barcode_1, undef, undef, undef, '2014-04-01 23:42');
$return = $dbh->selectrow_hashref("SELECT * FROM old_issues LIMIT 1" );
ok( $return->{returndate} eq '2014-04-01 23:42:00', "Item returned with a return date of '2014-04-01 23:42' has that return date" );
+my $itemnumber;
+($biblionumber, $biblioitemnumber, $itemnumber) = C4::Items::AddItem(
+ {
+ barcode => 'barcode_3',
+ itemcallnumber => 'callnumber3',
+ homebranch => $samplebranch1->{branchcode},
+ holdingbranch => $samplebranch1->{branchcode},
+ notforloan => 1,
+ },
+ $biblionumber
+);
+
+C4::Context->set_preference( 'UpdateNotForLoanStatusOnCheckin', q{} );
+AddReturn( 'barcode_3', $samplebranch1->{branchcode} );
+my $item = GetItem( $itemnumber );
+ok( $item->{notforloan} eq 1, 'UpdateNotForLoanStatusOnCheckin does not modify value when not enabled' );
+
+C4::Context->set_preference( 'UpdateNotForLoanStatusOnCheckin', '1: 9' );
+AddReturn( 'barcode_3', $samplebranch1->{branchcode} );
+$item = GetItem( $itemnumber );
+ok( $item->{notforloan} eq 9, q{UpdateNotForLoanStatusOnCheckin updates notforloan value from 1 to 9 with setting "1: 9"} );
+
+AddReturn( 'barcode_3', $samplebranch1->{branchcode} );
+$item = GetItem( $itemnumber );
+ok( $item->{notforloan} eq 9, q{UpdateNotForLoanStatusOnCheckin does not update notforloan value from 9 with setting "1: 9"} );
+
+# Bug 14640 - Cancel the hold on checking out if asked
+my $reserve_id = AddReserve('CPL', $borrower_id1, $biblionumber,
+ undef, 1, undef, undef, "a note", "a title", undef, '');
+ok( $reserve_id, 'The reserve should have been inserted' );
+AddIssue( $borrower_2, $barcode_1, dt_from_string, 'cancel' );
+my $reserve = GetReserve( $reserve_id );
+is( $reserve, undef, 'The reserve should have been correctly cancelled' );
+
#End transaction
$dbh->rollback;
projects / srvgit / blobdiff