use Modern::Perl;
-use Test::More tests => 4;
+use Test::More tests => 7;
use Test::MockModule;
use Test::Warn;
use t::lib::Mocks;
use t::lib::TestBuilder;
-use C4::Biblio;
+use C4::Members;
use C4::Circulation;
use C4::Items;
-use C4::Members;
+use C4::Biblio;
use Koha::Database;
use Koha::Account::Lines;
use Koha::DateUtils;
# Mock userenv, used by AddIssue
my $branch;
+my $manager_id;
my $context = Test::MockModule->new('C4::Context');
-$context->mock( 'userenv', sub {
- return { branch => $branch }
-});
+$context->mock(
+ 'userenv',
+ sub {
+ return {
+ branch => $branch,
+ number => $manager_id,
+ firstname => "Adam",
+ surname => "Smaith"
+ };
+ }
+);
my $schema = Koha::Database->schema;
$schema->storage->txn_begin;
my $builder = t::lib::TestBuilder->new();
-Koha::IssuingRules->search->delete;
-my $rule = Koha::IssuingRule->new(
+Koha::CirculationRules->search->delete;
+Koha::CirculationRules->set_rule(
{
- categorycode => '*',
- itemtype => '*',
- branchcode => '*',
- maxissueqty => 99,
- issuelength => 1,
+ categorycode => undef,
+ itemtype => undef,
+ branchcode => undef,
+ rule_name => 'issuelength',
+ rule_value => 1,
}
);
-$rule->store();
-
-subtest "InProcessingToShelvingCart tests" => sub {
-
- plan tests => 2;
-
- $branch = $builder->build({ source => 'Branch' })->{ branchcode };
- my $permanent_location = 'TEST';
- my $location = 'PROC';
-
- # Create a biblio record with biblio-level itemtype
- my $record = MARC::Record->new();
- my ( $biblionumber, $biblioitemnumber ) = AddBiblio( $record, '' );
- my $built_item = $builder->build({
- source => 'Item',
- value => {
- biblionumber => $biblionumber,
- homebranch => $branch,
- holdingbranch => $branch,
- location => $location,
- permanent_location => $permanent_location
- }
- });
- my $barcode = $built_item->{ barcode };
- my $itemnumber = $built_item->{ itemnumber };
- my $item;
-
- t::lib::Mocks::mock_preference( "InProcessingToShelvingCart", 1 );
- AddReturn( $barcode, $branch );
- $item = GetItem( $itemnumber );
- is( $item->{location}, 'CART',
- "InProcessingToShelvingCart functions as intended" );
-
- $item->{location} = $location;
- ModItem( $item, undef, $itemnumber );
-
- t::lib::Mocks::mock_preference( "InProcessingToShelvingCart", 0 );
- AddReturn( $barcode, $branch );
- $item = GetItem( $itemnumber );
- is( $item->{location}, $permanent_location,
- "InProcessingToShelvingCart functions as intended" );
-};
-
subtest "AddReturn logging on statistics table (item-level_itypes=1)" => sub {
- plan tests => 4;
+ plan tests => 3;
# Set item-level item types
t::lib::Mocks::mock_preference( "item-level_itypes", 1 );
[qr/^item-level_itypes set but no itemtype set for item/,
qr/^item-level_itypes set but no itemtype set for item/],
'Item without itemtype set raises warning on AddIssue';
- warning_like { AddReturn( $item_without_itemtype->{ barcode }, $branch ) }
- qr/^item-level_itypes set but no itemtype set for item/,
- 'Item without itemtype set raises warning on AddReturn';
+ AddReturn( $item_without_itemtype->{ barcode }, $branch );
# Test biblio-level itemtype was recorded on the 'statistics' table
$stat = $schema->resultset('Statistic')->search({
branch => $branch,
t::lib::Mocks::mock_preference( "IssueLog", 1 );
t::lib::Mocks::mock_preference( "ReturnLog", 1 );
- # Set item-level item types
+ # Set biblio level item types
t::lib::Mocks::mock_preference( "item-level_itypes", 0 );
# Create an itemtype for biblio-level item type
source => 'Item',
value => {
biblionumber => $biblionumber,
+ biblioitemnumber => $biblioitemnumber,
homebranch => $branch,
holdingbranch => $branch,
itype => $ilevel_itemtype
source => 'Item',
value => {
biblionumber => $biblionumber,
+ biblioitemnumber => $biblioitemnumber,
homebranch => $branch,
holdingbranch => $branch,
itype => undef
};
subtest 'Handle ids duplication' => sub {
- plan tests => 6;
+ plan tests => 8;
t::lib::Mocks::mock_preference( 'item-level_itypes', 1 );
t::lib::Mocks::mock_preference( 'CalculateFinesOnReturn', 1 );
t::lib::Mocks::mock_preference( 'finesMode', 'production' );
- Koha::IssuingRules->search->update({ chargeperiod => 1, fine => 1, firstremind => 1, });
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ itemtype => undef,
+ branchcode => undef,
+ rules => {
+ chargeperiod => 1,
+ fine => 1,
+ firstremind => 1,
+ }
+ }
+ );
my $biblio = $builder->build( { source => 'Biblio' } );
my $itemtype = $builder->build( { source => 'Itemtype', value => { rentalcharge => 5 } } );
$patron = Koha::Patrons->find( $patron->{borrowernumber} );
my $original_checkout = AddIssue( $patron->unblessed, $item->{barcode}, dt_from_string->subtract( days => 50 ) );
-
my $issue_id = $original_checkout->issue_id;
+ my $account_lines = Koha::Account::Lines->search({ borrowernumber => $patron->borrowernumber, issue_id => $issue_id });
+ is( $account_lines->count, 1, '1 account line should exist for this issue_id' );
+ is( $account_lines->next->debit_type_code, 'RENT', 'patron has been charged the rentalcharge' );
+ $account_lines->delete;
+
# Create an existing entry in old_issue
$builder->build({ source => 'OldIssue', value => { issue_id => $issue_id } });
}
[
qr{.*DBD::mysql::st execute failed: Duplicate entry.*},
- { carped => qr{The checkin for the following issue failed.*DBIx::Class::Storage::DBI::_dbh_execute.*} }
+ { carped => qr{The checkin for the following issue failed.*Duplicate ID.*} }
],
'DBD should have raised an error about dup primary key';
is( $messages->{WasReturned}, 0, 'messages should have the WasReturned flag set to 0' );
is( $messages->{DataCorrupted}, 1, 'messages should have the DataCorrupted flag set to 1' );
- my $account_lines = Koha::Account::Lines->search({ borrowernumber => $patron->borrowernumber, issue_id => $issue_id });
+ $account_lines = Koha::Account::Lines->search({ borrowernumber => $patron->borrowernumber, issue_id => $issue_id });
is( $account_lines->count, 0, 'No account lines should exist for this issue_id, patron should not have been charged' );
is( Koha::Checkouts->find( $issue_id )->issue_id, $issue_id, 'The issues entry should not have been removed' );
};
-1;
+subtest 'BlockReturnOfLostItems' => sub {
+ plan tests => 4;
+ my $biblio = $builder->build_object( { class => 'Koha::Biblios' } );
+ my $item = $builder->build_object(
+ {
+ class => 'Koha::Items',
+ value => {
+ biblionumber => $biblio->biblionumber,
+ notforloan => 0,
+ itemlost => 0,
+ withdrawn => 0,
+ }
+ }
+ );
+ my $patron = $builder->build_object({class => 'Koha::Patrons'});
+ my $checkout = AddIssue( $patron->unblessed, $item->barcode );
+
+ # Mark the item as lost
+ $item->itemlost(1)->store;
+
+ t::lib::Mocks::mock_preference('BlockReturnOfLostItems', 1);
+ my ( $doreturn, $messages, $issue ) = AddReturn($item->barcode);
+ is( $doreturn, 0, "With BlockReturnOfLostItems, a checkin of a lost item should be blocked");
+ is( $messages->{WasLost}, 1, "... and the WasLost flag should be set");
+
+ $item->discard_changes;
+ is( $item->itemlost, 1, "Item remains lost" );
+
+ t::lib::Mocks::mock_preference('BlockReturnOfLostItems', 0);
+ ( $doreturn, $messages, $issue ) = AddReturn($item->barcode);
+ is( $doreturn, 1, "Without BlockReturnOfLostItems, a checkin of a lost item should not be blocked");
+};
+
+subtest 'Checkin of an item claimed as returned should generate a message' => sub {
+ plan tests => 1;
+
+ t::lib::Mocks::mock_preference('ClaimReturnedLostValue', 1);
+ my $biblio = $builder->build_object( { class => 'Koha::Biblios' } );
+ my $item = $builder->build_object(
+ {
+ class => 'Koha::Items',
+ value => {
+ biblionumber => $biblio->biblionumber,
+ notforloan => 0,
+ itemlost => 0,
+ withdrawn => 0,
+ }
+ }
+ );
+ my $patron = $builder->build_object({class => 'Koha::Patrons'});
+ my $checkout = AddIssue( $patron->unblessed, $item->barcode );
+
+ $checkout->claim_returned({ created_by => $patron->id });
+
+ my ( $doreturn, $messages, $issue ) = AddReturn($item->barcode);
+ ok( $messages->{ReturnClaims}, "ReturnClaims is in messages for return of a claimed as returned itm" );
+};
+
+subtest 'BranchTransferLimitsType' => sub {
+ plan tests => 2;
+
+ t::lib::Mocks::mock_preference('AutomaticItemReturn', 0);
+ t::lib::Mocks::mock_preference('UseBranchTransferLimits', 1);
+ t::lib::Mocks::mock_preference('BranchTransferLimitsType', 'ccode');
+
+ my $biblio = $builder->build_object( { class => 'Koha::Biblios' } );
+ my $item = $builder->build_object(
+ {
+ class => 'Koha::Items',
+ value => {
+ biblionumber => $biblio->biblionumber,
+ notforloan => 0,
+ itemlost => 0,
+ withdrawn => 0,
+ }
+ }
+ );
+ my $patron = $builder->build_object({class => 'Koha::Patrons'});
+ my $checkout = AddIssue( $patron->unblessed, $item->barcode );
+ my ( $doreturn, $messages, $issue ) = AddReturn($item->barcode);
+ is( $doreturn, 1, 'AddReturn should have checkin the item if BranchTransferLimitsType=ccode');
+
+ t::lib::Mocks::mock_preference('BranchTransferLimitsType', 'itemtype');
+ $checkout = AddIssue( $patron->unblessed, $item->barcode );
+ ( $doreturn, $messages, $issue ) = AddReturn($item->barcode);
+ is( $doreturn, 1, 'AddReturn should have checkin the item if BranchTransferLimitsType=itemtype');
+};
+
+subtest 'Backdated returns should reduce fine if needed' => sub {
+ plan tests => 1;
+
+ t::lib::Mocks::mock_preference( "CalculateFinesOnReturn", 0 );
+
+ my $biblio = $builder->build_object( { class => 'Koha::Biblios' } );
+ my $item = $builder->build_object(
+ {
+ class => 'Koha::Items',
+ value => {
+ biblionumber => $biblio->biblionumber,
+ notforloan => 0,
+ itemlost => 0,
+ withdrawn => 0,
+ }
+ }
+ );
+ my $patron = $builder->build_object({class => 'Koha::Patrons'});
+ my $checkout = AddIssue( $patron->unblessed, $item->barcode );
+ my $fine = Koha::Account::Line->new({
+ issue_id => $checkout->id,
+ borrowernumber => $patron->id,
+ itemnumber => $item->id,
+ date => dt_from_string(),
+ amount => 100,
+ amountoutstanding => 100,
+ debit_type_code => 'OVERDUE',
+ status => 'UNRETURNED',
+ timestamp => dt_from_string(),
+ manager_id => undef,
+ interface => 'cli',
+ branchcode => $patron->branchcode,
+ })->store();
+
+ my ( $doreturn, $messages, $issue ) = AddReturn($item->barcode, undef, undef, dt_from_string('1999-01-01') );
+
+ $fine->discard_changes;
+ is( $fine->amountoutstanding, '0.000000', "Fine was reduced correctly with a backdated return" );
+};
+
+$schema->storage->txn_rollback;
projects / srvgit / blobdiff