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

(-)a/C4/Circulation.pm (-2 / +22 lines)
Lines 2611-2622 already renewed the loan. $error will contain the reason the renewal can not pro Link Here
2611
=cut
2611
=cut
2612
2612
2613
sub CanBookBeRenewed {
2613
sub CanBookBeRenewed {
2614
    my ( $borrowernumber, $itemnumber, $override_limit ) = @_;
2614
    my ( $borrowernumber, $itemnumber, $override_limit, $date_due ) = @_;
2615
2615
2616
    my $dbh    = C4::Context->dbh;
2616
    my $dbh    = C4::Context->dbh;
2617
    my $renews = 1;
2617
    my $renews = 1;
2618
2618
2619
    my $item      = GetItem($itemnumber)      or return ( 0, 'no_item' );
2619
    my $item = Koha::Items->find( $itemnumber ) or return ( 0, 'no_item' );;
2620
    my $issue = Koha::Checkouts->find( { itemnumber => $itemnumber } ) or return ( 0, 'no_checkout' );
2620
    my $issue = Koha::Checkouts->find( { itemnumber => $itemnumber } ) or return ( 0, 'no_checkout' );
2621
    return ( 0, 'onsite_checkout' ) if $issue->onsite_checkout;
2621
    return ( 0, 'onsite_checkout' ) if $issue->onsite_checkout;
2622
2622
Lines 2689-2694 sub CanBookBeRenewed { Link Here
2689
            }
2689
            }
2690
        }
2690
        }
2691
    }
2691
    }
2692
2693
    unless ($date_due) {
2694
        my $itemtype = $item->effective_itemtype;
2695
        my $patron_unblessed = $patron->unblessed;
2696
        $date_due = (C4::Context->preference('RenewalPeriodBase') eq 'date_due') ?
2697
                                        dt_from_string( $issue->date_due, 'sql' ) :
2698
                                        DateTime->now( time_zone => C4::Context->tz());
2699
        $date_due =  CalcDateDue($date_due, $itemtype, _GetCircControlBranch($item, $patron_unblessed), $patron_unblessed, 'is a renewal');
2700
    }
2701
2702
    my $now = dt_from_string();
2703
    my $biblionumber = $item->biblionumber;
2704
    my $preventCheckoutOnSameReservePeriod =
2705
        C4::Context->preference("PreventCheckoutOnSameReservePeriod");
2706
    my $reserves_on_same_period =
2707
        ReservesOnSamePeriod($biblionumber, $itemnumber, $now->ymd, $date_due->ymd);
2708
    if ($preventCheckoutOnSameReservePeriod && $reserves_on_same_period) {
2709
        $resfound = 1;
2710
    }
2711
2692
    return ( 0, "on_reserve" ) if $resfound;    # '' when no hold was found
2712
    return ( 0, "on_reserve" ) if $resfound;    # '' when no hold was found
2693
2713
2694
    return ( 1, undef ) if $override_limit;
2714
    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 / +62 lines)
Lines 17-23 Link Here
17
17
18
use Modern::Perl;
18
use Modern::Perl;
19
19
20
use Test::More tests => 112;
20
use Test::More tests => 114;
21
21
22
use DateTime;
22
use DateTime;
23
23
Lines 222-227 C4::Context->dbh->do("DELETE FROM accountlines"); Link Here
222
222
223
    my ($biblionumber, $biblioitemnumber) = AddBiblio($biblio, '');
223
    my ($biblionumber, $biblioitemnumber) = AddBiblio($biblio, '');
224
224
225
225
    my $barcode = 'R00000342';
226
    my $barcode = 'R00000342';
226
    my $branch = $library2->{branchcode};
227
    my $branch = $library2->{branchcode};
227
228
Lines 318-323 C4::Context->dbh->do("DELETE FROM accountlines"); Link Here
318
    my $borrowing_borrowernumber = Koha::Checkouts->find( { itemnumber => $itemnumber } )->borrowernumber;
319
    my $borrowing_borrowernumber = Koha::Checkouts->find( { itemnumber => $itemnumber } )->borrowernumber;
319
    is ($borrowing_borrowernumber, $renewing_borrowernumber, "Item checked out to $renewing_borrower->{firstname} $renewing_borrower->{surname}");
320
    is ($borrowing_borrowernumber, $renewing_borrowernumber, "Item checked out to $renewing_borrower->{firstname} $renewing_borrower->{surname}");
320
321
322
    t::lib::Mocks::mock_preference('CircControl', 'PatronLibrary');
321
    my ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber, 1);
323
    my ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber, 1);
322
    is( $renewokay, 1, 'Can renew, no holds for this title or item');
324
    is( $renewokay, 1, 'Can renew, no holds for this title or item');
323
325
Lines 1100-1105 C4::Context->dbh->do("DELETE FROM accountlines"); Link Here
1100
}
1102
}
1101
1103
1102
{
1104
{
1105
    # Don't allow renewing on reserve period with PreventCheckoutOnSameReservePeriod enabled
1106
    t::lib::Mocks::mock_preference( 'PreventCheckoutOnSameReservePeriod', 1 );
1107
1108
    my $start_issue_dt = DateTime->now();
1109
    $start_issue_dt->subtract( days => 15);
1110
    my $due_date = $start_issue_dt->clone;
1111
    $due_date->add( days => 17 );
1112
1113
    my $biblio = $builder->build({
1114
        source => 'Biblio',
1115
    });
1116
    my $biblionumber = $biblio->{biblionumber};
1117
1118
    my $item = $builder->build({
1119
        source => 'Item',
1120
        value => {
1121
            biblionumber => $biblionumber
1122
        }
1123
    });
1124
    my $itemnumber = $item->{itemnumber};
1125
1126
    my $issue = $builder->build({
1127
        source => 'Issue',
1128
        value => {
1129
            itemnumber => $itemnumber,
1130
            biblionumber => $biblionumber,
1131
            issuedate => $start_issue_dt->ymd,
1132
            date_due => $due_date->ymd,
1133
            onsite_checkout => 0
1134
        }
1135
    });
1136
1137
    my $reservedate = $due_date->clone;
1138
    $reservedate->add( days => 5 );
1139
    my $expirationdate = $reservedate->clone;
1140
    $expirationdate->add( days => 15 );
1141
    $builder->build({
1142
        source => 'Reserve',
1143
        value => {
1144
            biblionumber => $biblionumber,
1145
            itemnumber => $itemnumber,
1146
            reservedate => $reservedate->ymd,
1147
            expirationdate => $expirationdate->ymd
1148
        }
1149
    });
1150
1151
    my $requested_date_due = $due_date->clone;
1152
    $requested_date_due->add( days => 4 );
1153
    my ( $renewed, $error ) = CanBookBeRenewed( $issue->{borrowernumber}, $itemnumber, 1, $requested_date_due );
1154
    is( $renewed, 1, 'CanBookBeRenewed should allow to renew if no reserve date overlap' );
1155
1156
    $requested_date_due->add( days => 2 );
1157
    ( $renewed, $error ) = CanBookBeRenewed( $issue->{borrowernumber}, $itemnumber, 1, $requested_date_due );
1158
    is( $renewed, 0, 'CanBookBeRenewed should not allow to renew if reserve date overlap' );
1159
1160
    t::lib::Mocks::mock_preference( 'PreventCheckoutOnSameReservePeriod', 0 );
1161
}
1162
1163
{
1103
    my $library = $builder->build({ source => 'Branch' });
1164
    my $library = $builder->build({ source => 'Branch' });
1104
1165
1105
    my $biblio = MARC::Record->new();
1166
    my $biblio = MARC::Record->new();
1106
- 

Return to bug 15261