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

(-)a/C4/Circulation.pm (-2 / +22 lines)
Lines 2623-2634 already renewed the loan. $error will contain the reason the renewal can not pro Link Here
2623
=cut
2623
=cut
2624
2624
2625
sub CanBookBeRenewed {
2625
sub CanBookBeRenewed {
2626
    my ( $borrowernumber, $itemnumber, $override_limit ) = @_;
2626
    my ( $borrowernumber, $itemnumber, $override_limit, $date_due ) = @_;
2627
2627
2628
    my $dbh    = C4::Context->dbh;
2628
    my $dbh    = C4::Context->dbh;
2629
    my $renews = 1;
2629
    my $renews = 1;
2630
2630
2631
    my $item      = GetItem($itemnumber)      or return ( 0, 'no_item' );
2631
    my $item = Koha::Items->find( $itemnumber ) or return ( 0, 'no_item' );;
2632
    my $issue = Koha::Checkouts->find( { itemnumber => $itemnumber } ) or return ( 0, 'no_checkout' );
2632
    my $issue = Koha::Checkouts->find( { itemnumber => $itemnumber } ) or return ( 0, 'no_checkout' );
2633
    return ( 0, 'onsite_checkout' ) if $issue->onsite_checkout;
2633
    return ( 0, 'onsite_checkout' ) if $issue->onsite_checkout;
2634
2634
Lines 2701-2706 sub CanBookBeRenewed { Link Here
2701
            }
2701
            }
2702
        }
2702
        }
2703
    }
2703
    }
2704
2705
    unless ($date_due) {
2706
        my $itemtype = $item->effective_itemtype;
2707
        my $patron_unblessed = $patron->unblessed;
2708
        $date_due = (C4::Context->preference('RenewalPeriodBase') eq 'date_due') ?
2709
                                        dt_from_string( $issue->date_due, 'sql' ) :
2710
                                        DateTime->now( time_zone => C4::Context->tz());
2711
        $date_due =  CalcDateDue($date_due, $itemtype, _GetCircControlBranch($item, $patron_unblessed), $patron_unblessed, 'is a renewal');
2712
    }
2713
2714
    my $now = dt_from_string();
2715
    my $biblionumber = $item->biblionumber;
2716
    my $preventCheckoutOnSameReservePeriod =
2717
        C4::Context->preference("PreventCheckoutOnSameReservePeriod");
2718
    my $reserves_on_same_period =
2719
        ReservesOnSamePeriod($biblionumber, $itemnumber, $now->ymd, $date_due->ymd);
2720
    if ($preventCheckoutOnSameReservePeriod && $reserves_on_same_period) {
2721
        $resfound = 1;
2722
    }
2723
2704
    return ( 0, "on_reserve" ) if $resfound;    # '' when no hold was found
2724
    return ( 0, "on_reserve" ) if $resfound;    # '' when no hold was found
2705
2725
2706
    return ( 1, undef ) if $override_limit;
2726
    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 => 100;
20
use Test::More tests => 102;
21
21
22
use DateTime;
22
use DateTime;
23
23
Lines 219-224 C4::Context->dbh->do("DELETE FROM accountlines"); Link Here
219
219
220
    my ($biblionumber, $biblioitemnumber) = AddBiblio($biblio, '');
220
    my ($biblionumber, $biblioitemnumber) = AddBiblio($biblio, '');
221
221
222
222
    my $barcode = 'R00000342';
223
    my $barcode = 'R00000342';
223
    my $branch = $library2->{branchcode};
224
    my $branch = $library2->{branchcode};
224
225
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 1089-1094 C4::Context->dbh->do("DELETE FROM accountlines"); Link Here
1089
}
1091
}
1090
1092
1091
{
1093
{
1094
    # Don't allow renewing on reserve period with PreventCheckoutOnSameReservePeriod enabled
1095
    t::lib::Mocks::mock_preference( 'PreventCheckoutOnSameReservePeriod', 1 );
1096
1097
    my $start_issue_dt = DateTime->now();
1098
    $start_issue_dt->subtract( days => 15);
1099
    my $due_date = $start_issue_dt->clone;
1100
    $due_date->add( days => 17 );
1101
1102
    my $biblio = $builder->build({
1103
        source => 'Biblio',
1104
    });
1105
    my $biblionumber = $biblio->{biblionumber};
1106
1107
    my $item = $builder->build({
1108
        source => 'Item',
1109
        value => {
1110
            biblionumber => $biblionumber
1111
        }
1112
    });
1113
    my $itemnumber = $item->{itemnumber};
1114
1115
    my $issue = $builder->build({
1116
        source => 'Issue',
1117
        value => {
1118
            itemnumber => $itemnumber,
1119
            biblionumber => $biblionumber,
1120
            issuedate => $start_issue_dt->ymd,
1121
            date_due => $due_date->ymd,
1122
            onsite_checkout => 0
1123
        }
1124
    });
1125
1126
    my $reservedate = $due_date->clone;
1127
    $reservedate->add( days => 5 );
1128
    my $expirationdate = $reservedate->clone;
1129
    $expirationdate->add( days => 15 );
1130
    $builder->build({
1131
        source => 'Reserve',
1132
        value => {
1133
            biblionumber => $biblionumber,
1134
            itemnumber => $itemnumber,
1135
            reservedate => $reservedate->ymd,
1136
            expirationdate => $expirationdate->ymd
1137
        }
1138
    });
1139
1140
    my $requested_date_due = $due_date->clone;
1141
    $requested_date_due->add( days => 4 );
1142
    my ( $renewed, $error ) = CanBookBeRenewed( $issue->{borrowernumber}, $itemnumber, 1, $requested_date_due );
1143
    is( $renewed, 1, 'CanBookBeRenewed should allow to renew if no reserve date overlap' );
1144
1145
    $requested_date_due->add( days => 2 );
1146
    ( $renewed, $error ) = CanBookBeRenewed( $issue->{borrowernumber}, $itemnumber, 1, $requested_date_due );
1147
    is( $renewed, 0, 'CanBookBeRenewed should not allow to renew if reserve date overlap' );
1148
1149
    t::lib::Mocks::mock_preference( 'PreventCheckoutOnSameReservePeriod', 0 );
1150
}
1151
1152
{
1092
    my $library = $builder->build({ source => 'Branch' });
1153
    my $library = $builder->build({ source => 'Branch' });
1093
1154
1094
    my $biblio = MARC::Record->new();
1155
    my $biblio = MARC::Record->new();
1095
- 

Return to bug 15261