use Modern::Perl;
use utf8;
-use Test::More tests => 125;
+use Test::More tests => 130;
use Test::MockModule;
use Data::Dumper;
use DateTime;
+use Time::Fake;
use POSIX qw( floor );
use t::lib::Mocks;
use t::lib::TestBuilder;
my $builder = t::lib::TestBuilder->new;
my $dbh = C4::Context->dbh;
+# Prevent random failures by mocking ->now
+my $now_value = DateTime->now();
+my $mocked_datetime = Test::MockModule->new('DateTime');
+$mocked_datetime->mock( 'now', sub { return $now_value->clone; } );
+
# Start transaction
$dbh->{RaiseError} = 1;
branchcode => $library2->{branchcode}
};
+t::lib::Mocks::mock_preference('AutoReturnCheckedOutItems', 0);
+
# No userenv, PickupLibrary
t::lib::Mocks::mock_preference('IndependentBranches', '0');
t::lib::Mocks::mock_preference('CircControl', 'PickupLibrary');
action => "ISSUE"
);
my $old_log_size = Koha::ActionLogs->count( \%params_renewal );
- AddRenewal( $renewing_borrower->{borrowernumber}, $item_7->itemnumber, $branch );
+ my $dt = dt_from_string();
+ Time::Fake->offset( $dt->epoch );
+ my $datedue1 = AddRenewal( $renewing_borrower->{borrowernumber}, $item_7->itemnumber, $branch );
my $new_log_size = Koha::ActionLogs->count( \%params_renewal );
is ($new_log_size, $old_log_size, 'renew log not added because of the syspref RenewalLog');
+ isnt (DateTime->compare($datedue1, $dt), 0, "AddRenewal returned a good duedate");
+ Time::Fake->reset;
t::lib::Mocks::mock_preference('RenewalLog', 1);
$date = output_pref( { dt => dt_from_string(), dateonly => 1, dateformat => 'iso' } );
my $fines = Koha::Account::Lines->search( { borrowernumber => $renewing_borrower->{borrowernumber}, itemnumber => $item_7->itemnumber } );
is( $fines->count, 2 );
- is( $fines->next->accounttype, 'F', 'Fine on renewed item is closed out properly' );
- is( $fines->next->accounttype, 'F', 'Fine on renewed item is closed out properly' );
+ isnt( $fines->next->status, 'UNRETURNED', 'Fine on renewed item is closed out properly' );
+ isnt( $fines->next->status, 'UNRETURNED', 'Fine on renewed item is closed out properly' );
$fines->delete();
{
amount => $fines_amount,
interface => 'test',
- type => 'fine',
+ type => 'overdue',
item_id => $item_to_auto_renew->{itemnumber},
description => "Some fines"
}
- )->accounttype('F')->store;
+ )->status('RETURNED')->store;
( $renewokay, $error ) =
CanBookBeRenewed( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber} );
is( $renewokay, 0, 'Do not renew, renewal is automatic' );
{
amount => $fines_amount,
interface => 'test',
- type => 'fine',
+ type => 'overdue',
item_id => $item_to_auto_renew->{itemnumber},
description => "Some fines"
}
- )->accounttype('F')->store;
+ )->status('RETURNED')->store;
( $renewokay, $error ) =
CanBookBeRenewed( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber} );
is( $renewokay, 0, 'Do not renew, renewal is automatic' );
{
amount => $fines_amount,
interface => 'test',
- type => 'fine',
+ type => 'overdue',
item_id => $item_to_auto_renew->{itemnumber},
description => "Some fines"
}
- )->accounttype('F')->store;
+ )->status('RETURNED')->store;
( $renewokay, $error ) =
CanBookBeRenewed( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber} );
is( $renewokay, 0, 'Do not renew, renewal is automatic' );
);
my $line = Koha::Account::Lines->search({ borrowernumber => $renewing_borrower->{borrowernumber} })->next();
- is( $line->accounttype, 'FU', 'Account line type is FU' );
+ is( $line->accounttype, 'OVERDUE', 'Account line type is OVERDUE' );
+ is( $line->status, 'UNRETURNED', 'Account line status is UNRETURNED' );
is( $line->amountoutstanding, '15.000000', 'Account line amount outstanding is 15.00' );
is( $line->amount, '15.000000', 'Account line amount is 15.00' );
is( $line->issue_id, $issue->id, 'Account line issue id matches' );
my $offset = Koha::Account::Offsets->search({ debit_id => $line->id })->next();
- is( $offset->type, 'Fine', 'Account offset type is Fine' );
+ is( $offset->type, 'OVERDUE', 'Account offset type is Fine' );
is( $offset->amount, '15.000000', 'Account offset amount is 15.00' );
t::lib::Mocks::mock_preference('WhenLostForgiveFine','0');
LostItem( $item_1->itemnumber, 'test', 1 );
$line = Koha::Account::Lines->find($line->id);
- is( $line->accounttype, 'F', 'Account type correctly changed from FU to F' );
+ is( $line->accounttype, 'OVERDUE', 'Account type remains as OVERDUE' );
+ isnt( $line->status, 'UNRETURNED', 'Account status correctly changed from UNRETURNED to RETURNED' );
my $item = Koha::Items->find($item_1->itemnumber);
ok( !$item->onloan(), "Lost item marked as returned has false onloan value" );
LostItem( $item_3->itemnumber, 'test', 0 );
my $accountline = Koha::Account::Lines->find( { itemnumber => $item_3->itemnumber } );
is( $accountline->issue_id, $checkout->id, "Issue id added for lost replacement fee charge" );
+ is(
+ $accountline->description,
+ sprintf( "%s %s %s",
+ $item_3->biblio->title || '',
+ $item_3->barcode || '',
+ $item_3->itemcallnumber || '' ),
+ "Account line description must not contain 'Lost Items ', but be title, barcode, itemcallnumber"
+ );
}
{
);
};
+subtest 'CanBookBeIssued + AutoReturnCheckedOutItems' => sub {
+ plan tests => 2;
+
+ my $library = $builder->build( { source => 'Branch' } );
+ my $patron1 = $builder->build_object(
+ {
+ class => 'Koha::Patrons',
+ value => {
+ branchcode => $library->{branchcode},
+ firstname => "Happy",
+ surname => "Gilmore",
+ }
+ }
+ );
+ my $patron2 = $builder->build_object(
+ {
+ class => 'Koha::Patrons',
+ value => {
+ branchcode => $library->{branchcode},
+ firstname => "Billy",
+ surname => "Madison",
+ }
+ }
+ );
+
+ C4::Context->_new_userenv('xxx');
+ C4::Context->set_userenv(0,0,0,'firstname','surname', $library->{branchcode}, 'Random Library', '', '', '');
+
+ my $biblioitem = $builder->build( { source => 'Biblioitem' } );
+ my $biblionumber = $biblioitem->{biblionumber};
+ my $item = $builder->build(
+ { source => 'Item',
+ value => {
+ homebranch => $library->{branchcode},
+ holdingbranch => $library->{branchcode},
+ notforloan => 0,
+ itemlost => 0,
+ withdrawn => 0,
+ biblionumber => $biblionumber,
+ }
+ }
+ );
+
+ my ( $error, $question, $alerts );
+ my $issue = AddIssue( $patron1->unblessed, $item->{barcode} );
+
+ t::lib::Mocks::mock_preference('AutoReturnCheckedOutItems', 0);
+ ( $error, $question, $alerts ) = CanBookBeIssued( $patron2, $item->{barcode} );
+ is( $question->{ISSUED_TO_ANOTHER}, 1, 'ISSUED_TO_ANOTHER question flag should be set if AutoReturnCheckedOutItems is disabled and item is checked out to another' );
+
+ t::lib::Mocks::mock_preference('AutoReturnCheckedOutItems', 1);
+ ( $error, $question, $alerts ) = CanBookBeIssued( $patron2, $item->{barcode} );
+ is( $alerts->{RETURNED_FROM_ANOTHER}->{patron}->borrowernumber, $patron1->borrowernumber, 'RETURNED_FROM_ANOTHER alert flag should be set if AutoReturnCheckedOutItems is enabled and item is checked out to another' );
+
+ t::lib::Mocks::mock_preference('AutoReturnCheckedOutItems', 0);
+};
+
+
subtest 'AddReturn | is_overdue' => sub {
plan tests => 5;
my $library = $builder->build( { source => 'Branch' } );
my $patron = $builder->build( { source => 'Borrower', value => { categorycode => $patron_category->{categorycode} } } );
+ my $manager = $builder->build_object({ class => "Koha::Patrons" });
+ t::lib::Mocks::mock_userenv({ patron => $manager, branchcode => $manager->branchcode });
my $biblioitem = $builder->build( { source => 'Biblioitem' } );
my $item = $builder->build(
# specify dropbox date 5 days later => overdue, or... not
AddIssue( $patron->unblessed, $item->{barcode}, $ten_days_ago ); # date due was 10d ago
AddReturn( $item->{barcode}, $library->{branchcode}, $five_days_ago );
- is( int($patron->account->balance()), 0, 'AddReturn: pass return_date => no overdue in dropbox mode' ); # FIXME? This is weird, the FU fine is created ( _CalculateAndUpdateFine > C4::Overdues::UpdateFine ) then remove later (in _FixOverduesOnReturn). Looks like it is a feature
+ is( int($patron->account->balance()), 0, 'AddReturn: pass return_date => no overdue in dropbox mode' ); # FIXME? This is weird, the OVERDUE fine is created ( _CalculateAndUpdateFine > C4::Overdues::UpdateFine ) then remove later (in _FixOverduesOnReturn). Looks like it is a feature
Koha::Account::Lines->search({ borrowernumber => $patron->borrowernumber })->delete;
};
);
my $manual_debit_amount = 80;
- $account->add_debit( { amount => $manual_debit_amount, type => 'fine', interface =>'test' } );
+ $account->add_debit( { amount => $manual_debit_amount, type => 'overdue', interface =>'test' } );
is( $account->balance, $manual_debit_amount + $replacement_amount - $payment_amount, 'Manual debit applied' );
is( $account->balance, $manual_debit_amount - $payment_amount, 'Balance is PF - payment (CR)' );
- my $manual_debit = Koha::Account::Lines->search({ borrowernumber => $patron->id, accounttype => 'FU' })->next;
+ my $manual_debit = Koha::Account::Lines->search({ borrowernumber => $patron->id, accounttype => 'OVERDUE', status => 'UNRETURNED' })->next;
is( $manual_debit->amountoutstanding + 0, $manual_debit_amount - $payment_amount, 'reconcile_balance was called' );
};
};
subtest '_FixOverduesOnReturn' => sub {
- plan tests => 6;
+ plan tests => 9;
+
+ my $manager = $builder->build_object({ class => "Koha::Patrons" });
+ t::lib::Mocks::mock_userenv({ patron => $manager, branchcode => $manager->branchcode });
my $biblio = $builder->build_sample_biblio({ author => 'Hall, Kylie' });
my $accountline = Koha::Account::Line->new(
{
borrowernumber => $patron->{borrowernumber},
- accounttype => 'FU',
+ accounttype => 'OVERDUE',
+ status => 'UNRETURNED',
itemnumber => $item->itemnumber,
amount => 99.00,
amountoutstanding => 99.00,
$accountline->_result()->discard_changes();
is( $accountline->amountoutstanding, '99.000000', 'Fine has the same amount outstanding as previously' );
- is( $accountline->accounttype, 'F', 'Open fine ( account type FU ) has been closed out ( account type F )');
-
+ is( $accountline->status, 'RETURNED', 'Open fine ( account type OVERDUE ) has been closed out ( status RETURNED )');
## Run again, with exemptfine enabled
$accountline->set(
{
- accounttype => 'FU',
+ accounttype => 'OVERDUE',
+ status => 'UNRETURNED',
amountoutstanding => 99.00,
}
)->store();
my $offset = Koha::Account::Offsets->search({ debit_id => $accountline->id, type => 'Forgiven' })->next();
is( $accountline->amountoutstanding + 0, 0, 'Fine has been reduced to 0' );
- is( $accountline->accounttype, 'FFOR', 'Open fine ( account type FU ) has been set to fine forgiven ( account type FFOR )');
+ is( $accountline->status, 'FORGIVEN', 'Open fine ( account type OVERDUE ) has been set to fine forgiven ( status FORGIVEN )');
is( ref $offset, "Koha::Account::Offset", "Found matching offset for fine reduction via forgiveness" );
is( $offset->amount, '-99.000000', "Amount of offset is correct" );
+ my $credit = $offset->credit;
+ is( ref $credit, "Koha::Account::Line", "Found matching credit for fine forgiveness" );
+ is( $credit->amount, '-99.000000', "Credit amount is set correctly" );
+ is( $credit->amountoutstanding + 0, 0, "Credit amountoutstanding is correctly set to 0" );
};
subtest 'Set waiting flag' => sub {
projects / srvgit / blobdiff