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;
# 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 ( $reused_itemnumber_1, $reused_itemnumber_2 );
{
# CanBookBeRenewed tests
C4::Context->set_preference('ItemsDeniedRenewal','');
# Generate test biblio
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
- },
- $biblio->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
- },
- $biblio->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
- },
- $biblio->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');
# 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
{
borrowernumber => $hold_waiting_borrowernumber,
biblionumber => $biblio->biblionumber,
- itemnumber => $itemnumber,
+ 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();
{
borrowernumber => $hold_waiting_borrowernumber,
biblionumber => $biblio->biblionumber,
- itemnumber => $itemnumber3,
+ 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 => $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 => {} },
AddReserve(
$branch, $reserving_borrowernumber, $biblio->biblionumber,
$bibitems, $priority, $resdate, $expdate, $notes,
- 'a 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 }, $biblio->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 }, $biblio->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
- },
- $biblio->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
- },
- $biblio->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
- },
- $biblio->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,
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 );
+ AddRenewal( $renewing_borrower->{borrowernumber}, $item_7->itemnumber, $branch );
my $new_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["RENEWAL"]) } );
is ($new_log_size, $old_log_size, 'renew log not added because of the syspref RenewalLog');
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 );
+ AddRenewal( $renewing_borrower->{borrowernumber}, $item_7->itemnumber, $branch );
$new_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["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' );
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 );
+ 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"]) } );
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"]) } );
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');
# 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
- },
- $biblio->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)'
# 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{},
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' );
- 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');
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" );
-
}
{
# GetUpcomingDueIssues tests
- my $barcode = 'R00000342';
- my $barcode2 = 'R00000343';
- my $barcode3 = 'R00000344';
my $branch = $library2->{branchcode};
#Create another record
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
- },
- $biblio2->biblionumber
+ 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 $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
- },
- $biblio->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
);
+ 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
- },
- $biblio->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
- },
- $biblio->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(
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 }, $biblio->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 $biblio = $builder->build_sample_biblio();
- my (undef, undef, $itemnumber) = AddItem(
+ my $item = $builder->build_sample_item(
{
- homebranch => $branch,
- holdingbranch => $branch,
- barcode => $barcode,
- itype => $itemtype
- },
- $biblio->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 $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
- },
- $biblio->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{}
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
- },
- $biblio->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
- },
- $biblio->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 ( $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
- },
- $biblio->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
categorycode => '*',
itemtype => '*',
branchcode => '*',
- maxissueqty => 99,
issuelength => 1,
firstremind => 0, # 0 day of grace
finedays => 2, # 2 days of fine per day of overdue
categorycode => '*',
itemtype => '*',
branchcode => '*',
- maxissueqty => 99,
issuelength => 6,
lengthunit => 'days',
fine => 1, # Charge 1 every day of overdue
plan tests => 10;
my $patron = $builder->build_object( { class => 'Koha::Patrons' } );
- my $barcode = 'KD123456789';
- 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
- },
- $biblio->biblionumber
+ itype => $item_type->itemtype,
+ }
);
- AddIssue( $patron->unblessed, $barcode );
+ AddIssue( $patron->unblessed, $item->barcode );
# Simulate item marked as lost
- ModItem( { itemlost => 3 }, $biblio->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' );
);
$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
- },
- $biblio->biblionumber
+ }
);
- AddIssue( $patron->unblessed, $barcode );
+ AddIssue( $patron->unblessed, $item->barcode );
# Simulate item marked as lost
- ModItem( { itemlost => 1 }, $biblio->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' );
);
$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' );
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
- },
- $biblio->biblionumber
+ }
);
- AddIssue( $patron->unblessed, $barcode );
+ AddIssue( $patron->unblessed, $item->barcode );
# Simulate item marked as lost
- ModItem( { itemlost => 3 }, $biblio->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 );
+ 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' );
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
- },
- $biblio->biblionumber
+ }
);
- AddIssue( $patron->unblessed, $barcode );
+ AddIssue( $patron->unblessed, $item->barcode );
# Simulate item marked as lost
- ModItem( { itemlost => 1 }, $biblio->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' );
$lost_fee_line->discard_changes;
my $outstanding = $lost_fee_line->amountoutstanding;
- 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( $account->balance, $processfee_amount - $payment_amount, 'Balance is PF - payment (CR)' );
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
- },
- $biblio->biblionumber
+ itype => $itemtype,
+ }
);
my $patron = $builder->build( { source => 'Borrower' } );
{
borrowernumber => $patron->{borrowernumber},
accounttype => 'FU',
- itemnumber => $itemnumber,
+ itemnumber => $item->itemnumber,
amount => 99.00,
amountoutstanding => 99.00,
lastincrement => 9.00,
}
)->store();
- C4::Circulation::_FixOverduesOnReturn( $patron->{borrowernumber}, $itemnumber );
+ C4::Circulation::_FixOverduesOnReturn( $patron->{borrowernumber}, $item->itemnumber );
$accountline->_result()->discard_changes();
}
)->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();
}
)->store();
- C4::Circulation::_FixOverduesOnReturn( $patron->{borrowernumber}, $itemnumber, 0, 1 );
+ 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();
#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
subtest 'AddRenewal and AddIssuingCharge tests' => sub {
- plan tests => 12;
+ plan tests => 13;
$schema->storage->txn_begin;
);
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 } );
my $new_log_size = scalar( @{ GetLogs( $date, $date, undef, ["CIRCULATION"], ["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(), datenonly => 1, dateformat => 'iso' } );
$old_log_size = scalar( @{ GetLogs( $date, $date, undef, ["CIRCULATION"], ["RENEWAL"] ) } );