# along with Koha; if not, see <http://www.gnu.org/licenses>.
use Modern::Perl;
+use utf8;
-use Test::More tests => 122;
+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 C4::Accounts;
use C4::Calendar;
use C4::Circulation;
use C4::Biblio;
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');
);
# Now, set a userenv
-C4::Context->_new_userenv('xxx');
-C4::Context->set_userenv(0,0,0,'firstname','surname', $library2->{branchcode}, 'Midway Public Library', '', '', '');
+t::lib::Mocks::mock_userenv({ branchcode => $library2->{branchcode} });
is(C4::Context->userenv->{branch}, $library2->{branchcode}, 'userenv set');
# Userenv set, 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
);
-# Test C4::Circulation::ProcessOfflinePayment
-my $sth = C4::Context->dbh->prepare("SELECT COUNT(*) FROM accountlines WHERE amount = '-123.45' AND accounttype = 'Pay'");
-$sth->execute();
-my ( $original_count ) = $sth->fetchrow_array();
-
-C4::Context->dbh->do("INSERT INTO borrowers ( cardnumber, surname, firstname, categorycode, branchcode ) VALUES ( '99999999999', 'Hall', 'Kyle', ?, ? )", undef, $patron_category->{categorycode}, $library2->{branchcode} );
-
-C4::Circulation::ProcessOfflinePayment({ cardnumber => '99999999999', amount => '123.45' });
-
-$sth->execute();
-my ( $new_count ) = $sth->fetchrow_array();
-
-ok( $new_count == $original_count + 1, 'ProcessOfflinePayment makes payment correctly' );
-
-C4::Context->dbh->do("DELETE FROM accountlines WHERE borrowernumber IN ( SELECT borrowernumber FROM borrowers WHERE cardnumber = '99999999999' )");
-C4::Context->dbh->do("DELETE FROM borrowers WHERE cardnumber = '99999999999'");
-C4::Context->dbh->do("DELETE FROM accountlines");
+my ( $reused_itemnumber_1, $reused_itemnumber_2 );
{
# CanBookBeRenewed tests
C4::Context->set_preference('ItemsDeniedRenewal','');
# Generate test biblio
- my $title = 'Silence in the library';
- my ($biblionumber, $biblioitemnumber) = add_biblio($title, 'Moffat, Steven');
+ my $biblio = $builder->build_sample_biblio();
- my $barcode = 'R00000342';
my $branch = $library2->{branchcode};
- my ( $item_bibnum, $item_bibitemnum, $itemnumber ) = AddItem(
+ my $item_1 = $builder->build_sample_item(
{
- homebranch => $branch,
- holdingbranch => $branch,
- barcode => $barcode,
+ biblionumber => $biblio->biblionumber,
+ library => $branch,
replacementprice => 12.00,
itype => $itemtype
- },
- $biblionumber
+ }
);
+ $reused_itemnumber_1 = $item_1->itemnumber;
- my $barcode2 = 'R00000343';
- my ( $item_bibnum2, $item_bibitemnum2, $itemnumber2 ) = AddItem(
+ my $item_2 = $builder->build_sample_item(
{
- homebranch => $branch,
- holdingbranch => $branch,
- barcode => $barcode2,
+ biblionumber => $biblio->biblionumber,
+ library => $branch,
replacementprice => 23.00,
itype => $itemtype
- },
- $biblionumber
+ }
);
+ $reused_itemnumber_2 = $item_2->itemnumber;
- my $barcode3 = 'R00000346';
- my ( $item_bibnum3, $item_bibitemnum3, $itemnumber3 ) = AddItem(
+ my $item_3 = $builder->build_sample_item(
{
- homebranch => $branch,
- holdingbranch => $branch,
- barcode => $barcode3,
+ biblionumber => $biblio->biblionumber,
+ library => $branch,
replacementprice => 23.00,
itype => $itemtype
- },
- $biblionumber
+ }
);
# Create borrowers
my $checkitem = undef;
my $found = undef;
- my $issue = AddIssue( $renewing_borrower, $barcode);
+ my $issue = AddIssue( $renewing_borrower, $item_1->barcode);
my $datedue = dt_from_string( $issue->date_due() );
is (defined $issue->date_due(), 1, "Item 1 checked out, due date: " . $issue->date_due() );
- my $issue2 = AddIssue( $renewing_borrower, $barcode2);
+ my $issue2 = AddIssue( $renewing_borrower, $item_2->barcode);
$datedue = dt_from_string( $issue->date_due() );
is (defined $issue2, 1, "Item 2 checked out, due date: " . $issue2->date_due());
- my $borrowing_borrowernumber = Koha::Checkouts->find( { itemnumber => $itemnumber } )->borrowernumber;
+ my $borrowing_borrowernumber = Koha::Checkouts->find( { itemnumber => $item_1->itemnumber } )->borrowernumber;
is ($borrowing_borrowernumber, $renewing_borrowernumber, "Item checked out to $renewing_borrower->{firstname} $renewing_borrower->{surname}");
- my ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber, 1);
+ my ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_1->itemnumber, 1);
is( $renewokay, 1, 'Can renew, no holds for this title or item');
# Biblio-level hold, renewal test
AddReserve(
- $branch, $reserving_borrowernumber, $biblionumber,
+ $branch, $reserving_borrowernumber, $biblio->biblionumber,
$bibitems, $priority, $resdate, $expdate, $notes,
- $title, $checkitem, $found
+ 'a title', $checkitem, $found
);
# Testing of feature to allow the renewal of reserved items if other items on the record can fill all needed holds
C4::Context->dbh->do("UPDATE issuingrules SET onshelfholds = 1");
t::lib::Mocks::mock_preference('AllowRenewalIfOtherItemsAvailable', 1 );
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber);
+ ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_1->itemnumber);
is( $renewokay, 1, 'Bug 11634 - Allow renewal of item with unfilled holds if other available items can fill those holds');
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber2);
+ ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_2->itemnumber);
is( $renewokay, 1, 'Bug 11634 - Allow renewal of item with unfilled holds if other available items can fill those holds');
# Now let's add an item level hold, we should no longer be able to renew the item
my $hold = Koha::Database->new()->schema()->resultset('Reserve')->create(
{
borrowernumber => $hold_waiting_borrowernumber,
- biblionumber => $biblionumber,
- itemnumber => $itemnumber,
+ biblionumber => $biblio->biblionumber,
+ itemnumber => $item_1->itemnumber,
branchcode => $branch,
priority => 3,
}
);
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber);
+ ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_1->itemnumber);
is( $renewokay, 0, 'Bug 13919 - Renewal possible with item level hold on item');
$hold->delete();
$hold = Koha::Database->new()->schema()->resultset('Reserve')->create(
{
borrowernumber => $hold_waiting_borrowernumber,
- biblionumber => $biblionumber,
- itemnumber => $itemnumber3,
+ biblionumber => $biblio->biblionumber,
+ itemnumber => $item_3->itemnumber,
branchcode => $branch,
priority => 0,
found => 'W'
}
);
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber);
+ ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_1->itemnumber);
is( $renewokay, 0, 'Bug 11634 - Allow renewal of item with unfilled holds if other available items can fill those holds');
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber2);
+ ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_2->itemnumber);
is( $renewokay, 0, 'Bug 11634 - Allow renewal of item with unfilled holds if other available items can fill those holds');
t::lib::Mocks::mock_preference('AllowRenewalIfOtherItemsAvailable', 0 );
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber);
+ ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_1->itemnumber);
is( $renewokay, 0, '(Bug 10663) Cannot renew, reserved');
is( $error, 'on_reserve', '(Bug 10663) Cannot renew, reserved (returned error is on_reserve)');
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber2);
+ ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_2->itemnumber);
is( $renewokay, 0, '(Bug 10663) Cannot renew, reserved');
is( $error, 'on_reserve', '(Bug 10663) Cannot renew, reserved (returned error is on_reserve)');
- my $reserveid = Koha::Holds->search({ biblionumber => $biblionumber, borrowernumber => $reserving_borrowernumber })->next->reserve_id;
+ my $reserveid = Koha::Holds->search({ biblionumber => $biblio->biblionumber, borrowernumber => $reserving_borrowernumber })->next->reserve_id;
my $reserving_borrower = Koha::Patrons->find( $reserving_borrowernumber )->unblessed;
- AddIssue($reserving_borrower, $barcode3);
+ AddIssue($reserving_borrower, $item_3->barcode);
my $reserve = $dbh->selectrow_hashref(
'SELECT * FROM old_reserves WHERE reserve_id = ?',
{ Slice => {} },
# Item-level hold, renewal test
AddReserve(
- $branch, $reserving_borrowernumber, $biblionumber,
+ $branch, $reserving_borrowernumber, $biblio->biblionumber,
$bibitems, $priority, $resdate, $expdate, $notes,
- $title, $itemnumber, $found
+ 'a title', $item_1->itemnumber, $found
);
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber, 1);
+ ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_1->itemnumber, 1);
is( $renewokay, 0, '(Bug 10663) Cannot renew, item reserved');
is( $error, 'on_reserve', '(Bug 10663) Cannot renew, item reserved (returned error is on_reserve)');
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber2, 1);
+ ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_2->itemnumber, 1);
is( $renewokay, 1, 'Can renew item 2, item-level hold is on item 1');
# Items can't fill hold for reasons
- ModItem({ notforloan => 1 }, $biblionumber, $itemnumber);
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber, 1);
+ ModItem({ notforloan => 1 }, $biblio->biblionumber, $item_1->itemnumber);
+ ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_1->itemnumber, 1);
is( $renewokay, 1, 'Can renew, item is marked not for loan, hold does not block');
- ModItem({ notforloan => 0, itype => $itemtype }, $biblionumber, $itemnumber);
+ ModItem({ notforloan => 0, itype => $itemtype }, $biblio->biblionumber, $item_1->itemnumber);
# FIXME: Add more for itemtype not for loan etc.
# Restricted users cannot renew when RestrictionBlockRenewing is enabled
- my $barcode5 = 'R00000347';
- my ( $item_bibnum5, $item_bibitemnum5, $itemnumber5 ) = AddItem(
+ my $item_5 = $builder->build_sample_item(
{
- homebranch => $branch,
- holdingbranch => $branch,
- barcode => $barcode5,
+ biblionumber => $biblio->biblionumber,
+ library => $branch,
replacementprice => 23.00,
- itype => $itemtype
- },
- $biblionumber
+ itype => $itemtype,
+ }
);
- my $datedue5 = AddIssue($restricted_borrower, $barcode5);
+ my $datedue5 = AddIssue($restricted_borrower, $item_5->barcode);
is (defined $datedue5, 1, "Item with date due checked out, due date: $datedue5");
t::lib::Mocks::mock_preference('RestrictionBlockRenewing','1');
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber2);
+ ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_2->itemnumber);
is( $renewokay, 1, '(Bug 8236), Can renew, user is not restricted');
- ( $renewokay, $error ) = CanBookBeRenewed($restricted_borrowernumber, $itemnumber5);
+ ( $renewokay, $error ) = CanBookBeRenewed($restricted_borrowernumber, $item_5->itemnumber);
is( $renewokay, 0, '(Bug 8236), Cannot renew, user is restricted');
# Users cannot renew an overdue item
- my $barcode6 = 'R00000348';
- my ( $item_bibnum6, $item_bibitemnum6, $itemnumber6 ) = AddItem(
+ my $item_6 = $builder->build_sample_item(
{
- homebranch => $branch,
- holdingbranch => $branch,
- barcode => $barcode6,
+ biblionumber => $biblio->biblionumber,
+ library => $branch,
replacementprice => 23.00,
- itype => $itemtype
- },
- $biblionumber
+ itype => $itemtype,
+ }
);
- my $barcode7 = 'R00000349';
- my ( $item_bibnum7, $item_bibitemnum7, $itemnumber7 ) = AddItem(
+ my $item_7 = $builder->build_sample_item(
{
- homebranch => $branch,
- holdingbranch => $branch,
- barcode => $barcode7,
+ biblionumber => $biblio->biblionumber,
+ library => $branch,
replacementprice => 23.00,
- itype => $itemtype
- },
- $biblionumber
+ itype => $itemtype,
+ }
);
- my $datedue6 = AddIssue( $renewing_borrower, $barcode6);
+
+ my $datedue6 = AddIssue( $renewing_borrower, $item_6->barcode);
is (defined $datedue6, 1, "Item 2 checked out, due date: ".$datedue6->date_due);
my $now = dt_from_string();
my $five_weeks_ago = $now - $five_weeks;
t::lib::Mocks::mock_preference('finesMode', 'production');
- my $passeddatedue1 = AddIssue($renewing_borrower, $barcode7, $five_weeks_ago);
+ 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, $barcode7), $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(),
- itemnumber => $itemnumber7,
+ itemnumber => $item_7->itemnumber,
borrowernumber => $renewing_borrower->{borrowernumber},
amount => $fine,
- type => 'FU',
due => Koha::DateUtils::output_pref($five_weeks_ago)
}
);
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}, $itemnumber7, $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"]) } );
- AddRenewal( $renewing_borrower->{borrowernumber}, $itemnumber7, $branch );
- $new_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 = 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 => $itemnumber7 } );
+ 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"]) } );
- AddIssue( $renewing_borrower,$barcode7,Koha::DateUtils::output_pref({str=>$datedue6->date_due, dateformat =>'iso'}),0,$date, 0, undef );
- $new_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 = 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 => $itemnumber7 } );
+ $fines = Koha::Account::Lines->search( { borrowernumber => $renewing_borrower->{borrowernumber}, itemnumber => $item_7->itemnumber } );
$fines->delete();
t::lib::Mocks::mock_preference('OverduesBlockRenewing','blockitem');
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber6);
+ ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_6->itemnumber);
is( $renewokay, 1, '(Bug 8236), Can renew, this item is not overdue');
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber7);
+ ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_7->itemnumber);
is( $renewokay, 0, '(Bug 8236), Cannot renew, this item is overdue');
- $hold = Koha::Holds->search({ biblionumber => $biblionumber, borrowernumber => $reserving_borrowernumber })->next;
+ $hold = Koha::Holds->search({ biblionumber => $biblio->biblionumber, borrowernumber => $reserving_borrowernumber })->next;
$hold->cancel;
# Bug 14101
# Test automatic renewal before value for "norenewalbefore" in policy is set
# In this case automatic renewal is not permitted prior to due date
- my $barcode4 = '11235813';
- my ( $item_bibnum4, $item_bibitemnum4, $itemnumber4 ) = AddItem(
+ my $item_4 = $builder->build_sample_item(
{
- homebranch => $branch,
- holdingbranch => $branch,
- barcode => $barcode4,
+ biblionumber => $biblio->biblionumber,
+ library => $branch,
replacementprice => 16.00,
- itype => $itemtype
- },
- $biblionumber
+ itype => $itemtype,
+ }
);
- $issue = AddIssue( $renewing_borrower, $barcode4, undef, undef, undef, undef, { auto_renew => 1 } );
+ $issue = AddIssue( $renewing_borrower, $item_4->barcode, undef, undef, undef, undef, { auto_renew => 1 } );
( $renewokay, $error ) =
- CanBookBeRenewed( $renewing_borrowernumber, $itemnumber4 );
+ CanBookBeRenewed( $renewing_borrowernumber, $item_4->itemnumber );
is( $renewokay, 0, 'Bug 14101: Cannot renew, renewal is automatic and premature' );
is( $error, 'auto_too_soon',
'Bug 14101: Cannot renew, renewal is automatic and premature, "No renewal before" = undef (returned code is auto_too_soon)' );
# Test premature manual renewal
$dbh->do('UPDATE issuingrules SET norenewalbefore = 7');
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber);
+ ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_1->itemnumber);
is( $renewokay, 0, 'Bug 7413: Cannot renew, renewal is premature');
is( $error, 'too_soon', 'Bug 7413: Cannot renew, renewal is premature (returned code is too_soon)');
# Test 'exact time' setting for syspref NoRenewalBeforePrecision
t::lib::Mocks::mock_preference( 'NoRenewalBeforePrecision', 'exact_time' );
is(
- GetSoonestRenewDate( $renewing_borrowernumber, $itemnumber ),
+ GetSoonestRenewDate( $renewing_borrowernumber, $item_1->itemnumber ),
$datedue->clone->add( days => -7 ),
'Bug 14395: Renewals permitted 7 days before due date, as expected'
);
# Test 'date' setting for syspref NoRenewalBeforePrecision
t::lib::Mocks::mock_preference( 'NoRenewalBeforePrecision', 'date' );
is(
- GetSoonestRenewDate( $renewing_borrowernumber, $itemnumber ),
+ GetSoonestRenewDate( $renewing_borrowernumber, $item_1->itemnumber ),
$datedue->clone->add( days => -7 )->truncate( to => 'day' ),
'Bug 14395: Renewals permitted 7 days before due date, as expected'
);
# Bug 14101
# Test premature automatic renewal
( $renewokay, $error ) =
- CanBookBeRenewed( $renewing_borrowernumber, $itemnumber4 );
+ CanBookBeRenewed( $renewing_borrowernumber, $item_4->itemnumber );
is( $renewokay, 0, 'Bug 14101: Cannot renew, renewal is automatic and premature' );
is( $error, 'auto_too_soon',
'Bug 14101: Cannot renew, renewal is automatic and premature (returned code is auto_too_soon)'
# and test automatic renewal again
$dbh->do('UPDATE issuingrules SET norenewalbefore = 0');
( $renewokay, $error ) =
- CanBookBeRenewed( $renewing_borrowernumber, $itemnumber4 );
+ CanBookBeRenewed( $renewing_borrowernumber, $item_4->itemnumber );
is( $renewokay, 0, 'Bug 14101: Cannot renew, renewal is automatic and premature' );
is( $error, 'auto_too_soon',
'Bug 14101: Cannot renew, renewal is automatic and premature, "No renewal before" = 0 (returned code is auto_too_soon)'
# and test automatic renewal again
$dbh->do('UPDATE issuingrules SET norenewalbefore = 99');
( $renewokay, $error ) =
- CanBookBeRenewed( $renewing_borrowernumber, $itemnumber4 );
+ CanBookBeRenewed( $renewing_borrowernumber, $item_4->itemnumber );
is( $renewokay, 0, 'Bug 14101: Cannot renew, renewal is automatic' );
is( $error, 'auto_renew',
'Bug 14101: Cannot renew, renewal is automatic (returned code is auto_renew)'
my $item_to_auto_renew = $builder->build(
{ source => 'Item',
value => {
- biblionumber => $biblionumber,
+ biblionumber => $biblio->biblionumber,
homebranch => $branch,
holdingbranch => $branch,
}
my $item_to_auto_renew = $builder->build({
source => 'Item',
value => {
- biblionumber => $biblionumber,
+ biblionumber => $biblio->biblionumber,
homebranch => $branch,
holdingbranch => $branch,
}
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 $item_to_auto_renew = $builder->build({
source => 'Item',
value => {
- biblionumber => $biblionumber,
+ biblionumber => $biblio->biblionumber,
homebranch => $branch,
holdingbranch => $branch,
}
my $item_to_auto_renew = $builder->build(
{ source => 'Item',
value => {
- biblionumber => $biblionumber,
+ biblionumber => $biblio->biblionumber,
homebranch => $branch,
holdingbranch => $branch,
}
# set policy to forbid renewals
$dbh->do('UPDATE issuingrules SET norenewalbefore = NULL, renewalsallowed = 0');
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber);
+ ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_1->itemnumber);
is( $renewokay, 0, 'Cannot renew, 0 renewals allowed');
is( $error, 'too_many', 'Cannot renew, 0 renewals allowed (returned code is too_many)');
C4::Overdues::UpdateFine(
{
issue_id => $issue->id(),
- itemnumber => $itemnumber,
+ itemnumber => $item_1->itemnumber,
borrowernumber => $renewing_borrower->{borrowernumber},
amount => 15.00,
type => q{},
);
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');
t::lib::Mocks::mock_preference('WhenLostChargeReplacementFee','0');
- LostItem( $itemnumber, 'test', 1 );
+ 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::Database->new()->schema()->resultset('Item')->find($itemnumber);
+ my $item = Koha::Items->find($item_1->itemnumber);
ok( !$item->onloan(), "Lost item marked as returned has false onloan value" );
- my $checkout = Koha::Checkouts->find({ itemnumber => $itemnumber });
+ my $checkout = Koha::Checkouts->find({ itemnumber => $item_1->itemnumber });
is( $checkout, undef, 'LostItem called with forced return has checked in the item' );
my $total_due = $dbh->selectrow_array(
C4::Overdues::UpdateFine(
{
issue_id => $issue2->id(),
- itemnumber => $itemnumber2,
+ itemnumber => $item_2->itemnumber,
borrowernumber => $renewing_borrower->{borrowernumber},
amount => 15.00,
type => q{},
}
);
- LostItem( $itemnumber2, 'test', 0 );
+ LostItem( $item_2->itemnumber, 'test', 0 );
- my $item2 = Koha::Database->new()->schema()->resultset('Item')->find($itemnumber2);
+ my $item2 = Koha::Items->find($item_2->itemnumber);
ok( $item2->onloan(), "Lost item *not* marked as returned has true onloan value" );
- ok( Koha::Checkouts->find({ itemnumber => $itemnumber2 }), 'LostItem called without forced return has checked in the item' );
+ ok( Koha::Checkouts->find({ itemnumber => $item_2->itemnumber }), 'LostItem called without forced return has checked in the item' );
$total_due = $dbh->selectrow_array(
'SELECT SUM( amountoutstanding ) FROM accountlines WHERE borrowernumber = ?',
# Users cannot renew any item if there is an overdue item
t::lib::Mocks::mock_preference('OverduesBlockRenewing','block');
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber6);
+ ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_6->itemnumber);
is( $renewokay, 0, '(Bug 8236), Cannot renew, one of the items is overdue');
- ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber7);
+ ( $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 => $itemnumber3 } );
- LostItem( $itemnumber3, 'test', 0 );
- my $accountline = Koha::Account::Lines->find( { itemnumber => $itemnumber3 } );
+ $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"
+ );
}
{
# GetUpcomingDueIssues tests
- my $barcode = 'R00000342';
- my $barcode2 = 'R00000343';
- my $barcode3 = 'R00000344';
my $branch = $library2->{branchcode};
#Create another record
- my $title2 = 'Something is worng here';
- my ($biblionumber2, $biblioitemnumber2) = add_biblio($title2, 'Anonymous');
+ my $biblio2 = $builder->build_sample_biblio();
#Create third item
- AddItem(
+ my $item_1 = Koha::Items->find($reused_itemnumber_1);
+ my $item_2 = Koha::Items->find($reused_itemnumber_2);
+ my $item_3 = $builder->build_sample_item(
{
- homebranch => $branch,
- holdingbranch => $branch,
- barcode => $barcode3,
- itype => $itemtype
- },
- $biblionumber2
+ biblionumber => $biblio2->biblionumber,
+ library => $branch,
+ itype => $itemtype,
+ }
);
+
# Create a borrower
my %a_borrower_data = (
firstname => 'Fridolyn',
my $two_days_ahead = DateTime->today(time_zone => C4::Context->tz())->add( days => 2 );
my $today = DateTime->today(time_zone => C4::Context->tz());
- my $issue = AddIssue( $a_borrower, $barcode, $yesterday );
+ my $issue = AddIssue( $a_borrower, $item_1->barcode, $yesterday );
my $datedue = dt_from_string( $issue->date_due() );
- my $issue2 = AddIssue( $a_borrower, $barcode2, $two_days_ahead );
+ my $issue2 = AddIssue( $a_borrower, $item_2->barcode, $two_days_ahead );
my $datedue2 = dt_from_string( $issue->date_due() );
my $upcoming_dues;
# Bug 11218 - Due notices not generated - GetUpcomingDueIssues needs to select due today items as well
- my $issue3 = AddIssue( $a_borrower, $barcode3, $today );
+ my $issue3 = AddIssue( $a_borrower, $item_3->barcode, $today );
$upcoming_dues = C4::Circulation::GetUpcomingDueIssues( { days_in_advance => -1 } );
is ( scalar ( @$upcoming_dues), 0, "Overdues can not be selected" );
}
{
- my $barcode = '1234567890';
my $branch = $library2->{branchcode};
- my ($biblionumber, $biblioitemnumber) = add_biblio();
+ my $biblio = $builder->build_sample_biblio();
#Create third item
- my ( undef, undef, $itemnumber ) = AddItem(
+ my $item = $builder->build_sample_item(
{
- homebranch => $branch,
- holdingbranch => $branch,
- barcode => $barcode,
- itype => $itemtype
- },
- $biblionumber
+ biblionumber => $biblio->biblionumber,
+ library => $branch,
+ itype => $itemtype,
+ }
);
# Create a borrower
my $borrowernumber = Koha::Patron->new(\%a_borrower_data)->store->borrowernumber;
my $borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
- my $issue = AddIssue( $borrower, $barcode );
+ my $issue = AddIssue( $borrower, $item->barcode );
UpdateFine(
{
issue_id => $issue->id(),
- itemnumber => $itemnumber,
+ itemnumber => $item->itemnumber,
borrowernumber => $borrowernumber,
amount => 0,
type => q{}
}
);
- my $hr = $dbh->selectrow_hashref(q{SELECT COUNT(*) AS count FROM accountlines WHERE borrowernumber = ? AND itemnumber = ?}, undef, $borrowernumber, $itemnumber );
+ my $hr = $dbh->selectrow_hashref(q{SELECT COUNT(*) AS count FROM accountlines WHERE borrowernumber = ? AND itemnumber = ?}, undef, $borrowernumber, $item->itemnumber );
my $count = $hr->{count};
is ( $count, 0, "Calling UpdateFine on non-existant fine with an amount of 0 does not result in an empty fine" );
$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
);
- my ( $biblionumber, $biblioitemnumber ) = add_biblio();
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => '*',
+ itemtype => '*',
+ branchcode => '*',
+ rules => {
+ maxissueqty => 20
+ }
+ }
+ );
+ my $biblio = $builder->build_sample_biblio();
- my $barcode1 = '1234';
- my ( undef, undef, $itemnumber1 ) = AddItem(
+ my $item_1 = $builder->build_sample_item(
{
- homebranch => $library2->{branchcode},
- holdingbranch => $library2->{branchcode},
- barcode => $barcode1,
- itype => $itemtype
- },
- $biblionumber
+ biblionumber => $biblio->biblionumber,
+ library => $library2->{branchcode},
+ itype => $itemtype,
+ }
);
- my $barcode2 = '4321';
- my ( undef, undef, $itemnumber2 ) = AddItem(
+
+ my $item_2= $builder->build_sample_item(
{
- homebranch => $library2->{branchcode},
- holdingbranch => $library2->{branchcode},
- barcode => $barcode2,
- itype => $itemtype
- },
- $biblionumber
+ biblionumber => $biblio->biblionumber,
+ library => $library2->{branchcode},
+ itype => $itemtype,
+ }
);
my $borrowernumber1 = Koha::Patron->new({
my $borrower1 = Koha::Patrons->find( $borrowernumber1 )->unblessed;
my $borrower2 = Koha::Patrons->find( $borrowernumber2 )->unblessed;
- my $issue = AddIssue( $borrower1, $barcode1 );
+ my $issue = AddIssue( $borrower1, $item_1->barcode );
- my ( $renewokay, $error ) = CanBookBeRenewed( $borrowernumber1, $itemnumber1 );
+ my ( $renewokay, $error ) = CanBookBeRenewed( $borrowernumber1, $item_1->itemnumber );
is( $renewokay, 1, 'Bug 14337 - Verify the borrower can renew with no hold on the record' );
AddReserve(
- $library2->{branchcode}, $borrowernumber2, $biblionumber,
+ $library2->{branchcode}, $borrowernumber2, $biblio->biblionumber,
'', 1, undef, undef, '',
undef, undef, undef
);
C4::Context->dbh->do("UPDATE issuingrules SET onshelfholds = 0");
t::lib::Mocks::mock_preference( 'AllowRenewalIfOtherItemsAvailable', 0 );
- ( $renewokay, $error ) = CanBookBeRenewed( $borrowernumber1, $itemnumber1 );
+ ( $renewokay, $error ) = CanBookBeRenewed( $borrowernumber1, $item_1->itemnumber );
is( $renewokay, 0, 'Bug 14337 - Verify the borrower cannot renew with a hold on the record if AllowRenewalIfOtherItemsAvailable and onshelfholds are disabled' );
C4::Context->dbh->do("UPDATE issuingrules SET onshelfholds = 0");
t::lib::Mocks::mock_preference( 'AllowRenewalIfOtherItemsAvailable', 1 );
- ( $renewokay, $error ) = CanBookBeRenewed( $borrowernumber1, $itemnumber1 );
+ ( $renewokay, $error ) = CanBookBeRenewed( $borrowernumber1, $item_1->itemnumber );
is( $renewokay, 0, 'Bug 14337 - Verify the borrower cannot renew with a hold on the record if AllowRenewalIfOtherItemsAvailable is enabled and onshelfholds is disabled' );
C4::Context->dbh->do("UPDATE issuingrules SET onshelfholds = 1");
t::lib::Mocks::mock_preference( 'AllowRenewalIfOtherItemsAvailable', 0 );
- ( $renewokay, $error ) = CanBookBeRenewed( $borrowernumber1, $itemnumber1 );
+ ( $renewokay, $error ) = CanBookBeRenewed( $borrowernumber1, $item_1->itemnumber );
is( $renewokay, 0, 'Bug 14337 - Verify the borrower cannot renew with a hold on the record if AllowRenewalIfOtherItemsAvailable is disabled and onshelfhold is enabled' );
C4::Context->dbh->do("UPDATE issuingrules SET onshelfholds = 1");
t::lib::Mocks::mock_preference( 'AllowRenewalIfOtherItemsAvailable', 1 );
- ( $renewokay, $error ) = CanBookBeRenewed( $borrowernumber1, $itemnumber1 );
+ ( $renewokay, $error ) = CanBookBeRenewed( $borrowernumber1, $item_1->itemnumber );
is( $renewokay, 1, 'Bug 14337 - Verify the borrower can renew with a hold on the record if AllowRenewalIfOtherItemsAvailable and onshelfhold are enabled' );
# Setting item not checked out to be not for loan but holdable
- ModItem({ notforloan => -1 }, $biblionumber, $itemnumber2);
+ ModItem({ notforloan => -1 }, $biblio->biblionumber, $item_2->itemnumber);
- ( $renewokay, $error ) = CanBookBeRenewed( $borrowernumber1, $itemnumber1 );
+ ( $renewokay, $error ) = CanBookBeRenewed( $borrowernumber1, $item_1->itemnumber );
is( $renewokay, 0, 'Bug 14337 - Verify the borrower can not renew with a hold on the record if AllowRenewalIfOtherItemsAvailable is enabled but the only available item is notforloan' );
}
{
# Don't allow renewing onsite checkout
- my $barcode = 'R00000XXX';
my $branch = $library->{branchcode};
#Create another record
- my ($biblionumber, $biblioitemnumber) = add_biblio('A title', 'Anonymous');
+ my $biblio = $builder->build_sample_biblio();
- my (undef, undef, $itemnumber) = AddItem(
+ my $item = $builder->build_sample_item(
{
- homebranch => $branch,
- holdingbranch => $branch,
- barcode => $barcode,
- itype => $itemtype
- },
- $biblionumber
+ biblionumber => $biblio->biblionumber,
+ library => $branch,
+ itype => $itemtype,
+ }
);
my $borrowernumber = Koha::Patron->new({
my $borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
- my $issue = AddIssue( $borrower, $barcode, undef, undef, undef, undef, { onsite_checkout => 1 } );
- my ( $renewed, $error ) = CanBookBeRenewed( $borrowernumber, $itemnumber );
+ my $issue = AddIssue( $borrower, $item->barcode, undef, undef, undef, undef, { onsite_checkout => 1 } );
+ my ( $renewed, $error ) = CanBookBeRenewed( $borrowernumber, $item->itemnumber );
is( $renewed, 0, 'CanBookBeRenewed should not allow to renew on-site checkout' );
is( $error, 'onsite_checkout', 'A correct error code should be returned by CanBookBeRenewed for on-site checkout' );
}
{
my $library = $builder->build({ source => 'Branch' });
- my ($biblionumber, $biblioitemnumber) = add_biblio();
+ my $biblio = $builder->build_sample_biblio();
- my $barcode = 'just a barcode';
- my ( undef, undef, $itemnumber ) = AddItem(
+ my $item = $builder->build_sample_item(
{
- homebranch => $library->{branchcode},
- holdingbranch => $library->{branchcode},
- barcode => $barcode,
- itype => $itemtype
- },
- $biblionumber,
+ biblionumber => $biblio->biblionumber,
+ library => $library->{branchcode},
+ itype => $itemtype,
+ }
);
my $patron = $builder->build({ source => 'Borrower', value => { branchcode => $library->{branchcode}, categorycode => $patron_category->{categorycode} } } );
- my $issue = AddIssue( $patron, $barcode );
+ my $issue = AddIssue( $patron, $item->barcode );
UpdateFine(
{
issue_id => $issue->id(),
- itemnumber => $itemnumber,
+ itemnumber => $item->itemnumber,
borrowernumber => $patron->{borrowernumber},
amount => 1,
type => q{}
UpdateFine(
{
issue_id => $issue->id(),
- itemnumber => $itemnumber,
+ itemnumber => $item->itemnumber,
borrowernumber => $patron->{borrowernumber},
amount => 2,
type => q{}
set_userenv($holdingbranch);
my $issue = AddIssue( $patron_1->unblessed, $item->{barcode} );
- is( ref($issue), 'Koha::Schema::Result::Issue' ); # FIXME Should be Koha::Checkout
+ is( ref($issue), 'Koha::Checkout', 'AddIssue should return a Koha::Checkout object' );
my ( $error, $question, $alerts );
set_userenv($holdingbranch);
- my $ref_issue = 'Koha::Schema::Result::Issue'; # FIXME Should be Koha::Checkout
+ my $ref_issue = 'Koha::Checkout';
my $issue = AddIssue( $patron_1, $item->{barcode} );
my ( $error, $question, $alerts );
subtest 'MultipleReserves' => sub {
plan tests => 3;
- my $title = 'Silence in the library';
- my ($biblionumber, $biblioitemnumber) = add_biblio($title, 'Moffat, Steven');
+ my $biblio = $builder->build_sample_biblio();
my $branch = $library2->{branchcode};
- my $barcode1 = 'R00110001';
- my ( $item_bibnum1, $item_bibitemnum1, $itemnumber1 ) = AddItem(
+ my $item_1 = $builder->build_sample_item(
{
- homebranch => $branch,
- holdingbranch => $branch,
- barcode => $barcode1,
+ biblionumber => $biblio->biblionumber,
+ library => $branch,
replacementprice => 12.00,
- itype => $itemtype
- },
- $biblionumber
+ itype => $itemtype,
+ }
);
- my $barcode2 = 'R00110002';
- my ( $item_bibnum2, $item_bibitemnum2, $itemnumber2 ) = AddItem(
+ my $item_2 = $builder->build_sample_item(
{
- homebranch => $branch,
- holdingbranch => $branch,
- barcode => $barcode2,
+ biblionumber => $biblio->biblionumber,
+ library => $branch,
replacementprice => 12.00,
- itype => $itemtype
- },
- $biblionumber
+ itype => $itemtype,
+ }
);
my $bibitems = '';
);
my $renewing_borrowernumber = Koha::Patron->new(\%renewing_borrower_data)->store->borrowernumber;
my $renewing_borrower = Koha::Patrons->find( $renewing_borrowernumber )->unblessed;
- my $issue = AddIssue( $renewing_borrower, $barcode1);
+ my $issue = AddIssue( $renewing_borrower, $item_1->barcode);
my $datedue = dt_from_string( $issue->date_due() );
is (defined $issue->date_due(), 1, "item 1 checked out");
- my $borrowing_borrowernumber = Koha::Checkouts->find({ itemnumber => $itemnumber1 })->borrowernumber;
+ my $borrowing_borrowernumber = Koha::Checkouts->find({ itemnumber => $item_1->itemnumber })->borrowernumber;
my %reserving_borrower_data1 = (
firstname => 'Katrin',
);
my $reserving_borrowernumber1 = Koha::Patron->new(\%reserving_borrower_data1)->store->borrowernumber;
AddReserve(
- $branch, $reserving_borrowernumber1, $biblionumber,
+ $branch, $reserving_borrowernumber1, $biblio->biblionumber,
$bibitems, $priority, $resdate, $expdate, $notes,
- $title, $checkitem, $found
+ 'a title', $checkitem, $found
);
my %reserving_borrower_data2 = (
);
my $reserving_borrowernumber2 = Koha::Patron->new(\%reserving_borrower_data2)->store->borrowernumber;
AddReserve(
- $branch, $reserving_borrowernumber2, $biblionumber,
+ $branch, $reserving_borrowernumber2, $biblio->biblionumber,
$bibitems, $priority, $resdate, $expdate, $notes,
- $title, $checkitem, $found
+ 'a title', $checkitem, $found
);
{
- my ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber1, 1);
+ my ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_1->itemnumber, 1);
is($renewokay, 0, 'Bug 17941 - should cover the case where 2 books are both reserved, so failing');
}
- my $barcode3 = 'R00110003';
- my ( $item_bibnum3, $item_bibitemnum3, $itemnumber3 ) = AddItem(
+ my $item_3 = $builder->build_sample_item(
{
- homebranch => $branch,
- holdingbranch => $branch,
- barcode => $barcode3,
+ biblionumber => $biblio->biblionumber,
+ library => $branch,
replacementprice => 12.00,
- itype => $itemtype
- },
- $biblionumber
+ itype => $itemtype,
+ }
);
{
- my ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber1, 1);
+ my ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_1->itemnumber, 1);
is($renewokay, 1, 'Bug 17941 - should cover the case where 2 books are reserved, but a third one is available');
}
};
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 {
- plan tests => 4;
+ plan tests => 5;
t::lib::Mocks::mock_preference( 'WhenLostChargeReplacementFee', 1 );
t::lib::Mocks::mock_preference( 'WhenLostForgiveFine', 0 );
notforloan => undef,
rentalcharge => 0,
defaultreplacecost => undef,
- processfee => $processfee_amount
+ processfee => $processfee_amount,
+ rentalcharge_daily => 0,
}
}
);
my $library = $builder->build_object( { class => 'Koha::Libraries' } );
- # Generate test biblio
- my $title = 'Koha for Dummies';
- my ( $biblionumber, $biblioitemnumber ) = add_biblio( $title, 'Hall, Daria' );
+ my $biblio = $builder->build_sample_biblio({ author => 'Hall, Daria' });
subtest 'Full write-off tests' => sub {
plan tests => 10;
my $patron = $builder->build_object( { class => 'Koha::Patrons' } );
- my $barcode = 'KD123456789';
+ my $manager = $builder->build_object({ class => "Koha::Patrons" });
+ t::lib::Mocks::mock_userenv({ patron => $manager,branchcode => $manager->branchcode });
- my ( undef, undef, $item_id ) = AddItem(
- { homebranch => $library->branchcode,
- holdingbranch => $library->branchcode,
- barcode => $barcode,
+ my $item = $builder->build_sample_item(
+ {
+ biblionumber => $biblio->biblionumber,
+ library => $library->branchcode,
replacementprice => $replacement_amount,
- itype => $item_type->itemtype
- },
- $biblionumber
+ itype => $item_type->itemtype,
+ }
);
- AddIssue( $patron->unblessed, $barcode );
+ AddIssue( $patron->unblessed, $item->barcode );
# Simulate item marked as lost
- ModItem( { itemlost => 3 }, $biblionumber, $item_id );
- LostItem( $item_id, 1 );
+ ModItem( { itemlost => 3 }, $biblio->biblionumber, $item->itemnumber );
+ LostItem( $item->itemnumber, 1 );
my $processing_fee_lines = Koha::Account::Lines->search(
- { borrowernumber => $patron->id, itemnumber => $item_id, accounttype => 'PF' } );
+ { borrowernumber => $patron->id, itemnumber => $item->itemnumber, accounttype => 'PF' } );
is( $processing_fee_lines->count, 1, 'Only one processing fee produced' );
my $processing_fee_line = $processing_fee_lines->next;
is( $processing_fee_line->amount + 0,
$processfee_amount, 'The right PF amountoutstanding is generated' );
my $lost_fee_lines = Koha::Account::Lines->search(
- { borrowernumber => $patron->id, itemnumber => $item_id, accounttype => 'L' } );
+ { borrowernumber => $patron->id, itemnumber => $item->itemnumber, accounttype => 'L' } );
is( $lost_fee_lines->count, 1, 'Only one lost item fee produced' );
my $lost_fee_line = $lost_fee_lines->next;
is( $lost_fee_line->amount + 0, $replacement_amount, 'The right L amount is generated' );
is( $lost_fee_line->amountoutstanding + 0,
- $replacement_amount, 'The right L amountountstanding is generated' );
+ $replacement_amount, 'The right L amountoutstanding is generated' );
my $account = $patron->account;
my $debts = $account->outstanding_debits;
# 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' } );
- my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item_id, $patron->id );
+ my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item->itemnumber, $patron->id );
is( $credit_return_id, undef, 'No CR account line added' );
$lost_fee_line->discard_changes; # reload from DB
plan tests => 12;
my $patron = $builder->build_object( { class => 'Koha::Patrons' } );
- my $barcode = 'KD123456790';
- my ( undef, undef, $item_id ) = AddItem(
- { homebranch => $library->branchcode,
- holdingbranch => $library->branchcode,
- barcode => $barcode,
+ my $item = $builder->build_sample_item(
+ {
+ biblionumber => $biblio->biblionumber,
+ library => $library->branchcode,
replacementprice => $replacement_amount,
itype => $item_type->itemtype
- },
- $biblionumber
+ }
);
- AddIssue( $patron->unblessed, $barcode );
+ AddIssue( $patron->unblessed, $item->barcode );
# Simulate item marked as lost
- ModItem( { itemlost => 1 }, $biblionumber, $item_id );
- LostItem( $item_id, 1 );
+ ModItem( { itemlost => 1 }, $biblio->biblionumber, $item->itemnumber );
+ LostItem( $item->itemnumber, 1 );
my $processing_fee_lines = Koha::Account::Lines->search(
- { borrowernumber => $patron->id, itemnumber => $item_id, accounttype => 'PF' } );
+ { borrowernumber => $patron->id, itemnumber => $item->itemnumber, accounttype => 'PF' } );
is( $processing_fee_lines->count, 1, 'Only one processing fee produced' );
my $processing_fee_line = $processing_fee_lines->next;
is( $processing_fee_line->amount + 0,
$processfee_amount, 'The right PF amountoutstanding is generated' );
my $lost_fee_lines = Koha::Account::Lines->search(
- { borrowernumber => $patron->id, itemnumber => $item_id, accounttype => 'L' } );
+ { borrowernumber => $patron->id, itemnumber => $item->itemnumber, accounttype => 'L' } );
is( $lost_fee_lines->count, 1, 'Only one lost item fee produced' );
my $lost_fee_line = $lost_fee_lines->next;
is( $lost_fee_line->amount + 0, $replacement_amount, 'The right L amount is generated' );
# 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 $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item_id, $patron->id );
+ my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item->itemnumber, $patron->id );
my $credit_return = Koha::Account::Lines->find($credit_return_id);
is( $credit_return->accounttype, 'CR', 'An account line of type CR is added' );
subtest 'Test without payment or write off' => sub {
- plan tests => 10;
+ plan tests => 12;
my $patron = $builder->build_object( { class => 'Koha::Patrons' } );
- my $barcode = 'KD123456791';
- my ( undef, undef, $item_id ) = AddItem(
- { homebranch => $library->branchcode,
- holdingbranch => $library->branchcode,
- barcode => $barcode,
+ my $item = $builder->build_sample_item(
+ {
+ biblionumber => $biblio->biblionumber,
+ library => $library->branchcode,
+ replacementprice => 23.00,
replacementprice => $replacement_amount,
itype => $item_type->itemtype
- },
- $biblionumber
+ }
);
- AddIssue( $patron->unblessed, $barcode );
+ AddIssue( $patron->unblessed, $item->barcode );
# Simulate item marked as lost
- ModItem( { itemlost => 3 }, $biblionumber, $item_id );
- LostItem( $item_id, 1 );
+ ModItem( { itemlost => 3 }, $biblio->biblionumber, $item->itemnumber );
+ LostItem( $item->itemnumber, 1 );
my $processing_fee_lines = Koha::Account::Lines->search(
- { borrowernumber => $patron->id, itemnumber => $item_id, accounttype => 'PF' } );
+ { borrowernumber => $patron->id, itemnumber => $item->itemnumber, accounttype => 'PF' } );
is( $processing_fee_lines->count, 1, 'Only one processing fee produced' );
my $processing_fee_line = $processing_fee_lines->next;
is( $processing_fee_line->amount + 0,
$processfee_amount, 'The right PF amountoutstanding is generated' );
my $lost_fee_lines = Koha::Account::Lines->search(
- { borrowernumber => $patron->id, itemnumber => $item_id, accounttype => 'L' } );
+ { borrowernumber => $patron->id, itemnumber => $item->itemnumber, accounttype => 'L' } );
is( $lost_fee_lines->count, 1, 'Only one lost item fee produced' );
my $lost_fee_line = $lost_fee_lines->next;
is( $lost_fee_line->amount + 0, $replacement_amount, 'The right L amount is generated' );
is( $lost_fee_line->amountoutstanding + 0,
$replacement_amount, 'The right L amountountstanding is generated' );
- my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item_id, $patron->id );
- is( $credit_return_id, undef, 'No CR account line added' );
+ my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item->itemnumber, $patron->id );
+ my $credit_return = Koha::Account::Lines->find($credit_return_id);
+
+ is( $credit_return->accounttype, 'CR', 'An account line of type CR is added' );
+ is( $credit_return->amount + 0, -99.00, 'The account line of type CR has an amount of -99' );
+ is( $credit_return->amountoutstanding + 0, 0, 'The account line of type CR has an amountoutstanding of 0' );
$lost_fee_line->discard_changes;
is( $lost_fee_line->amountoutstanding + 0, 0, 'Lost fee has no outstanding amount' );
plan tests => 15;
my $patron = $builder->build_object( { class => 'Koha::Patrons' } );
- my $barcode = 'KD123456792';
-
- my ( undef, undef, $item_id ) = AddItem(
- { homebranch => $library->branchcode,
- holdingbranch => $library->branchcode,
- barcode => $barcode,
+ my $item = $builder->build_sample_item(
+ {
+ biblionumber => $biblio->biblionumber,
+ library => $library->branchcode,
replacementprice => $replacement_amount,
itype => $item_type->itemtype
- },
- $biblionumber
+ }
);
- AddIssue( $patron->unblessed, $barcode );
+ AddIssue( $patron->unblessed, $item->barcode );
# Simulate item marked as lost
- ModItem( { itemlost => 1 }, $biblionumber, $item_id );
- LostItem( $item_id, 1 );
+ ModItem( { itemlost => 1 }, $biblio->biblionumber, $item->itemnumber );
+ LostItem( $item->itemnumber, 1 );
my $processing_fee_lines = Koha::Account::Lines->search(
- { borrowernumber => $patron->id, itemnumber => $item_id, accounttype => 'PF' } );
+ { borrowernumber => $patron->id, itemnumber => $item->itemnumber, accounttype => 'PF' } );
is( $processing_fee_lines->count, 1, 'Only one processing fee produced' );
my $processing_fee_line = $processing_fee_lines->next;
is( $processing_fee_line->amount + 0,
$processfee_amount, 'The right PF amountoutstanding is generated' );
my $lost_fee_lines = Koha::Account::Lines->search(
- { borrowernumber => $patron->id, itemnumber => $item_id, accounttype => 'L' } );
+ { borrowernumber => $patron->id, itemnumber => $item->itemnumber, accounttype => 'L' } );
is( $lost_fee_lines->count, 1, 'Only one lost item fee produced' );
my $lost_fee_line = $lost_fee_lines->next;
is( $lost_fee_line->amount + 0, $replacement_amount, 'The right L amount is generated' );
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' } );
'Payment and write off applied'
);
- my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item_id, $patron->id );
+ # Store the amountoutstanding value
+ $lost_fee_line->discard_changes;
+ my $outstanding = $lost_fee_line->amountoutstanding;
+
+ my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item->itemnumber, $patron->id );
my $credit_return = Koha::Account::Lines->find($credit_return_id);
is( $account->balance, $processfee_amount - $payment_amount, 'Balance is PF - payment (CR)' );
+ $lost_fee_line->discard_changes;
+ is( $lost_fee_line->amountoutstanding + 0, 0, 'Lost fee has no outstanding amount' );
+ is( $lost_fee_line->accounttype,
+ 'LR', 'Lost fee now has account type of LR ( Lost Returned )' );
+
is( $credit_return->accounttype, 'CR', 'An account line of type CR is added' );
is( $credit_return->amount + 0,
- $payment_amount * -1,
- 'The account line of type CR has an amount equal to the payment'
+ ($payment_amount + $outstanding ) * -1,
+ 'The account line of type CR has an amount equal to the payment + outstanding'
);
is( $credit_return->amountoutstanding + 0,
$payment_amount * -1,
'The account line of type CR has an amountoutstanding equal to the payment'
);
- $lost_fee_line->discard_changes;
- is( $lost_fee_line->amountoutstanding + 0, 0, 'Lost fee has no outstanding amount' );
- is( $lost_fee_line->accounttype,
- 'LR', 'Lost fee now has account type of LR ( Lost Returned )' );
-
is( $account->balance,
$processfee_amount - $payment_amount,
'The patron balance is the difference between the PF and the credit'
);
};
+
+ subtest 'Partial payement, existing debits and AccountAutoReconcile' => sub {
+
+ plan tests => 8;
+
+ my $patron = $builder->build_object( { class => 'Koha::Patrons' } );
+ my $barcode = 'KD123456793';
+ my $replacement_amount = 100;
+ my $processfee_amount = 20;
+
+ my $item_type = $builder->build_object(
+ { class => 'Koha::ItemTypes',
+ value => {
+ notforloan => undef,
+ rentalcharge => 0,
+ defaultreplacecost => undef,
+ processfee => 0,
+ rentalcharge_daily => 0,
+ }
+ }
+ );
+ my ( undef, undef, $item_id ) = AddItem(
+ { homebranch => $library->branchcode,
+ holdingbranch => $library->branchcode,
+ barcode => $barcode,
+ replacementprice => $replacement_amount,
+ itype => $item_type->itemtype
+ },
+ $biblio->biblionumber
+ );
+
+ AddIssue( $patron->unblessed, $barcode );
+
+ # Simulate item marked as lost
+ ModItem( { itemlost => 1 }, $biblio->biblionumber, $item_id );
+ LostItem( $item_id, 1 );
+
+ my $lost_fee_lines = Koha::Account::Lines->search(
+ { borrowernumber => $patron->id, itemnumber => $item_id, accounttype => 'L' } );
+ is( $lost_fee_lines->count, 1, 'Only one lost item fee produced' );
+ my $lost_fee_line = $lost_fee_lines->next;
+ is( $lost_fee_line->amount + 0, $replacement_amount, 'The right L amount is generated' );
+ is( $lost_fee_line->amountoutstanding + 0,
+ $replacement_amount, 'The right L amountountstanding is generated' );
+
+ my $account = $patron->account;
+ is( $account->balance, $replacement_amount, 'Balance is L' );
+
+ # Partially pay fee
+ my $payment_amount = 27;
+ my $payment = $account->add_credit(
+ { amount => $payment_amount,
+ type => 'payment',
+ interface => 'test',
+ }
+ );
+ $payment->apply({ debits => $lost_fee_lines->reset, offset_type => 'Payment' });
+
+ is( $account->balance,
+ $replacement_amount - $payment_amount,
+ 'Payment applied'
+ );
+
+ my $manual_debit_amount = 80;
+ $account->add_debit( { amount => $manual_debit_amount, type => 'overdue', interface =>'test' } );
+
+ is( $account->balance, $manual_debit_amount + $replacement_amount - $payment_amount, 'Manual debit applied' );
+
+ t::lib::Mocks::mock_preference( 'AccountAutoReconcile', 1 );
+
+ my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item_id, $patron->id );
+ my $credit_return = Koha::Account::Lines->find($credit_return_id);
+
+ is( $account->balance, $manual_debit_amount - $payment_amount, 'Balance is PF - payment (CR)' );
+
+ 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;
- # Generate test biblio
- my $title = 'Koha for Dummies';
- my ( $biblionumber, $biblioitemnumber ) = add_biblio($title, 'Hall, Kylie');
+ 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 $barcode = 'KD987654321';
my $branchcode = $library2->{branchcode};
- my ( $item_bibnum, $item_bibitemnum, $itemnumber ) = AddItem(
+ my $item = $builder->build_sample_item(
{
- homebranch => $branchcode,
- holdingbranch => $branchcode,
- barcode => $barcode,
+ biblionumber => $biblio->biblionumber,
+ library => $branchcode,
replacementprice => 99.00,
- itype => $itemtype
- },
- $biblionumber
+ itype => $itemtype,
+ }
);
my $patron = $builder->build( { source => 'Borrower' } );
my $accountline = Koha::Account::Line->new(
{
borrowernumber => $patron->{borrowernumber},
- accounttype => 'FU',
- itemnumber => $itemnumber,
+ accounttype => 'OVERDUE',
+ status => 'UNRETURNED',
+ itemnumber => $item->itemnumber,
amount => 99.00,
amountoutstanding => 99.00,
- lastincrement => 9.00,
+ interface => 'test',
}
)->store();
- C4::Circulation::_FixOverduesOnReturn( $patron->{borrowernumber}, $itemnumber );
+ C4::Circulation::_FixOverduesOnReturn( $patron->{borrowernumber}, $item->itemnumber );
$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();
- C4::Circulation::_FixOverduesOnReturn( $patron->{borrowernumber}, $itemnumber, 1 );
+ C4::Circulation::_FixOverduesOnReturn( $patron->{borrowernumber}, $item->itemnumber, 1 );
$accountline->_result()->discard_changes();
+ 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 )');
-
- ## Run again, with dropbox mode enabled
- $accountline->set(
- {
- accounttype => 'FU',
- amountoutstanding => 99.00,
- }
- )->store();
-
- C4::Circulation::_FixOverduesOnReturn( $patron->{borrowernumber}, $itemnumber, 0, 1 );
-
- $accountline->_result()->discard_changes();
-
- 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( $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 {
is( $status, 'Waiting', 'Now the hold is waiting');
};
+subtest 'Cancel transfers on lost items' => sub {
+ plan tests => 5;
+ my $library_1 = $builder->build( { source => 'Branch' } );
+ my $patron_1 = $builder->build( { source => 'Borrower', value => { branchcode => $library_1->{branchcode}, categorycode => $patron_category->{categorycode} } } );
+ my $library_2 = $builder->build( { source => 'Branch' } );
+ my $patron_2 = $builder->build( { source => 'Borrower', value => { branchcode => $library_2->{branchcode}, categorycode => $patron_category->{categorycode} } } );
+ my $biblio = $builder->build( { source => 'Biblio' } );
+ my $biblioitem = $builder->build( { source => 'Biblioitem', value => { biblionumber => $biblio->{biblionumber} } } );
+ my $item = $builder->build(
+ {
+ source => 'Item',
+ value => {
+ homebranch => $library_1->{branchcode},
+ holdingbranch => $library_1->{branchcode},
+ notforloan => 0,
+ itemlost => 0,
+ withdrawn => 0,
+ biblionumber => $biblioitem->{biblionumber},
+ }
+ }
+ );
+
+ set_userenv( $library_2 );
+ my $reserve_id = AddReserve(
+ $library_2->{branchcode}, $patron_2->{borrowernumber}, $biblioitem->{biblionumber}, '', 1, undef, undef, '', undef, $item->{itemnumber},
+ );
+
+ #Return book and add transfer
+ set_userenv( $library_1 );
+ my $do_transfer = 1;
+ my ( $res, $rr ) = AddReturn( $item->{barcode}, $library_1->{branchcode} );
+ ModReserveAffect( $item->{itemnumber}, undef, $do_transfer, $reserve_id );
+ C4::Circulation::transferbook( $library_2->{branchcode}, $item->{barcode} );
+ my $hold = Koha::Holds->find( $reserve_id );
+ is( $hold->found, 'T', 'Hold is in transit' );
+
+ #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 = 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 = 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 {
plan tests => 3;
$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');
-sub set_userenv {
- my ( $library ) = @_;
- C4::Context->set_userenv(0,0,0,'firstname','surname', $library->{branchcode}, $library->{branchname}, '', '', '');
-}
+subtest 'AddRenewal and AddIssuingCharge tests' => sub {
-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;
-}
+ plan tests => 13;
-sub add_biblio {
- my ($title, $author) = @_;
- my $marcflavour = C4::Context->preference('marcflavour');
+ t::lib::Mocks::mock_preference('item-level_itypes', 1);
- my $biblio = MARC::Record->new();
- if ($title) {
- my $tag = $marcflavour eq 'UNIMARC' ? '200' : '245';
- $biblio->append_fields(
- MARC::Field->new($tag, ' ', ' ', a => $title),
- );
- }
+ my $issuing_charges = 15;
+ my $title = 'A title';
+ my $author = 'Author, An';
+ my $barcode = 'WHATARETHEODDS';
- if ($author) {
- my ($tag, $code) = $marcflavour eq 'UNIMARC' ? (200, 'f') : (100, 'a');
- $biblio->append_fields(
- MARC::Field->new($tag, ' ', ' ', $code => $author),
- );
- }
+ my $circ = Test::MockModule->new('C4::Circulation');
+ $circ->mock(
+ 'GetIssuingCharges',
+ sub {
+ return $issuing_charges;
+ }
+ );
- return AddBiblio($biblio, '');
-}
+ my $library = $builder->build_object({ class => 'Koha::Libraries' });
+ 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 }
+ });
-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 $biblio = $builder->build_sample_biblio({ title=> $title, author => $author });
+ my ( undef, undef, $item_id ) = AddItem(
+ {
+ homebranch => $library->id,
+ holdingbranch => $library->id,
+ barcode => $barcode,
+ replacementprice => 23.00,
+ itype => $itemtype->id
+ },
+ $biblio->biblionumber
+ );
+ my $item = Koha::Items->find( $item_id );
+
+ 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(), 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 = 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;
+ # The following will fail if run on 00:00:00
+ 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(), dateonly => 1, dateformat => 'iso' } );
+ $old_log_size = Koha::ActionLogs->count( \%params_renewal );
+ AddRenewal( $patron->id, $item->id, $library->id );
+ $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({
+ borrowernumber => $patron->id,
+ itemnumber => $item->id
+ });
- $expected_expiration_date = output_pref(
+ is( $lines->count, 3 );
+
+ my $line = $lines->next;
+ is( $line->accounttype, 'Rent', 'The issuing charge generates an accountline' );
+ is( $line->branchcode, $library->id, 'AddIssuingCharge correctly sets branchcode' );
+ is( $line->description, 'Rental', 'AddIssuingCharge set a hardcoded description for the accountline' );
+
+ $line = $lines->next;
+ is( $line->accounttype, 'Rent', 'Fine on renewed item is closed out properly' );
+ 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' );
+
+ $line = $lines->next;
+ is( $line->accounttype, 'Rent', 'Fine on renewed item is closed out properly' );
+ 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' );
+
+};
+
+subtest 'ProcessOfflinePayment() tests' => sub {
+
+ plan tests => 4;
+
+
+ my $amount = 123;
+
+ my $patron = $builder->build_object({ class => 'Koha::Patrons' });
+ my $library = $builder->build_object({ class => 'Koha::Libraries' });
+ my $result = C4::Circulation::ProcessOfflinePayment({ cardnumber => $patron->cardnumber, amount => $amount, branchcode => $library->id });
+
+ is( $result, 'Success.', 'The right string is returned' );
+
+ my $lines = $patron->account->lines;
+ is( $lines->count, 1, 'line created correctly');
+
+ my $line = $lines->next;
+ is( $line->amount+0, $amount * -1, 'amount picked from params' );
+ is( $line->branchcode, $library->id, 'branchcode set correctly' );
+
+};
+
+subtest 'Incremented fee tests' => sub {
+ plan tests => 11;
+
+ t::lib::Mocks::mock_preference('item-level_itypes', 1);
+
+ my $library = $builder->build_object( { class => 'Koha::Libraries' } )->store;
+
+ my $module = new Test::MockModule('C4::Context');
+ $module->mock('userenv', sub { { branch => $library->id } });
+
+ my $patron = $builder->build_object(
{
- dt => $expected_expiration_date,
- dateformat => 'sql',
- dateonly => 1,
+ class => 'Koha::Patrons',
+ value => { categorycode => $patron_category->{categorycode} }
+ }
+ )->store;
+
+ my $itemtype = $builder->build_object(
+ {
+ 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