use Modern::Perl;
-use Test::More tests => 32;
+use Test::More tests => 47;
use DateTime::Duration;
use t::lib::Mocks;
use t::lib::TestBuilder;
-use C4::Biblio;
-use C4::Circulation;
+use C4::Biblio qw( AddBiblio );
+use C4::Circulation qw( AddIssue AddIssuingCharge AddRenewal AddReturn GetIssuingCharges GetOpenIssue GetRenewCount GetUpcomingDueIssues );
use C4::Context;
use C4::Items;
-use C4::Members;
-use C4::Reserves;
+use C4::Reserves qw( AddReserve );
+use Koha::Checkouts;
use Koha::Database;
use Koha::DateUtils;
+use Koha::Holds;
+use Koha::Items;
use Koha::Library;
+use Koha::Patrons;
+use Koha::CirculationRules;
+use Koha::Statistics;
BEGIN {
require_ok('C4::Circulation');
AddIssuingCharge
AddRenewal
AddReturn
- GetBiblioIssues
GetIssuingCharges
GetOpenIssue
GetRenewCount
$dbh->do(q|DELETE FROM issues|);
$dbh->do(q|DELETE FROM items|);
$dbh->do(q|DELETE FROM borrowers|);
-$dbh->do(q|DELETE FROM branches|);
$dbh->do(q|DELETE FROM categories|);
$dbh->do(q|DELETE FROM accountlines|);
-$dbh->do(q|DELETE FROM issuingrules|);
+$dbh->do(q|DELETE FROM circulation_rules|);
$dbh->do(q|DELETE FROM reserves|);
$dbh->do(q|DELETE FROM old_reserves|);
$dbh->do(q|DELETE FROM statistics|);
value => { enrolmentfee => undef }
})->{categorycode};
+# A default issuingrule should always be present
+Koha::CirculationRules->set_rules(
+ {
+ itemtype => '*',
+ categorycode => '*',
+ branchcode => '*',
+ rules => {
+ lengthunit => 'days',
+ issuelength => 0,
+ renewalperiod => 0,
+ renewalsallowed => 0
+ }
+ }
+);
+
# Add Dates
my $dt_today = dt_from_string;
my $today = output_pref(
my $barcode_1 = 'barcode_1';
my $barcode_2 = 'barcode_2';
-my @sampleitem1 = C4::Items::AddItem(
+my $item_id1 = Koha::Item->new(
{
+ biblionumber => $biblionumber,
barcode => $barcode_1,
itemcallnumber => 'callnumber1',
homebranch => $branchcode_1,
holdingbranch => $branchcode_1,
- issue => 1,
- reserve => 1,
itype => $itemtype
},
- $biblionumber
-);
-my $item_id1 = $sampleitem1[2];
-my @sampleitem2 = C4::Items::AddItem(
+)->store->itemnumber;
+my $item_id2 = Koha::Item->new(
{
+ biblionumber => $biblionumber,
barcode => $barcode_2,
itemcallnumber => 'callnumber2',
homebranch => $branchcode_2,
holdingbranch => $branchcode_2,
notforloan => 1,
- issue => 1,
itype => $itemtype
},
- $biblionumber
-);
-my $item_id2 = $sampleitem2[2];
+)->store->itemnumber;
#Add borrower
-my $borrower_id1 = C4::Members::AddMember(
+my $borrower_id1 = Koha::Patron->new({
firstname => 'firstname1',
surname => 'surname1 ',
categorycode => $categorycode,
branchcode => $branchcode_1
-);
-my $borrower_1 = C4::Members::GetMember(borrowernumber => $borrower_id1);
-my $borrower_id2 = C4::Members::AddMember(
+})->store->borrowernumber;
+my $patron_1 = Koha::Patrons->find( $borrower_id1 );
+my $borrower_1 = $patron_1->unblessed;
+my $borrower_id2 = Koha::Patron->new({
firstname => 'firstname2',
surname => 'surname2 ',
categorycode => $categorycode,
branchcode => $branchcode_2,
-);
-my $borrower_2 = C4::Members::GetMember(borrowernumber => $borrower_id2);
-
-my @USERENV = (
- $borrower_id1, 'test', 'MASTERTEST', 'firstname', $branchcode_1,
- $branchcode_1, 'email@example.org'
-);
-
-my @USERENV_DIFFERENT_LIBRARY = (
- $borrower_id1, 'test', 'MASTERTEST', 'firstname', $branchcode_3,
- $branchcode_3, 'email@example.org'
-);
+})->store->borrowernumber;
+my $patron_2 = Koha::Patrons->find( $borrower_id2 );
+my $borrower_2 = $patron_2->unblessed;
-
-C4::Context->_new_userenv('DUMMY_SESSION_ID');
-C4::Context->set_userenv(@USERENV);
-
-my $userenv = C4::Context->userenv
- or BAIL_OUT("No userenv");
+t::lib::Mocks::mock_userenv({ patron => $patron_1 });
#Begin Tests
my $countissue = $sth -> fetchrow_array;
is ($countissue ,0, "there is no issue");
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' );
+is( ref $issue1, 'Koha::Checkout',
+ 'AddIssue returns a Koha::Checkout 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}/,
- "Koha::Schema::Result::Issue->date_due() returns a date"
+ "Koha::Checkout->date_due() returns a date"
);
-my $issue_id1 = $dbh->last_insert_id( undef, undef, 'issues', undef );
+my $issue_id1 = $issue1->issue_id;
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;
$countissue = $sth -> fetchrow_array;
$query = " SELECT count(*) FROM accountlines";
$sth = $dbh->prepare($query);
$sth->execute;
-my $countaccount = $sth -> fetchrow_array;
+my $countaccount = $sth->fetchrow_array;
is ($countaccount,0,"0 accountline exists");
-is( C4::Circulation::AddIssuingCharge( $item_id1, $borrower_id1, 10 ),
- 1, "An issuing charge has been added" );
-my $account_id = $dbh->last_insert_id( undef, undef, 'accountlines', undef );
+my $checkout = Koha::Checkouts->find( $issue_id1 );
+my $charge = C4::Circulation::AddIssuingCharge( $checkout, 10, 'RENT' );
+is( ref( $charge ), 'Koha::Account::Line', "An issuing charge has been added" );
+is( $charge->issue_id, $issue_id1, 'Issue id is set correctly for issuing charge' );
+my $offset = Koha::Account::Offsets->find( { debit_id => $charge->id } );
+is( $offset->credit_id, undef, 'Offset was created');
$sth->execute;
-$countaccount = $sth -> fetchrow_array;
+$countaccount = $sth->fetchrow_array;
is ($countaccount,1,"1 accountline has been added");
# Test AddRenewal
+my $se = Test::MockModule->new( 'C4::Context' );
+$se->mock( 'interface', sub {return 'intranet'});
+
# Let's renew this one at a different library for statistical purposes to test Bug 17781
-C4::Context->set_userenv(@USERENV_DIFFERENT_LIBRARY);
+# Mocking userenv with a different branchcode
+t::lib::Mocks::mock_userenv({ patron => $patron_2, branchcode => $branchcode_3 });
+
my $datedue3 = AddRenewal( $borrower_id1, $item_id1, $branchcode_1, $datedue1, $daysago10 );
-C4::Context->set_userenv(@USERENV);
+
+# Restoring the userenv with the original branchcode
+t::lib::Mocks::mock_userenv({ patron => $patron_1});
like(
$datedue3,
my $stat = $dbh->selectrow_hashref("SELECT * FROM statistics WHERE type = 'renew' AND borrowernumber = ? AND itemnumber = ? AND branch = ?", undef, $borrower_id1, $item_id1, $branchcode_3 );
ok( $stat, "Bug 17781 - 'Improper branchcode set during renewal' still fixed" );
-
-#Test GetBiblioIssues
-is( GetBiblioIssues(), undef, "GetBiblio Issues without parameters" );
+subtest 'Show that AddRenewal respects OpacRenewalBranch and interface' => sub {
+ plan tests => 10;
+
+ my $item_library = $builder->build_object( { class => 'Koha::Libraries' } );
+ my $patron = $builder->build_object( { class => 'Koha::Patrons' } );
+ my $logged_in_user = $builder->build_object( { class => 'Koha::Patrons' } );
+ t::lib::Mocks::mock_userenv( { patron => $logged_in_user } );
+
+ my $OpacRenewalBranch = {
+ opacrenew => "OPACRenew",
+ checkoutbranch => $logged_in_user->branchcode,
+ patronhomebranch => $patron->branchcode,
+ itemhomebranch => $item_library->branchcode,
+ none => "",
+ };
+
+ while ( my ( $syspref, $expected_branchcode ) = each %$OpacRenewalBranch ) {
+
+ t::lib::Mocks::mock_preference( 'OpacRenewalBranch', $syspref );
+
+ {
+ $se->mock( 'interface', sub { return 'opac' } );
+
+ my $item = $builder->build_sample_item(
+ { library => $item_library->branchcode, itype => $itemtype } );
+ my $opac_renew_issue =
+ C4::Circulation::AddIssue( $patron->unblessed, $item->barcode );
+
+ AddRenewal( $patron->borrowernumber, $item->itemnumber,
+ "Stavromula", $datedue1, $daysago10 );
+
+ my $stat = Koha::Statistics->search(
+ { itemnumber => $item->itemnumber, type => 'renew' } )->next;
+ is( $stat->branch, $expected_branchcode,
+ "->renewal_branchcode is respected for OpacRenewalBranch = $syspref"
+ );
+ }
+
+ {
+ $se->mock( 'interface', sub { return 'intranet' } );
+
+ my $item = $builder->build_sample_item(
+ { library => $item_library->branchcode, itype => $itemtype } );
+ my $opac_renew_issue =
+ C4::Circulation::AddIssue( $patron->unblessed, $item->barcode );
+
+ AddRenewal( $patron->borrowernumber, $item->itemnumber,
+ "Stavromula", $datedue1, $daysago10 );
+
+ my $stat = Koha::Statistics->search(
+ { itemnumber => $item->itemnumber, type => 'renew' } )->next;
+ is( $stat->branch, $logged_in_user->branchcode,
+ "->renewal_branchcode is always logged in branch for intranet"
+ );
+ }
+ }
+};
#Test GetOpenIssue
is( GetOpenIssue(), undef, "Without parameter GetOpenIssue returns undef" );
@renewcount = C4::Circulation::GetRenewCount();
is_deeply(
\@renewcount,
- [ 0, undef, 0 ], # FIXME Need to be fixed, see FIXME in GetRenewCount
+ [ 0, 0, 0, 0, 0, 0 ], # FIXME Need to be fixed, see FIXME in GetRenewCount
"Without issuing rules and without parameter, GetRenewCount returns renewcount = 0, renewsallowed = undef, renewsleft = 0"
);
@renewcount = C4::Circulation::GetRenewCount(-1);
is_deeply(
\@renewcount,
- [ 0, undef, 0 ], # FIXME Need to be fixed
+ [ 0, 0, 0, 0, 0, 0 ], # FIXME Need to be fixed
"Without issuing rules and without wrong parameter, GetRenewCount returns renewcount = 0, renewsallowed = undef, renewsleft = 0"
);
@renewcount = C4::Circulation::GetRenewCount($borrower_id1, $item_id1);
is_deeply(
\@renewcount,
- [ 2, undef, 0 ],
+ [ 2, 0, 0, 0, 0, 0 ],
"Without issuing rules and with a valid parameter, renewcount = 2, renewsallowed = undef, renewsleft = 0"
);
#With something in DB
-# Add a default rule: No renewal allowed
-$dbh->do(q|
- INSERT INTO issuingrules( categorycode, itemtype, branchcode, issuelength, renewalsallowed )
- VALUES ( '*', '*', '*', 10, 0 )
-|);
@renewcount = C4::Circulation::GetRenewCount();
is_deeply(
\@renewcount,
- [ 0, 0, 0 ],
+ [ 0, 0, 0, 0, 0, 0 ],
"With issuing rules (renewal disallowed) and without parameter, GetRenewCount returns renewcount = 0, renewsallowed = 0, renewsleft = 0"
);
@renewcount = C4::Circulation::GetRenewCount(-1);
is_deeply(
\@renewcount,
- [ 0, 0, 0 ],
+ [ 0, 0, 0, 0, 0, 0 ],
"With issuing rules (renewal disallowed) and without wrong parameter, GetRenewCount returns renewcount = 0, renewsallowed = 0, renewsleft = 0"
);
@renewcount = C4::Circulation::GetRenewCount($borrower_id1, $item_id1);
is_deeply(
\@renewcount,
- [ 2, 0, 0 ],
+ [ 2, 0, 0, 0, 0, 0 ],
"With issuing rules (renewal disallowed) and with a valid parameter, Getrenewcount returns renewcount = 2, renewsallowed = 0, renewsleft = 0"
);
# Add a default rule: renewal is allowed
-$dbh->do(q|
- UPDATE issuingrules SET renewalsallowed = 3
-|);
-@renewcount = C4::Circulation::GetRenewCount();
-is_deeply(
- \@renewcount,
- [ 0, 3, 3 ],
- "With issuing rules (renewal allowed) and without parameter, GetRenewCount returns renewcount = 0, renewsallowed = 3, renewsleft = 3"
-);
-@renewcount = C4::Circulation::GetRenewCount(-1);
-is_deeply(
- \@renewcount,
- [ 0, 3, 3 ],
- "With issuing rules (renewal allowed) and without wrong parameter, GetRenewCount returns renewcount = 0, renewsallowed = 3, renewsleft = 3"
+Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ itemtype => undef,
+ branchcode => undef,
+ rules => {
+ renewalsallowed => 3,
+ }
+ }
);
@renewcount = C4::Circulation::GetRenewCount($borrower_id1, $item_id1);
is_deeply(
\@renewcount,
- [ 2, 3, 1 ],
+ [ 2, 3, 1, 0, 0, 0 ],
"With issuing rules (renewal allowed) and with a valid parameter, Getrenewcount of item1 returns 3 renews left"
);
@renewcount = C4::Circulation::GetRenewCount($borrower_id1, $item_id1);
is_deeply(
\@renewcount,
- [ 3, 3, 0 ],
+ [ 3, 3, 0, 0, 0, 0 ],
"With issuing rules (renewal allowed, 1 remaining) and with a valid parameter, Getrenewcount of item1 returns 0 renews left"
);
$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');
+AddReturn($barcode_1, undef, undef, dt_from_string('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(
+my $itemnumber = Koha::Item->new(
{
+ biblionumber => $biblionumber,
barcode => 'barcode_3',
itemcallnumber => 'callnumber3',
homebranch => $branchcode_1,
notforloan => 1,
itype => $itemtype
},
- $biblionumber
-);
+)->store->itemnumber;
t::lib::Mocks::mock_preference( 'UpdateNotForLoanStatusOnCheckin', q{} );
AddReturn( 'barcode_3', $branchcode_1 );
-my $item = GetItem( $itemnumber );
-ok( $item->{notforloan} eq 1, 'UpdateNotForLoanStatusOnCheckin does not modify value when not enabled' );
+my $item = Koha::Items->find( $itemnumber );
+ok( $item->notforloan eq 1, 'UpdateNotForLoanStatusOnCheckin does not modify value when not enabled' );
t::lib::Mocks::mock_preference( 'UpdateNotForLoanStatusOnCheckin', '1: 9' );
AddReturn( 'barcode_3', $branchcode_1 );
-$item = GetItem( $itemnumber );
-ok( $item->{notforloan} eq 9, q{UpdateNotForLoanStatusOnCheckin updates notforloan value from 1 to 9 with setting "1: 9"} );
+$item = Koha::Items->find( $itemnumber );
+ok( $item->notforloan eq 9, q{UpdateNotForLoanStatusOnCheckin updates notforloan value from 1 to 9 with setting "1: 9"} );
AddReturn( 'barcode_3', $branchcode_1 );
-$item = GetItem( $itemnumber );
-ok( $item->{notforloan} eq 9, q{UpdateNotForLoanStatusOnCheckin does not update notforloan value from 9 with setting "1: 9"} );
+$item = Koha::Items->find( $itemnumber );
+ok( $item->notforloan eq 9, q{UpdateNotForLoanStatusOnCheckin does not update notforloan value from 9 with setting "1: 9"} );
+
+my $itemnumber2 = Koha::Item->new(
+ {
+ biblionumber => $biblionumber,
+ barcode => 'barcode_4',
+ itemcallnumber => 'callnumber4',
+ homebranch => $branchcode_1,
+ holdingbranch => $branchcode_1,
+ location => 'FIC',
+ itype => $itemtype
+ }
+)->store->itemnumber;
+
+t::lib::Mocks::mock_preference( 'UpdateItemLocationOnCheckin', q{} );
+AddReturn( 'barcode_4', $branchcode_1 );
+my $item2 = Koha::Items->find( $itemnumber2 );
+ok( $item2->location eq 'FIC', 'UpdateItemLocationOnCheckin does not modify value when not enabled' );
+
+t::lib::Mocks::mock_preference( 'UpdateItemLocationOnCheckin', 'FIC: GEN' );
+AddReturn( 'barcode_4', $branchcode_1 );
+$item2 = Koha::Items->find( $itemnumber2 );
+is( $item2->location, 'GEN', q{UpdateItemLocationOnCheckin updates location value from 'FIC' to 'GEN' with setting "FIC: GEN"} );
+is( $item2->permanent_location, 'GEN', q{UpdateItemLocationOnCheckin updates permanent_location value from 'FIC' to 'GEN' with setting "FIC: GEN"} );
+AddReturn( 'barcode_4', $branchcode_1 );
+$item2 = Koha::Items->find( $itemnumber2 );
+ok( $item2->location eq 'GEN', q{UpdateItemLocationOnCheckin does not update location value from 'GEN' with setting "FIC: GEN"} );
+
+t::lib::Mocks::mock_preference( 'UpdateItemLocationOnCheckin', '_ALL_: CART' );
+AddReturn( 'barcode_4', $branchcode_1 );
+$item2 = Koha::Items->find( $itemnumber2 );
+ok( $item2->location eq 'CART', q{UpdateItemLocationOnCheckin updates location value from 'GEN' with setting "_ALL_: CART"} );
+Koha::Item::Transfer->new({
+ itemnumber => $itemnumber2,
+ frombranch => $branchcode_2,
+ tobranch => $branchcode_1,
+ datesent => '2020-01-01'
+})->store;
+AddReturn( 'barcode_4', $branchcode_1 );
+$item2 = Koha::Items->find( $itemnumber2 );
+ok( $item2->location eq 'CART', q{UpdateItemLocationOnCheckin updates location value from 'GEN' with setting "_ALL_: CART" when transfer filled} );
+
+ok( $item2->permanent_location eq 'GEN', q{UpdateItemLocationOnCheckin does not update permanent_location value from 'GEN' with setting "_ALL_: CART"} );
+AddIssue( $borrower_1, 'barcode_4', $daysago10,0, $today, '' );
+$item2 = Koha::Items->find( $itemnumber2 );
+ok( $item2->location eq 'GEN', q{Location updates from 'CART' to permanent location on issue} );
+
+t::lib::Mocks::mock_preference( 'UpdateItemLocationOnCheckin', "GEN: _BLANK_\n_BLANK_: PROC\nPROC: _PERM_" );
+AddReturn( 'barcode_4', $branchcode_1 );
+$item2 = Koha::Items->find( $itemnumber2 );
+ok( $item2->location eq '', q{UpdateItemLocationOnCheckin updates location value from 'GEN' to '' with setting "GEN: _BLANK_"} );
+AddReturn( 'barcode_4', $branchcode_1 );
+$item2 = Koha::Items->find( $itemnumber2 );
+ok( $item2->location eq 'PROC' , q{UpdateItemLocationOnCheckin updates location value from '' to 'PROC' with setting "_BLANK_: PROC"} );
+ok( $item2->permanent_location eq '' , q{UpdateItemLocationOnCheckin does not update permanent_location value from '' to 'PROC' with setting "_BLANK_: PROC"} );
+AddReturn( 'barcode_4', $branchcode_1 );
+$item2 = Koha::Items->find( $itemnumber2 );
+ok( $item2->location eq '' , q{UpdateItemLocationOnCheckin updates location value from 'PROC' to '' with setting "PROC: _PERM_" } );
+ok( $item2->permanent_location eq '' , q{UpdateItemLocationOnCheckin does not update permanent_location from '' with setting "PROC: _PERM_" } );
+
+
+
# Bug 14640 - Cancel the hold on checking out if asked
-my $reserve_id = AddReserve($branchcode_1, $borrower_id1, $biblionumber,
- undef, 1, undef, undef, "a note", "a title", undef, '');
+my $reserve_id = AddReserve(
+ {
+ branchcode => $branchcode_1,
+ borrowernumber => $borrower_id1,
+ biblionumber => $biblionumber,
+ priority => 1,
+ notes => "a note",
+ title => "a title",
+ }
+);
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' );
+my $hold = Koha::Holds->find( $reserve_id );
+is( $hold, undef, 'The reserve should have been correctly cancelled' );
+
+# Unseen rewnewals
+t::lib::Mocks::mock_preference('UnseenRenewals', 1);
+# Add a default circ rule: 3 unseen renewals allowed
+Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ itemtype => undef,
+ branchcode => undef,
+ rules => {
+ renewalsallowed => 10,
+ unseen_renewals_allowed => 3
+ }
+ }
+);
+
+my $unseen_library = $builder->build_object( { class => 'Koha::Libraries' } );
+my $unseen_patron = $builder->build_object( { class => 'Koha::Patrons' } );
+my $unseen_item = $builder->build_sample_item(
+ { library => $unseen_library->branchcode, itype => $itemtype } );
+my $unseen_issue = C4::Circulation::AddIssue( $unseen_patron->unblessed, $unseen_item->barcode );
+
+# Does an unseen renewal increment the issue's count
+my ( $unseen_before ) = ( C4::Circulation::GetRenewCount( $unseen_patron->borrowernumber, $unseen_item->itemnumber ) )[3];
+AddRenewal( $unseen_patron->borrowernumber, $unseen_item->itemnumber, $branchcode_1, undef, undef, undef, 0 );
+my ( $unseen_after ) = ( C4::Circulation::GetRenewCount( $unseen_patron->borrowernumber, $unseen_item->itemnumber ) )[3];
+is( $unseen_after, $unseen_before + 1, 'unseen_renewals increments' );
+
+# Does a seen renewal reset the unseen count
+AddRenewal( $unseen_patron->borrowernumber, $unseen_item->itemnumber, $branchcode_1, undef, undef, undef, 1 );
+my ( $unseen_reset ) = ( C4::Circulation::GetRenewCount( $unseen_patron->borrowernumber, $unseen_item->itemnumber ) )[3];
+is( $unseen_reset, 0, 'seen renewal resets the unseen count' );
#End transaction
$schema->storage->txn_rollback;
projects / srvgit / blobdiff