|
Lines 18-24
Link Here
|
| 18 |
use Modern::Perl; |
18 |
use Modern::Perl; |
| 19 |
use utf8; |
19 |
use utf8; |
| 20 |
|
20 |
|
| 21 |
use Test::More tests => 48; |
21 |
use Test::More tests => 51; |
| 22 |
use Test::MockModule; |
22 |
use Test::MockModule; |
| 23 |
use Test::Deep qw( cmp_deeply ); |
23 |
use Test::Deep qw( cmp_deeply ); |
| 24 |
|
24 |
|
|
Lines 273-279
Koha::CirculationRules->set_rules(
Link Here
|
| 273 |
|
273 |
|
| 274 |
my ( $reused_itemnumber_1, $reused_itemnumber_2 ); |
274 |
my ( $reused_itemnumber_1, $reused_itemnumber_2 ); |
| 275 |
subtest "CanBookBeRenewed tests" => sub { |
275 |
subtest "CanBookBeRenewed tests" => sub { |
| 276 |
plan tests => 83; |
276 |
plan tests => 87; |
| 277 |
|
277 |
|
| 278 |
C4::Context->set_preference('ItemsDeniedRenewal',''); |
278 |
C4::Context->set_preference('ItemsDeniedRenewal',''); |
| 279 |
# Generate test biblio |
279 |
# Generate test biblio |
|
Lines 1256-1261
subtest "CanBookBeRenewed tests" => sub {
Link Here
|
| 1256 |
$item_3->itemcallnumber || '' ), |
1256 |
$item_3->itemcallnumber || '' ), |
| 1257 |
"Account line description must not contain 'Lost Items ', but be title, barcode, itemcallnumber" |
1257 |
"Account line description must not contain 'Lost Items ', but be title, barcode, itemcallnumber" |
| 1258 |
); |
1258 |
); |
|
|
1259 |
|
| 1260 |
# Recalls |
| 1261 |
t::lib::Mocks::mock_preference('UseRecalls', 1); |
| 1262 |
Koha::CirculationRules->set_rules({ |
| 1263 |
categorycode => undef, |
| 1264 |
branchcode => undef, |
| 1265 |
itemtype => undef, |
| 1266 |
rules => { |
| 1267 |
recalls_allowed => 10, |
| 1268 |
renewalsallowed => 5, |
| 1269 |
}, |
| 1270 |
}); |
| 1271 |
my $recall_borrower = $builder->build_object({ class => 'Koha::Patrons' }); |
| 1272 |
my $recall_biblio = $builder->build_object({ class => 'Koha::Biblios' }); |
| 1273 |
my $recall_item1 = $builder->build_object({ class => 'Koha::Items' }, { value => { biblionumber => $recall_biblio->biblionumber } }); |
| 1274 |
my $recall_item2 = $builder->build_object({ class => 'Koha::Items' }, { value => { biblionumber => $recall_biblio->biblionumber } }); |
| 1275 |
|
| 1276 |
AddIssue( $renewing_borrower, $recall_item1->barcode ); |
| 1277 |
|
| 1278 |
# item-level and this item: renewal not allowed |
| 1279 |
my $recall = Koha::Recall->new({ |
| 1280 |
biblionumber => $recall_item1->biblionumber, |
| 1281 |
itemnumber => $recall_item1->itemnumber, |
| 1282 |
borrowernumber => $recall_borrower->borrowernumber, |
| 1283 |
branchcode => $recall_borrower->branchcode, |
| 1284 |
item_level_recall => 1, |
| 1285 |
status => 'R', |
| 1286 |
})->store; |
| 1287 |
( $renewokay, $error ) = CanBookBeRenewed( $renewing_borrowernumber, $recall_item1->itemnumber ); |
| 1288 |
is( $error, 'recalled', 'Cannot renew item that has been recalled' ); |
| 1289 |
$recall->set_cancelled; |
| 1290 |
|
| 1291 |
# biblio-level requested recall: renewal not allowed |
| 1292 |
$recall = Koha::Recall->new({ |
| 1293 |
biblionumber => $recall_item1->biblionumber, |
| 1294 |
itemnumber => undef, |
| 1295 |
borrowernumber => $recall_borrower->borrowernumber, |
| 1296 |
branchcode => $recall_borrower->branchcode, |
| 1297 |
item_level_recall => 0, |
| 1298 |
status => 'R', |
| 1299 |
})->store; |
| 1300 |
( $renewokay, $error ) = CanBookBeRenewed( $renewing_borrowernumber, $recall_item1->itemnumber ); |
| 1301 |
is( $error, 'recalled', 'Cannot renew item if biblio is recalled and has no item allocated' ); |
| 1302 |
$recall->set_cancelled; |
| 1303 |
|
| 1304 |
# item-level and not this item: renewal allowed |
| 1305 |
$recall = Koha::Recall->new({ |
| 1306 |
biblionumber => $recall_item2->biblionumber, |
| 1307 |
itemnumber => $recall_item2->itemnumber, |
| 1308 |
borrowernumber => $recall_borrower->borrowernumber, |
| 1309 |
branchcode => $recall_borrower->branchcode, |
| 1310 |
item_level_recall => 1, |
| 1311 |
status => 'R', |
| 1312 |
})->store; |
| 1313 |
( $renewokay, $error ) = CanBookBeRenewed( $renewing_borrowernumber, $recall_item1->itemnumber ); |
| 1314 |
is( $renewokay, 1, 'Can renew item if item-level recall on biblio is not on this item' ); |
| 1315 |
$recall->set_cancelled; |
| 1316 |
|
| 1317 |
# biblio-level waiting recall: renewal allowed |
| 1318 |
$recall = Koha::Recall->new({ |
| 1319 |
biblionumber => $recall_item1->biblionumber, |
| 1320 |
itemnumber => undef, |
| 1321 |
borrowernumber => $recall_borrower->borrowernumber, |
| 1322 |
branchcode => $recall_borrower->branchcode, |
| 1323 |
item_level_recall => 0, |
| 1324 |
status => 'R', |
| 1325 |
})->store; |
| 1326 |
$recall->set_waiting({ item => $recall_item1 }); |
| 1327 |
( $renewokay, $error ) = CanBookBeRenewed( $renewing_borrowernumber, $recall_item1->itemnumber ); |
| 1328 |
is( $renewokay, 1, 'Can renew item if biblio-level recall has already been allocated an item' ); |
| 1329 |
$recall->set_cancelled; |
| 1259 |
}; |
1330 |
}; |
| 1260 |
|
1331 |
|
| 1261 |
subtest "GetUpcomingDueIssues" => sub { |
1332 |
subtest "GetUpcomingDueIssues" => sub { |
|
Lines 1736-1741
subtest 'AddIssue & AllowReturnToBranch' => sub {
Link Here
|
| 1736 |
# TODO t::lib::Mocks::mock_preference('AllowReturnToBranch', 'homeorholdingbranch'); |
1807 |
# TODO t::lib::Mocks::mock_preference('AllowReturnToBranch', 'homeorholdingbranch'); |
| 1737 |
}; |
1808 |
}; |
| 1738 |
|
1809 |
|
|
|
1810 |
subtest 'AddIssue | recalls' => sub { |
| 1811 |
plan tests => 3; |
| 1812 |
|
| 1813 |
t::lib::Mocks::mock_preference("UseRecalls", 1); |
| 1814 |
t::lib::Mocks::mock_preference("item-level_itypes", 1); |
| 1815 |
my $patron1 = $builder->build_object({ class => 'Koha::Patrons' }); |
| 1816 |
my $patron2 = $builder->build_object({ class => 'Koha::Patrons' }); |
| 1817 |
my $item = $builder->build_sample_item; |
| 1818 |
Koha::CirculationRules->set_rules({ |
| 1819 |
branchcode => undef, |
| 1820 |
itemtype => undef, |
| 1821 |
categorycode => undef, |
| 1822 |
rules => { |
| 1823 |
recalls_allowed => 10, |
| 1824 |
}, |
| 1825 |
}); |
| 1826 |
|
| 1827 |
# checking out item that they have recalled |
| 1828 |
my $recall1 = Koha::Recall->new({ |
| 1829 |
borrowernumber => $patron1->borrowernumber, |
| 1830 |
biblionumber => $item->biblionumber, |
| 1831 |
itemnumber => $item->itemnumber, |
| 1832 |
item_level_recall => 1, |
| 1833 |
branchcode => $patron1->branchcode, |
| 1834 |
status => 'R', |
| 1835 |
})->store; |
| 1836 |
AddIssue( $patron1->unblessed, $item->barcode, undef, undef, undef, undef, { recall_id => $recall1->recall_id } ); |
| 1837 |
$recall1 = Koha::Recalls->find( $recall1->recall_id ); |
| 1838 |
is( $recall1->finished, 1, 'Recall was fulfilled when patron checked out item' ); |
| 1839 |
AddReturn( $item->barcode, $item->homebranch ); |
| 1840 |
|
| 1841 |
# this item is has a recall request. cancel recall |
| 1842 |
my $recall2 = Koha::Recall->new({ |
| 1843 |
borrowernumber => $patron2->borrowernumber, |
| 1844 |
biblionumber => $item->biblionumber, |
| 1845 |
itemnumber => $item->itemnumber, |
| 1846 |
item_level_recall => 1, |
| 1847 |
branchcode => $patron2->branchcode, |
| 1848 |
status => 'R', |
| 1849 |
})->store; |
| 1850 |
AddIssue( $patron1->unblessed, $item->barcode, undef, undef, undef, undef, { recall_id => $recall2->recall_id, cancel_recall => 'cancel' } ); |
| 1851 |
$recall2 = Koha::Recalls->find( $recall2->recall_id ); |
| 1852 |
is( $recall2->cancelled, 1, 'Recall was cancelled when patron checked out item' ); |
| 1853 |
AddReturn( $item->barcode, $item->homebranch ); |
| 1854 |
|
| 1855 |
# this item is waiting to fulfill a recall. revert recall |
| 1856 |
my $recall3 = Koha::Recall->new({ |
| 1857 |
borrowernumber => $patron2->borrowernumber, |
| 1858 |
biblionumber => $item->biblionumber, |
| 1859 |
itemnumber => $item->itemnumber, |
| 1860 |
item_level_recall => 1, |
| 1861 |
branchcode => $patron2->branchcode, |
| 1862 |
status => 'R', |
| 1863 |
})->store; |
| 1864 |
$recall3->set_waiting; |
| 1865 |
AddIssue( $patron1->unblessed, $item->barcode, undef, undef, undef, undef, { recall_id => $recall3->recall_id, cancel_recall => 'revert' } ); |
| 1866 |
$recall3 = Koha::Recalls->find( $recall3->recall_id ); |
| 1867 |
is( $recall3->requested, 1, 'Recall was reverted from waiting when patron checked out item' ); |
| 1868 |
AddReturn( $item->barcode, $item->homebranch ); |
| 1869 |
}; |
| 1870 |
|
| 1871 |
|
| 1739 |
subtest 'CanBookBeIssued + Koha::Patron->is_debarred|has_overdues' => sub { |
1872 |
subtest 'CanBookBeIssued + Koha::Patron->is_debarred|has_overdues' => sub { |
| 1740 |
plan tests => 8; |
1873 |
plan tests => 8; |
| 1741 |
|
1874 |
|
|
Lines 3396-3401
subtest 'CanBookBeIssued | notforloan' => sub {
Link Here
|
| 3396 |
# TODO test with AllowNotForLoanOverride = 1 |
3529 |
# TODO test with AllowNotForLoanOverride = 1 |
| 3397 |
}; |
3530 |
}; |
| 3398 |
|
3531 |
|
|
|
3532 |
subtest 'CanBookBeIssued | recalls' => sub { |
| 3533 |
plan tests => 2; |
| 3534 |
|
| 3535 |
t::lib::Mocks::mock_preference("UseRecalls", 1); |
| 3536 |
t::lib::Mocks::mock_preference("item-level_itypes", 1); |
| 3537 |
my $patron1 = $builder->build_object({ class => 'Koha::Patrons' }); |
| 3538 |
my $patron2 = $builder->build_object({ class => 'Koha::Patrons' }); |
| 3539 |
my $item = $builder->build_sample_item; |
| 3540 |
Koha::CirculationRules->set_rules({ |
| 3541 |
branchcode => undef, |
| 3542 |
itemtype => undef, |
| 3543 |
categorycode => undef, |
| 3544 |
rules => { |
| 3545 |
recalls_allowed => 10, |
| 3546 |
}, |
| 3547 |
}); |
| 3548 |
|
| 3549 |
# item-level recall |
| 3550 |
my $recall = Koha::Recall->new({ |
| 3551 |
borrowernumber => $patron1->borrowernumber, |
| 3552 |
biblionumber => $item->biblionumber, |
| 3553 |
itemnumber => $item->itemnumber, |
| 3554 |
item_level_recall => 1, |
| 3555 |
branchcode => $patron1->branchcode, |
| 3556 |
status => 'R', |
| 3557 |
})->store; |
| 3558 |
|
| 3559 |
my ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron2, $item->barcode, undef, undef, undef, undef ); |
| 3560 |
is( $needsconfirmation->{RECALLED}->recall_id, $recall->recall_id, "Another patron has placed an item-level recall on this item" ); |
| 3561 |
|
| 3562 |
$recall->set_cancelled; |
| 3563 |
|
| 3564 |
# biblio-level recall |
| 3565 |
$recall = Koha::Recall->new({ |
| 3566 |
borrowernumber => $patron1->borrowernumber, |
| 3567 |
biblionumber => $item->biblionumber, |
| 3568 |
itemnumber => undef, |
| 3569 |
item_level_recall => 0, |
| 3570 |
branchcode => $patron1->branchcode, |
| 3571 |
status => 'R', |
| 3572 |
})->store; |
| 3573 |
|
| 3574 |
( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron2, $item->barcode, undef, undef, undef, undef ); |
| 3575 |
is( $needsconfirmation->{RECALLED}->recall_id, $recall->recall_id, "Another patron has placed a biblio-level recall and this item is eligible to fill it" ); |
| 3576 |
|
| 3577 |
$recall->set_cancelled; |
| 3578 |
}; |
| 3579 |
|
| 3399 |
subtest 'AddReturn should clear items.onloan for unissued items' => sub { |
3580 |
subtest 'AddReturn should clear items.onloan for unissued items' => sub { |
| 3400 |
plan tests => 1; |
3581 |
plan tests => 1; |
| 3401 |
|
3582 |
|
|
Lines 3411-3416
subtest 'AddReturn should clear items.onloan for unissued items' => sub {
Link Here
|
| 3411 |
is( $item->onloan, undef, 'AddReturn did clear items.onloan' ); |
3592 |
is( $item->onloan, undef, 'AddReturn did clear items.onloan' ); |
| 3412 |
}; |
3593 |
}; |
| 3413 |
|
3594 |
|
|
|
3595 |
subtest 'AddReturn | recalls' => sub { |
| 3596 |
plan tests => 3; |
| 3597 |
|
| 3598 |
t::lib::Mocks::mock_preference("UseRecalls", 1); |
| 3599 |
t::lib::Mocks::mock_preference("item-level_itypes", 1); |
| 3600 |
my $patron1 = $builder->build_object({ class => 'Koha::Patrons' }); |
| 3601 |
my $patron2 = $builder->build_object({ class => 'Koha::Patrons' }); |
| 3602 |
my $item1 = $builder->build_sample_item; |
| 3603 |
Koha::CirculationRules->set_rules({ |
| 3604 |
branchcode => undef, |
| 3605 |
itemtype => undef, |
| 3606 |
categorycode => undef, |
| 3607 |
rules => { |
| 3608 |
recalls_allowed => 10, |
| 3609 |
}, |
| 3610 |
}); |
| 3611 |
|
| 3612 |
# this item can fill a recall with pickup at this branch |
| 3613 |
AddIssue( $patron1->unblessed, $item1->barcode ); |
| 3614 |
my $recall1 = Koha::Recall->new({ |
| 3615 |
borrowernumber => $patron2->borrowernumber, |
| 3616 |
biblionumber => $item1->biblionumber, |
| 3617 |
itemnumber => $item1->itemnumber, |
| 3618 |
item_level_recall => 1, |
| 3619 |
branchcode => $item1->homebranch, |
| 3620 |
status => 'R', |
| 3621 |
})->store; |
| 3622 |
my ( $doreturn, $messages, $iteminfo, $borrowerinfo ) = AddReturn( $item1->barcode, $item1->homebranch ); |
| 3623 |
is( $messages->{RecallFound}->recall_id, $recall1->recall_id, "Recall found" ); |
| 3624 |
$recall1->set_cancelled; |
| 3625 |
|
| 3626 |
# this item can fill a recall but needs transfer |
| 3627 |
AddIssue( $patron1->unblessed, $item1->barcode ); |
| 3628 |
$recall1 = Koha::Recall->new({ |
| 3629 |
borrowernumber => $patron2->borrowernumber, |
| 3630 |
biblionumber => $item1->biblionumber, |
| 3631 |
itemnumber => $item1->itemnumber, |
| 3632 |
item_level_recall => 1, |
| 3633 |
branchcode => $patron2->branchcode, |
| 3634 |
status => 'R', |
| 3635 |
})->store; |
| 3636 |
( $doreturn, $messages, $iteminfo, $borrowerinfo ) = AddReturn( $item1->barcode, $item1->homebranch ); |
| 3637 |
is( $messages->{RecallNeedsTransfer}, $item1->homebranch, "Recall requiring transfer found" ); |
| 3638 |
$recall1->set_cancelled; |
| 3639 |
|
| 3640 |
# this item is already in transit, do not ask to transfer |
| 3641 |
AddIssue( $patron1->unblessed, $item1->barcode ); |
| 3642 |
$recall1 = Koha::Recall->new({ |
| 3643 |
borrowernumber => $patron2->borrowernumber, |
| 3644 |
biblionumber => $item1->biblionumber, |
| 3645 |
itemnumber => $item1->itemnumber, |
| 3646 |
item_level_recall => 1, |
| 3647 |
branchcode => $patron2->branchcode, |
| 3648 |
status => 'R', |
| 3649 |
})->store; |
| 3650 |
$recall1->start_transfer; |
| 3651 |
( $doreturn, $messages, $iteminfo, $borrowerinfo ) = AddReturn( $item1->barcode, $patron2->branchcode ); |
| 3652 |
is( $messages->{TransferredRecall}->recall_id, $recall1->recall_id, "In transit recall found" ); |
| 3653 |
$recall1->set_cancelled; |
| 3654 |
}; |
| 3414 |
|
3655 |
|
| 3415 |
subtest 'AddRenewal and AddIssuingCharge tests' => sub { |
3656 |
subtest 'AddRenewal and AddIssuingCharge tests' => sub { |
| 3416 |
|
3657 |
|