use Modern::Perl;
use utf8;
-use Test::More tests => 124;
+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;
use Koha::DateUtils;
use Koha::Database;
use Koha::IssuingRules;
+use Koha::Items;
use Koha::Checkouts;
use Koha::Patrons;
+use Koha::CirculationRules;
use Koha::Subscriptions;
use Koha::Account::Lines;
use Koha::Account::Offsets;
+use Koha::ActionLogs;
+
+sub set_userenv {
+ my ( $library ) = @_;
+ t::lib::Mocks::mock_userenv({ branchcode => $library->{branchcode} });
+}
+
+sub str {
+ my ( $error, $question, $alert ) = @_;
+ my $s;
+ $s = %$error ? ' (error: ' . join( ' ', keys %$error ) . ')' : '';
+ $s .= %$question ? ' (question: ' . join( ' ', keys %$question ) . ')' : '';
+ $s .= %$alert ? ' (alert: ' . join( ' ', keys %$alert ) . ')' : '';
+ return $s;
+}
+
+sub test_debarment_on_checkout {
+ my ($params) = @_;
+ my $item = $params->{item};
+ my $library = $params->{library};
+ my $patron = $params->{patron};
+ my $due_date = $params->{due_date} || dt_from_string;
+ my $return_date = $params->{return_date} || dt_from_string;
+ my $expected_expiration_date = $params->{expiration_date};
+
+ $expected_expiration_date = output_pref(
+ {
+ dt => $expected_expiration_date,
+ dateformat => 'sql',
+ dateonly => 1,
+ }
+ );
+ my @caller = caller;
+ my $line_number = $caller[2];
+ AddIssue( $patron, $item->{barcode}, $due_date );
+
+ my ( undef, $message ) = AddReturn( $item->{barcode}, $library->{branchcode}, undef, $return_date );
+ is( $message->{WasReturned} && exists $message->{Debarred}, 1, 'AddReturn must have debarred the patron' )
+ or diag('AddReturn returned message ' . Dumper $message );
+ my $debarments = Koha::Patron::Debarments::GetDebarments(
+ { borrowernumber => $patron->{borrowernumber}, type => 'SUSPENSION' } );
+ is( scalar(@$debarments), 1, 'Test at line ' . $line_number );
+
+ is( $debarments->[0]->{expiration},
+ $expected_expiration_date, 'Test at line ' . $line_number );
+ Koha::Patron::Debarments::DelUniqueDebarment(
+ { borrowernumber => $patron->{borrowernumber}, type => 'SUSPENSION' } );
+};
my $schema = Koha::Database->schema;
$schema->storage->txn_begin;
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;
source => 'Branch',
});
my $itemtype = $builder->build(
- { source => 'Itemtype',
- value => { notforloan => undef, rentalcharge => 0, defaultreplacecost => undef, processfee => undef }
+ {
+ source => 'Itemtype',
+ value => {
+ notforloan => undef,
+ rentalcharge => 0,
+ rentalcharge_daily => 0,
+ defaultreplacecost => undef,
+ processfee => undef
+ }
}
)->{itemtype};
my $patron_category = $builder->build(
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');
# Set a simple circ policy
$dbh->do('DELETE FROM issuingrules');
+Koha::CirculationRules->search()->delete();
$dbh->do(
q{INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed,
- maxissueqty, issuelength, lengthunit,
+ issuelength, lengthunit,
renewalsallowed, renewalperiod,
norenewalbefore, auto_renew,
fine, chargeperiod)
VALUES (?, ?, ?, ?,
- ?, ?, ?,
+ ?, ?,
?, ?,
?, ?,
?, ?
},
{},
'*', '*', '*', 25,
- 20, 14, 'days',
+ 14, 'days',
1, 7,
undef, 0,
.10, 1
my $passeddatedue1 = AddIssue($renewing_borrower, $item_7->barcode, $five_weeks_ago);
is (defined $passeddatedue1, 1, "Item with passed date due checked out, due date: " . $passeddatedue1->date_due);
- my ( $fine ) = CalcFine( GetItem(undef, $item_7->barcode), $renewing_borrower->{categorycode}, $branch, $five_weeks_ago, $now );
+ my ( $fine ) = CalcFine( $item_7->unblessed, $renewing_borrower->{categorycode}, $branch, $five_weeks_ago, $now );
C4::Overdues::UpdateFine(
{
issue_id => $passeddatedue1->id(),
);
t::lib::Mocks::mock_preference('RenewalLog', 0);
- my $date = output_pref( { dt => dt_from_string(), datenonly => 1, dateformat => 'iso' } );
- my $old_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["RENEWAL"]) } );
- AddRenewal( $renewing_borrower->{borrowernumber}, $item_7->itemnumber, $branch );
- my $new_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["RENEWAL"]) } );
+ my $date = output_pref( { dt => dt_from_string(), dateonly => 1, dateformat => 'iso' } );
+ my %params_renewal = (
+ timestamp => { -like => $date . "%" },
+ module => "CIRCULATION",
+ action => "RENEWAL",
+ );
+ my %params_issue = (
+ timestamp => { -like => $date . "%" },
+ module => "CIRCULATION",
+ action => "ISSUE"
+ );
+ my $old_log_size = Koha::ActionLogs->count( \%params_renewal );
+ 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(), datenonly => 1, dateformat => 'iso' } );
- $old_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["RENEWAL"]) } );
+ $date = output_pref( { dt => dt_from_string(), dateonly => 1, dateformat => 'iso' } );
+ $old_log_size = Koha::ActionLogs->count( \%params_renewal );
AddRenewal( $renewing_borrower->{borrowernumber}, $item_7->itemnumber, $branch );
- $new_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["RENEWAL"]) } );
+ $new_log_size = Koha::ActionLogs->count( \%params_renewal );
is ($new_log_size, $old_log_size + 1, 'renew log successfully added');
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();
- my $old_issue_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["ISSUE"]) } );
- my $old_renew_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["RENEWAL"]) } );
+ my $old_issue_log_size = Koha::ActionLogs->count( \%params_issue );
+ my $old_renew_log_size = Koha::ActionLogs->count( \%params_renewal );
AddIssue( $renewing_borrower,$item_7->barcode,Koha::DateUtils::output_pref({str=>$datedue6->date_due, dateformat =>'iso'}),0,$date, 0, undef );
- $new_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["RENEWAL"]) } );
+ $new_log_size = Koha::ActionLogs->count( \%params_renewal );
is ($new_log_size, $old_renew_log_size + 1, 'renew log successfully added when renewed via issuing');
- $new_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["ISSUE"]) } );
+ $new_log_size = Koha::ActionLogs->count( \%params_issue );
is ($new_log_size, $old_issue_log_size, 'renew not logged as issue when renewed via issuing');
$fines = Koha::Account::Lines->search( { borrowernumber => $renewing_borrower->{borrowernumber}, itemnumber => $item_7->itemnumber } );
C4::Context->set_preference('OPACFineNoRenewalsBlockAutoRenew','1');
C4::Context->set_preference('OPACFineNoRenewals','10');
my $fines_amount = 5;
- C4::Accounts::manualinvoice( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber}, "Some fines", 'F', $fines_amount );
+ my $account = Koha::Account->new({patron_id => $renewing_borrowernumber});
+ $account->add_debit(
+ {
+ amount => $fines_amount,
+ interface => 'test',
+ type => 'overdue',
+ item_id => $item_to_auto_renew->{itemnumber},
+ description => "Some fines"
+ }
+ )->status('RETURNED')->store;
( $renewokay, $error ) =
CanBookBeRenewed( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber} );
is( $renewokay, 0, 'Do not renew, renewal is automatic' );
is( $error, 'auto_renew', 'Can auto renew, OPACFineNoRenewals=10, patron has 5' );
- C4::Accounts::manualinvoice( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber}, "Some fines", 'F', $fines_amount );
+ $account->add_debit(
+ {
+ amount => $fines_amount,
+ interface => 'test',
+ type => 'overdue',
+ item_id => $item_to_auto_renew->{itemnumber},
+ description => "Some fines"
+ }
+ )->status('RETURNED')->store;
( $renewokay, $error ) =
CanBookBeRenewed( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber} );
is( $renewokay, 0, 'Do not renew, renewal is automatic' );
is( $error, 'auto_renew', 'Can auto renew, OPACFineNoRenewals=10, patron has 10' );
- C4::Accounts::manualinvoice( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber}, "Some fines", 'F', $fines_amount );
+ $account->add_debit(
+ {
+ amount => $fines_amount,
+ interface => 'test',
+ type => 'overdue',
+ item_id => $item_to_auto_renew->{itemnumber},
+ description => "Some fines"
+ }
+ )->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->lastincrement, '15.000000', 'Account line last increment is 15.00' );
+ 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" );
( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_7->itemnumber);
is( $renewokay, 0, '(Bug 8236), Cannot renew, one of the items is overdue');
+ my $manager = $builder->build_object({ class => "Koha::Patrons" });
+ t::lib::Mocks::mock_userenv({ patron => $manager,branchcode => $manager->branchcode });
t::lib::Mocks::mock_preference('WhenLostChargeReplacementFee','1');
$checkout = Koha::Checkouts->find( { itemnumber => $item_3->itemnumber } );
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"
+ );
}
{
$dbh->do('DELETE FROM issues');
$dbh->do('DELETE FROM items');
$dbh->do('DELETE FROM issuingrules');
+ Koha::CirculationRules->search()->delete();
$dbh->do(
q{
- INSERT INTO issuingrules ( categorycode, branchcode, itemtype, reservesallowed, maxissueqty, issuelength, lengthunit, renewalsallowed, renewalperiod,
- norenewalbefore, auto_renew, fine, chargeperiod ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )
+ INSERT INTO issuingrules ( categorycode, branchcode, itemtype, reservesallowed, issuelength, lengthunit, renewalsallowed, renewalperiod,
+ norenewalbefore, auto_renew, fine, chargeperiod ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )
},
{},
'*', '*', '*', 25,
- 20, 14, 'days',
+ 14, 'days',
1, 7,
undef, 0,
.10, 1
);
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => '*',
+ itemtype => '*',
+ branchcode => '*',
+ rules => {
+ maxissueqty => 20
+ }
+ }
+ );
my $biblio = $builder->build_sample_biblio();
my $item_1 = $builder->build_sample_item(
categorycode => '*',
itemtype => '*',
branchcode => '*',
- maxissueqty => 99,
issuelength => 1,
firstremind => 1, # 1 day of grace
finedays => 2, # 2 days of fine per day of overdue
; # Add another overdue
t::lib::Mocks::mock_preference( 'CumulativeRestrictionPeriods', '0' );
- AddReturn( $item_1->{barcode}, $library->{branchcode},
- undef, undef, dt_from_string );
+ AddReturn( $item_1->{barcode}, $library->{branchcode}, undef, dt_from_string );
my $debarments = Koha::Patron::Debarments::GetDebarments(
{ borrowernumber => $patron->{borrowernumber}, type => 'SUSPENSION' } );
is( scalar(@$debarments), 1 );
);
is( $debarments->[0]->{expiration}, $expected_expiration );
- AddReturn( $item_2->{barcode}, $library->{branchcode},
- undef, undef, dt_from_string );
+ AddReturn( $item_2->{barcode}, $library->{branchcode}, undef, dt_from_string );
$debarments = Koha::Patron::Debarments::GetDebarments(
{ borrowernumber => $patron->{borrowernumber}, type => 'SUSPENSION' } );
is( scalar(@$debarments), 1 );
AddIssue( $patron, $item_1->{barcode}, $five_days_ago ); # Add an overdue
AddIssue( $patron, $item_2->{barcode}, $ten_days_ago )
; # Add another overdue
- AddReturn( $item_1->{barcode}, $library->{branchcode},
- undef, undef, dt_from_string );
+ AddReturn( $item_1->{barcode}, $library->{branchcode}, undef, dt_from_string );
$debarments = Koha::Patron::Debarments::GetDebarments(
{ borrowernumber => $patron->{borrowernumber}, type => 'SUSPENSION' } );
is( scalar(@$debarments), 1 );
);
is( $debarments->[0]->{expiration}, $expected_expiration );
- AddReturn( $item_2->{barcode}, $library->{branchcode},
- undef, undef, dt_from_string );
+ AddReturn( $item_2->{barcode}, $library->{branchcode}, undef, dt_from_string );
$debarments = Koha::Patron::Debarments::GetDebarments(
{ borrowernumber => $patron->{borrowernumber}, type => 'SUSPENSION' } );
is( scalar(@$debarments), 1 );
categorycode => '*',
itemtype => '*',
branchcode => '*',
- maxissueqty => 99,
issuelength => 1,
firstremind => 0, # 0 day of grace
finedays => 2, # 2 days of fine per day of overdue
);
};
+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_type = $builder->build_object(
+ { class => 'Koha::ItemTypes',
+ value => {
+ notforloan => undef,
+ rentalcharge => 0,
+ defaultreplacecost => undef,
+ processfee => 0,
+ rentalcharge_daily => 0,
+ }
+ }
+ );
my $item = $builder->build(
{
source => 'Item',
itemlost => 0,
withdrawn => 0,
biblionumber => $biblioitem->{biblionumber},
+ replacementprice => 7,
+ itype => $item_type->itemtype
}
}
);
categorycode => '*',
itemtype => '*',
branchcode => '*',
- maxissueqty => 99,
issuelength => 6,
lengthunit => 'days',
fine => 1, # Charge 1 every day of overdue
);
$rule->store();
+ my $now = dt_from_string;
my $one_day_ago = dt_from_string->subtract( days => 1 );
my $five_days_ago = dt_from_string->subtract( days => 5 );
my $ten_days_ago = dt_from_string->subtract( days => 10 );
$patron = Koha::Patrons->find( $patron->{borrowernumber} );
- # No date specify, today will be used
+ # No return date specified, today will be used => 10 days overdue charged
AddIssue( $patron->unblessed, $item->{barcode}, $ten_days_ago ); # date due was 10d ago
AddReturn( $item->{barcode}, $library->{branchcode} );
is( int($patron->account->balance()), 10, 'Patron should have a charge of 10 (10 days x 1)' );
Koha::Account::Lines->search({ borrowernumber => $patron->borrowernumber })->delete;
- # specify return date 5 days before => no overdue
+ # specify return date 5 days before => no overdue charged
AddIssue( $patron->unblessed, $item->{barcode}, $five_days_ago ); # date due was 5d ago
- AddReturn( $item->{barcode}, $library->{branchcode}, undef, undef, $ten_days_ago );
+ AddReturn( $item->{barcode}, $library->{branchcode}, undef, $ten_days_ago );
is( int($patron->account->balance()), 0, 'AddReturn: pass return_date => no overdue' );
Koha::Account::Lines->search({ borrowernumber => $patron->borrowernumber })->delete;
- # specify return date 5 days later => overdue
+ # specify return date 5 days later => 5 days overdue charged
AddIssue( $patron->unblessed, $item->{barcode}, $ten_days_ago ); # date due was 10d ago
- AddReturn( $item->{barcode}, $library->{branchcode}, undef, undef, $five_days_ago );
+ AddReturn( $item->{barcode}, $library->{branchcode}, undef, $five_days_ago );
is( int($patron->account->balance()), 5, 'AddReturn: pass return_date => overdue' );
Koha::Account::Lines->search({ borrowernumber => $patron->borrowernumber })->delete;
- # specify dropbox date 5 days before => no overdue
- AddIssue( $patron->unblessed, $item->{barcode}, $five_days_ago ); # date due was 5d ago
- AddReturn( $item->{barcode}, $library->{branchcode}, undef, 1, undef, $ten_days_ago );
+ # specify return date 5 days later, specify exemptfine => no overdue charge
+ AddIssue( $patron->unblessed, $item->{barcode}, $ten_days_ago ); # date due was 10d ago
+ AddReturn( $item->{barcode}, $library->{branchcode}, 1, $five_days_ago );
is( int($patron->account->balance()), 0, 'AddReturn: pass return_date => no overdue' );
Koha::Account::Lines->search({ borrowernumber => $patron->borrowernumber })->delete;
- # 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}, undef, 1, undef, $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
- Koha::Account::Lines->search({ borrowernumber => $patron->borrowernumber })->delete;
+ subtest 'bug 22877' => sub {
+
+ plan tests => 3;
+
+ my $issue = AddIssue( $patron->unblessed, $item->{barcode}, $ten_days_ago ); # date due was 10d ago
+
+ # Fake fines cronjob on this checkout
+ my ($fine) =
+ CalcFine( $item, $patron->categorycode, $library->{branchcode},
+ $ten_days_ago, $now );
+ UpdateFine(
+ {
+ issue_id => $issue->issue_id,
+ itemnumber => $item->{itemnumber},
+ borrowernumber => $patron->borrowernumber,
+ amount => $fine,
+ due => output_pref($ten_days_ago)
+ }
+ );
+ is( int( $patron->account->balance() ),
+ 10, "Overdue fine of 10 days overdue" );
+
+ # Fake longoverdue with charge and not marking returned
+ LostItem( $item->{itemnumber}, 'cronjob', 0 );
+ is( int( $patron->account->balance() ),
+ 17, "Lost fine of 7 plus 10 days overdue" );
+
+ # Now we return it today
+ AddReturn( $item->{barcode}, $library->{branchcode} );
+ is( int( $patron->account->balance() ),
+ 17, "Should have a single 10 days overdue fine and lost charge" );
+ }
};
subtest '_FixAccountForLostAndReturned' => sub {
notforloan => undef,
rentalcharge => 0,
defaultreplacecost => undef,
- processfee => $processfee_amount
+ processfee => $processfee_amount,
+ rentalcharge_daily => 0,
}
}
);
plan tests => 10;
my $patron = $builder->build_object( { class => 'Koha::Patrons' } );
+ my $manager = $builder->build_object({ class => "Koha::Patrons" });
+ t::lib::Mocks::mock_userenv({ patron => $manager,branchcode => $manager->branchcode });
my $item = $builder->build_sample_item(
{
# Write off the debt
my $credit = $account->add_credit(
{ amount => $account->balance,
- type => 'writeoff'
+ type => 'writeoff',
+ interface => 'test',
}
);
$credit->apply( { debits => $debts, offset_type => 'Writeoff' } );
# Write off the debt
my $credit = $account->add_credit(
{ amount => $account->balance,
- type => 'payment'
+ type => 'payment',
+ interface => 'test',
}
);
$credit->apply( { debits => $debts, offset_type => 'Payment' } );
my $payment_amount = 27;
my $payment = $account->add_credit(
{ amount => $payment_amount,
- type => 'payment'
+ type => 'payment',
+ interface => 'test',
}
);
my $write_off_amount = 25;
my $write_off = $account->add_credit(
{ amount => $write_off_amount,
- type => 'writeoff'
+ type => 'writeoff',
+ interface => 'test',
}
);
$write_off->apply( { debits => $lost_fee_lines->reset, offset_type => 'Writeoff' } );
notforloan => undef,
rentalcharge => 0,
defaultreplacecost => undef,
- processfee => 0
+ processfee => 0,
+ rentalcharge_daily => 0,
}
}
);
my $payment_amount = 27;
my $payment = $account->add_credit(
{ amount => $payment_amount,
- type => 'payment'
+ type => 'payment',
+ interface => 'test',
}
);
$payment->apply({ debits => $lost_fee_lines->reset, offset_type => 'Payment' });
'Payment applied'
);
- # TODO use add_debit when time comes
my $manual_debit_amount = 80;
- C4::Accounts::manualinvoice( $patron->id, undef, undef, 'FU', $manual_debit_amount );
+ $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 => 10;
+ 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,
- lastincrement => 9.00,
+ interface => 'test',
}
)->store();
$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" );
-
- ## Run again, with dropbox mode enabled
- $accountline->set(
- {
- accounttype => 'FU',
- amountoutstanding => 99.00,
- }
- )->store();
-
- C4::Circulation::_FixOverduesOnReturn( $patron->{borrowernumber}, $item->itemnumber, 0, 1 );
-
- $accountline->_result()->discard_changes();
- $offset = Koha::Account::Offsets->search({ debit_id => $accountline->id, type => 'Dropbox' })->next();
-
- is( $accountline->amountoutstanding + 0, 90, 'Fine has been reduced to 90' );
- is( $accountline->accounttype, 'F', 'Open fine ( account type FU ) has been closed out ( account type F )');
- is( ref $offset, "Koha::Account::Offset", "Found matching offset for fine reduction via dropbox" );
- is( $offset->amount, '-9.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 {
#Check transfer exists and the items holding branch is the transfer destination branch before marking it as lost
my ($datesent,$frombranch,$tobranch) = GetTransfers($item->{itemnumber});
is( $tobranch, $library_2->{branchcode}, 'The transfer record exists in the branchtransfers table');
- my $itemcheck = GetItem($item->{itemnumber});
- is( $itemcheck->{holdingbranch}, $library_2->{branchcode}, 'Items holding branch is the transfers destination branch before it is marked as lost' );
+ my $itemcheck = Koha::Items->find($item->{itemnumber});
+ is( $itemcheck->holdingbranch, $library_2->{branchcode}, 'Items holding branch is the transfers destination branch before it is marked as lost' );
#Simulate item being marked as lost and confirm the transfer is deleted and the items holding branch is the transfers source branch
ModItem( { itemlost => 1 }, $biblio->{biblionumber}, $item->{itemnumber} );
LostItem( $item->{itemnumber}, 'test', 1 );
($datesent,$frombranch,$tobranch) = GetTransfers($item->{itemnumber});
is( $tobranch, undef, 'The transfer on the lost item has been deleted as the LostItemCancelOutstandingTransfer is enabled');
- $itemcheck = GetItem($item->{itemnumber});
- is( $itemcheck->{holdingbranch}, $library_1->{branchcode}, 'Lost item with cancelled hold has holding branch equallying the transfers source branch' );
+ $itemcheck = Koha::Items->find($item->{itemnumber});
+ is( $itemcheck->holdingbranch, $library_1->{branchcode}, 'Lost item with cancelled hold has holding branch equallying the transfers source branch' );
};
subtest 'CanBookBeIssued | is_overdue' => sub {
$dbh->do('DELETE FROM issuingrules');
$dbh->do(
q{INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed,
- maxissueqty, issuelength, lengthunit,
+ issuelength, lengthunit,
renewalsallowed, renewalperiod,
norenewalbefore, auto_renew,
fine, chargeperiod)
VALUES (?, ?, ?, ?,
- ?, ?, ?,
+ ?, ?,
?, ?,
?, ?,
?, ?
},
{},
'*', '*', '*', 25,
- 1, 14, 'days',
+ 14, 'days',
1, 7,
undef, 0,
.10, 1
my $idr_lib = $builder->build_object({ class => 'Koha::Libraries'});
$dbh->do(
q{
- INSERT INTO issuingrules ( categorycode, branchcode, itemtype, reservesallowed, maxissueqty, issuelength, lengthunit, renewalsallowed, renewalperiod,
- norenewalbefore, auto_renew, fine, chargeperiod ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )
+ INSERT INTO issuingrules ( categorycode, branchcode, itemtype, reservesallowed, issuelength, lengthunit, renewalsallowed, renewalperiod,
+ norenewalbefore, auto_renew, fine, chargeperiod ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )
},
{},
'*', $idr_lib->branchcode, '*', 25,
- 20, 14, 'days',
+ 14, 'days',
10, 7,
undef, 0,
.10, 1
is( $item->onloan, undef, 'AddReturn did clear items.onloan' );
};
-$schema->storage->txn_rollback;
-C4::Context->clear_syspref_cache();
-$cache->clear_from_cache('single_holidays');
subtest 'AddRenewal and AddIssuingCharge tests' => sub {
plan tests => 13;
- $schema->storage->txn_begin;
+
+ t::lib::Mocks::mock_preference('item-level_itypes', 1);
my $issuing_charges = 15;
my $title = 'A title';
);
my $library = $builder->build_object({ class => 'Koha::Libraries' });
- my $itemtype = $builder->build_object({ class => 'Koha::ItemTypes' });
+ my $itemtype = $builder->build_object({ class => 'Koha::ItemTypes', value => { rentalcharge_daily => 0.00 }});
my $patron = $builder->build_object({
class => 'Koha::Patrons',
value => { branchcode => $library->id }
);
my $item = Koha::Items->find( $item_id );
- my $items = Test::MockModule->new('C4::Items');
- $items->mock( GetItem => $item->unblessed );
my $context = Test::MockModule->new('C4::Context');
$context->mock( userenv => { branch => $library->id } );
# Check the item out
AddIssue( $patron->unblessed, $item->barcode );
-
t::lib::Mocks::mock_preference( 'RenewalLog', 0 );
- my $date = output_pref( { dt => dt_from_string(), datenonly => 1, dateformat => 'iso' } );
- my $old_log_size = scalar( @{ GetLogs( $date, $date, undef, ["CIRCULATION"], ["RENEWAL"] ) } );
+ my $date = output_pref( { dt => dt_from_string(), dateonly => 1, dateformat => 'iso' } );
+ my %params_renewal = (
+ timestamp => { -like => $date . "%" },
+ module => "CIRCULATION",
+ action => "RENEWAL",
+ );
+ my $old_log_size = Koha::ActionLogs->count( \%params_renewal );;
AddRenewal( $patron->id, $item->id, $library->id );
- my $new_log_size = scalar( @{ GetLogs( $date, $date, undef, ["CIRCULATION"], ["RENEWAL"] ) } );
+ 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' );
my $checkouts = $patron->checkouts;
unlike ( $checkouts->next->lastreneweddate, qr/00:00:00/, 'AddRenewal should set the renewal date with the time part');
t::lib::Mocks::mock_preference( 'RenewalLog', 1 );
- $date = output_pref( { dt => dt_from_string(), datenonly => 1, dateformat => 'iso' } );
- $old_log_size = scalar( @{ GetLogs( $date, $date, undef, ["CIRCULATION"], ["RENEWAL"] ) } );
+ $date = output_pref( { dt => dt_from_string(), dateonly => 1, dateformat => 'iso' } );
+ $old_log_size = Koha::ActionLogs->count( \%params_renewal );
AddRenewal( $patron->id, $item->id, $library->id );
- $new_log_size = scalar( @{ GetLogs( $date, $date, undef, ["CIRCULATION"], ["RENEWAL"] ) } );
+ $new_log_size = Koha::ActionLogs->count( \%params_renewal );
is( $new_log_size, $old_log_size + 1, 'renew log successfully added' );
my $lines = Koha::Account::Lines->search({
is( $line->branchcode, $library->id, 'AddRenewal correctly sets branchcode' );
is( $line->description, "Renewal of Rental Item $title $barcode", 'AddRenewal set a hardcoded description for the accountline' );
- $schema->storage->txn_rollback;
};
subtest 'ProcessOfflinePayment() tests' => sub {
plan tests => 4;
- $schema->storage->txn_begin;
my $amount = 123;
is( $line->amount+0, $amount * -1, 'amount picked from params' );
is( $line->branchcode, $library->id, 'branchcode set correctly' );
- $schema->storage->txn_rollback;
};
+subtest 'Incremented fee tests' => sub {
+ plan tests => 11;
+ t::lib::Mocks::mock_preference('item-level_itypes', 1);
-sub set_userenv {
- my ( $library ) = @_;
- t::lib::Mocks::mock_userenv({ branchcode => $library->{branchcode} });
-}
+ my $library = $builder->build_object( { class => 'Koha::Libraries' } )->store;
-sub str {
- my ( $error, $question, $alert ) = @_;
- my $s;
- $s = %$error ? ' (error: ' . join( ' ', keys %$error ) . ')' : '';
- $s .= %$question ? ' (question: ' . join( ' ', keys %$question ) . ')' : '';
- $s .= %$alert ? ' (alert: ' . join( ' ', keys %$alert ) . ')' : '';
- return $s;
-}
+ my $module = new Test::MockModule('C4::Context');
+ $module->mock('userenv', sub { { branch => $library->id } });
-sub test_debarment_on_checkout {
- my ($params) = @_;
- my $item = $params->{item};
- my $library = $params->{library};
- my $patron = $params->{patron};
- my $due_date = $params->{due_date} || dt_from_string;
- my $return_date = $params->{return_date} || dt_from_string;
- my $expected_expiration_date = $params->{expiration_date};
+ my $patron = $builder->build_object(
+ {
+ class => 'Koha::Patrons',
+ value => { categorycode => $patron_category->{categorycode} }
+ }
+ )->store;
- $expected_expiration_date = output_pref(
+ my $itemtype = $builder->build_object(
{
- dt => $expected_expiration_date,
- dateformat => 'sql',
- dateonly => 1,
+ class => 'Koha::ItemTypes',
+ value => {
+ notforloan => undef,
+ rentalcharge => 0,
+ rentalcharge_daily => 1.000000
+ }
+ }
+ )->store;
+
+ my $biblioitem = $builder->build( { source => 'Biblioitem' } );
+ my $item = $builder->build_object(
+ {
+ class => 'Koha::Items',
+ value => {
+ homebranch => $library->id,
+ holdingbranch => $library->id,
+ notforloan => 0,
+ itemlost => 0,
+ withdrawn => 0,
+ itype => $itemtype->id,
+ biblionumber => $biblioitem->{biblionumber},
+ biblioitemnumber => $biblioitem->{biblioitemnumber},
+ }
+ }
+ )->store;
+
+ is( $itemtype->rentalcharge_daily, '1.000000', 'Daily rental charge stored and retreived correctly' );
+ is( $item->effective_itemtype, $itemtype->id, "Itemtype set correctly for item");
+
+ my $dt_from = dt_from_string();
+ my $dt_to = dt_from_string()->add( days => 7 );
+ my $dt_to_renew = dt_from_string()->add( days => 13 );
+
+ t::lib::Mocks::mock_preference('finesCalendar', 'ignoreCalendar');
+ my $issue = AddIssue( $patron->unblessed, $item->barcode, $dt_to, undef, $dt_from );
+ my $accountline = Koha::Account::Lines->find({ itemnumber => $item->id });
+ is( $accountline->amount, '7.000000', "Daily rental charge calculated correctly with finesCalendar = ignoreCalendar" );
+ $accountline->delete();
+ AddRenewal( $patron->id, $item->id, $library->id, $dt_to_renew, $dt_to );
+ $accountline = Koha::Account::Lines->find({ itemnumber => $item->id });
+ is( $accountline->amount, '6.000000', "Daily rental charge calculated correctly with finesCalendar = ignoreCalendar, for renewal" );
+ $accountline->delete();
+ $issue->delete();
+
+ t::lib::Mocks::mock_preference('finesCalendar', 'noFinesWhenClosed');
+ $issue = AddIssue( $patron->unblessed, $item->barcode, $dt_to, undef, $dt_from );
+ $accountline = Koha::Account::Lines->find({ itemnumber => $item->id });
+ is( $accountline->amount, '7.000000', "Daily rental charge calculated correctly with finesCalendar = noFinesWhenClosed" );
+ $accountline->delete();
+ AddRenewal( $patron->id, $item->id, $library->id, $dt_to_renew, $dt_to );
+ $accountline = Koha::Account::Lines->find({ itemnumber => $item->id });
+ is( $accountline->amount, '6.000000', "Daily rental charge calculated correctly with finesCalendar = noFinesWhenClosed, for renewal" );
+ $accountline->delete();
+ $issue->delete();
+
+ my $calendar = C4::Calendar->new( branchcode => $library->id );
+ $calendar->insert_week_day_holiday(
+ weekday => 3,
+ title => 'Test holiday',
+ description => 'Test holiday'
+ );
+ $issue = AddIssue( $patron->unblessed, $item->barcode, $dt_to, undef, $dt_from );
+ $accountline = Koha::Account::Lines->find({ itemnumber => $item->id });
+ is( $accountline->amount, '6.000000', "Daily rental charge calculated correctly with finesCalendar = noFinesWhenClosed and closed Wednesdays" );
+ $accountline->delete();
+ AddRenewal( $patron->id, $item->id, $library->id, $dt_to_renew, $dt_to );
+ $accountline = Koha::Account::Lines->find({ itemnumber => $item->id });
+ is( $accountline->amount, '5.000000', "Daily rental charge calculated correctly with finesCalendar = noFinesWhenClosed and closed Wednesdays, for renewal" );
+ $accountline->delete();
+ $issue->delete();
+
+ $itemtype->rentalcharge('2.000000')->store;
+ is( $itemtype->rentalcharge, '2.000000', 'Rental charge updated and retreived correctly' );
+ $issue = AddIssue( $patron->unblessed, $item->barcode, $dt_to, undef, $dt_from);
+ my $accountlines = Koha::Account::Lines->search({ itemnumber => $item->id });
+ is( $accountlines->count, '2', "Fixed charge and accrued charge recorded distinctly");
+ $accountlines->delete();
+ AddRenewal( $patron->id, $item->id, $library->id, $dt_to_renew, $dt_to );
+ $accountlines = Koha::Account::Lines->search({ itemnumber => $item->id });
+ is( $accountlines->count, '2', "Fixed charge and accrued charge recorded distinctly, for renewal");
+ $accountlines->delete();
+ $issue->delete();
+};
+
+subtest 'CanBookBeIssued & RentalFeesCheckoutConfirmation' => sub {
+ plan tests => 2;
+
+ t::lib::Mocks::mock_preference('RentalFeesCheckoutConfirmation', 1);
+ t::lib::Mocks::mock_preference('item-level_itypes', 1);
+
+ my $library =
+ $builder->build_object( { class => 'Koha::Libraries' } )->store;
+ my $patron = $builder->build_object(
+ {
+ class => 'Koha::Patrons',
+ value => { categorycode => $patron_category->{categorycode} }
+ }
+ )->store;
+
+ my $itemtype = $builder->build_object(
+ {
+ class => 'Koha::ItemTypes',
+ value => {
+ notforloan => 0,
+ rentalcharge => 0,
+ rentalcharge_daily => 0
+ }
}
);
- my @caller = caller;
- my $line_number = $caller[2];
- AddIssue( $patron, $item->{barcode}, $due_date );
- my ( undef, $message ) = AddReturn( $item->{barcode}, $library->{branchcode},
- undef, undef, $return_date );
- is( $message->{WasReturned} && exists $message->{Debarred}, 1, 'AddReturn must have debarred the patron' )
- or diag('AddReturn returned message ' . Dumper $message );
- my $debarments = Koha::Patron::Debarments::GetDebarments(
- { borrowernumber => $patron->{borrowernumber}, type => 'SUSPENSION' } );
- is( scalar(@$debarments), 1, 'Test at line ' . $line_number );
+ my $biblioitem = $builder->build( { source => 'Biblioitem' } );
+ my $item = $builder->build_object(
+ {
+ class => 'Koha::Items',
+ value => {
+ homebranch => $library->id,
+ holdingbranch => $library->id,
+ notforloan => 0,
+ itemlost => 0,
+ withdrawn => 0,
+ itype => $itemtype->id,
+ biblionumber => $biblioitem->{biblionumber},
+ biblioitemnumber => $biblioitem->{biblioitemnumber},
+ }
+ }
+ )->store;
- is( $debarments->[0]->{expiration},
- $expected_expiration_date, 'Test at line ' . $line_number );
- Koha::Patron::Debarments::DelUniqueDebarment(
- { borrowernumber => $patron->{borrowernumber}, type => 'SUSPENSION' } );
-}
+ my ( $issuingimpossible, $needsconfirmation );
+ my $dt_from = dt_from_string();
+ my $dt_due = dt_from_string()->add( days => 3 );
+
+ $itemtype->rentalcharge('1.000000')->store;
+ ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->barcode, $dt_due, undef, undef, undef );
+ is_deeply( $needsconfirmation, { RENTALCHARGE => '1' }, 'Item needs rentalcharge confirmation to be issued' );
+ $itemtype->rentalcharge('0')->store;
+ $itemtype->rentalcharge_daily('1.000000')->store;
+ ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->barcode, $dt_due, undef, undef, undef );
+ is_deeply( $needsconfirmation, { RENTALCHARGE => '3' }, 'Item needs rentalcharge confirmation to be issued, increment' );
+ $itemtype->rentalcharge_daily('0')->store;
+};
+
+$schema->storage->txn_rollback;
+C4::Context->clear_syspref_cache();
+$cache->clear_from_cache('single_holidays');
projects / koha-equinox.git / blobdiff