View | Details | Raw Unified | Return to bug 15261
Collapse All | Expand All

(-)a/C4/Circulation.pm (-1 / +21 lines)
Lines 2627-2633 already renewed the loan. $error will contain the reason the renewal can not pro Link Here
2627
=cut
2627
=cut
2628
2628
2629
sub CanBookBeRenewed {
2629
sub CanBookBeRenewed {
2630
    my ( $borrowernumber, $itemnumber, $override_limit ) = @_;
2630
    my ( $borrowernumber, $itemnumber, $override_limit, $date_due ) = @_;
2631
2631
2632
    my $dbh    = C4::Context->dbh;
2632
    my $dbh    = C4::Context->dbh;
2633
    my $renews = 1;
2633
    my $renews = 1;
Lines 2704-2709 sub CanBookBeRenewed { Link Here
2704
            }
2704
            }
2705
        }
2705
        }
2706
    }
2706
    }
2707
2708
    unless ($date_due) {
2709
        my $itemtype = $item->effective_itemtype;
2710
        my $patron_unblessed = $patron->unblessed;
2711
        $date_due = (C4::Context->preference('RenewalPeriodBase') eq 'date_due') ?
2712
                                        dt_from_string( $issue->date_due, 'sql' ) :
2713
                                        DateTime->now( time_zone => C4::Context->tz());
2714
        $date_due =  CalcDateDue($date_due, $itemtype, _GetCircControlBranch($item, $patron_unblessed), $patron_unblessed, 'is a renewal');
2715
    }
2716
2717
    my $now = dt_from_string();
2718
    my $biblionumber = $item->biblionumber;
2719
    my $preventCheckoutOnSameReservePeriod =
2720
        C4::Context->preference("PreventCheckoutOnSameReservePeriod");
2721
    my $reserves_on_same_period =
2722
        ReservesOnSamePeriod($biblionumber, $itemnumber, $now->ymd, $date_due->ymd);
2723
    if ($preventCheckoutOnSameReservePeriod && $reserves_on_same_period) {
2724
        $resfound = 1;
2725
    }
2726
2707
    return ( 0, "on_reserve" ) if $resfound;    # '' when no hold was found
2727
    return ( 0, "on_reserve" ) if $resfound;    # '' when no hold was found
2708
2728
2709
    return ( 1, undef ) if $override_limit;
2729
    return ( 1, undef ) if $override_limit;
(-)a/svc/renew (-1 / +1 lines)
Lines 57-63 $data->{borrowernumber} = $borrowernumber; Link Here
57
$data->{branchcode} = $branchcode;
57
$data->{branchcode} = $branchcode;
58
58
59
( $data->{renew_okay}, $data->{error} ) =
59
( $data->{renew_okay}, $data->{error} ) =
60
  CanBookBeRenewed( $borrowernumber, $itemnumber, $override_limit );
60
  CanBookBeRenewed( $borrowernumber, $itemnumber, $override_limit, $date_due );
61
61
62
if ( $data->{renew_okay} ) {
62
if ( $data->{renew_okay} ) {
63
    $date_due = AddRenewal( $borrowernumber, $itemnumber, $branchcode, $date_due );
63
    $date_due = AddRenewal( $borrowernumber, $itemnumber, $branchcode, $date_due );
(-)a/t/db_dependent/Circulation.t (-2 / +61 lines)
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 => 130;
21
use Test::More tests => 132;
22
use Test::MockModule;
22
use Test::MockModule;
23
23
24
use Data::Dumper;
24
use Data::Dumper;
Lines 329-334 my ( $reused_itemnumber_1, $reused_itemnumber_2 ); Link Here
329
    my $borrowing_borrowernumber = Koha::Checkouts->find( { itemnumber => $item_1->itemnumber } )->borrowernumber;
329
    my $borrowing_borrowernumber = Koha::Checkouts->find( { itemnumber => $item_1->itemnumber } )->borrowernumber;
330
    is ($borrowing_borrowernumber, $renewing_borrowernumber, "Item checked out to $renewing_borrower->{firstname} $renewing_borrower->{surname}");
330
    is ($borrowing_borrowernumber, $renewing_borrowernumber, "Item checked out to $renewing_borrower->{firstname} $renewing_borrower->{surname}");
331
331
332
    t::lib::Mocks::mock_preference('CircControl', 'PatronLibrary');
332
    my ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_1->itemnumber, 1);
333
    my ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_1->itemnumber, 1);
333
    is( $renewokay, 1, 'Can renew, no holds for this title or item');
334
    is( $renewokay, 1, 'Can renew, no holds for this title or item');
334
335
Lines 1196-1201 my ( $reused_itemnumber_1, $reused_itemnumber_2 ); Link Here
1196
    is( $error, 'onsite_checkout', 'A correct error code should be returned by CanBookBeRenewed for on-site checkout' );
1197
    is( $error, 'onsite_checkout', 'A correct error code should be returned by CanBookBeRenewed for on-site checkout' );
1197
}
1198
}
1198
1199
1200
{
1201
    # Don't allow renewing on reserve period with PreventCheckoutOnSameReservePeriod enabled
1202
    t::lib::Mocks::mock_preference( 'PreventCheckoutOnSameReservePeriod', 1 );
1203
1204
    my $start_issue_dt = DateTime->now();
1205
    $start_issue_dt->subtract( days => 15);
1206
    my $due_date = $start_issue_dt->clone;
1207
    $due_date->add( days => 17 );
1208
1209
    my $biblio = $builder->build({
1210
        source => 'Biblio',
1211
    });
1212
    my $biblionumber = $biblio->{biblionumber};
1213
1214
    my $item = $builder->build({
1215
        source => 'Item',
1216
        value => {
1217
            biblionumber => $biblionumber
1218
        }
1219
    });
1220
    my $itemnumber = $item->{itemnumber};
1221
1222
    my $issue = $builder->build({
1223
        source => 'Issue',
1224
        value => {
1225
            itemnumber => $itemnumber,
1226
            biblionumber => $biblionumber,
1227
            issuedate => $start_issue_dt->ymd,
1228
            date_due => $due_date->ymd,
1229
            onsite_checkout => 0
1230
        }
1231
    });
1232
1233
    my $reservedate = $due_date->clone;
1234
    $reservedate->add( days => 5 );
1235
    my $expirationdate = $reservedate->clone;
1236
    $expirationdate->add( days => 15 );
1237
    $builder->build({
1238
        source => 'Reserve',
1239
        value => {
1240
            biblionumber => $biblionumber,
1241
            itemnumber => $itemnumber,
1242
            reservedate => $reservedate->ymd,
1243
            expirationdate => $expirationdate->ymd
1244
        }
1245
    });
1246
1247
    my $requested_date_due = $due_date->clone;
1248
    $requested_date_due->add( days => 4 );
1249
    my ( $renewed, $error ) = CanBookBeRenewed( $issue->{borrowernumber}, $itemnumber, 1, $requested_date_due );
1250
    is( $renewed, 1, 'CanBookBeRenewed should allow to renew if no reserve date overlap' );
1251
1252
    $requested_date_due->add( days => 2 );
1253
    ( $renewed, $error ) = CanBookBeRenewed( $issue->{borrowernumber}, $itemnumber, 1, $requested_date_due );
1254
    is( $renewed, 0, 'CanBookBeRenewed should not allow to renew if reserve date overlap' );
1255
1256
    t::lib::Mocks::mock_preference( 'PreventCheckoutOnSameReservePeriod', 0 );
1257
}
1258
1199
{
1259
{
1200
    my $library = $builder->build({ source => 'Branch' });
1260
    my $library = $builder->build({ source => 'Branch' });
1201
1261
1202
- 

Return to bug 15261