Attachment #56746 for bug #15581

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




        return ( 0, 'overdue');
    }

    if ( $itemissue->{auto_renew}
        and defined $issuingrule->{no_auto_renewal_after}
                and $issuingrule->{no_auto_renewal_after} ne "" ) {

        # Get issue_date and add no_auto_renewal_after
        # If this is greater than today, it's too late for renewal.
        my $maximum_renewal_date = dt_from_string($itemissue->{issuedate});
        $maximum_renewal_date->add(
            $issuingrule->{lengthunit} => $issuingrule->{no_auto_renewal_after}
        );
        my $now = dt_from_string;
        if ( $now >= $maximum_renewal_date ) {
            return ( 0, "auto_too_late" );
        }
    }

    if ( defined $issuingrule->{norenewalbefore}
        and $issuingrule->{norenewalbefore} ne "" )
    {


    # Fallback for automatic renewals:
    # If norenewalbefore is undef, don't renew before due date.
    if ( $itemissue->{auto_renew} ) {
        my $now = dt_from_string;
        return ( 0, "auto_renew" )
          if $now >= $itemissue->{date_due};

Lines 136-141 elsif ($op eq 'add') { Link Here

(-)a/admin/smart-rules.pl (+3 lines)
136	my $norenewalbefore = $input->param('norenewalbefore');	136	my $norenewalbefore = $input->param('norenewalbefore');
137	$norenewalbefore = undef if $norenewalbefore =~ /^\s*$/;	137	$norenewalbefore = undef if $norenewalbefore =~ /^\s*$/;
138	my $auto_renew = $input->param('auto_renew') eq 'yes' ? 1 : 0;	138	my $auto_renew = $input->param('auto_renew') eq 'yes' ? 1 : 0;
		139	my $no_auto_renewal_after = $input->param('no_auto_renewal_after');
		140	$no_auto_renewal_after = undef if $no_auto_renewal_after =~ /^\s*$/;
139	my $reservesallowed = $input->param('reservesallowed');	141	my $reservesallowed = $input->param('reservesallowed');
140	my $holds_per_record = $input->param('holds_per_record');	142	my $holds_per_record = $input->param('holds_per_record');
141	my $onshelfholds = $input->param('onshelfholds') \|\| 0;	143	my $onshelfholds = $input->param('onshelfholds') \|\| 0;
Lines 172-177 elsif ($op eq 'add') { Link Here
172	renewalperiod => $renewalperiod,	174	renewalperiod => $renewalperiod,
173	norenewalbefore => $norenewalbefore,	175	norenewalbefore => $norenewalbefore,
174	auto_renew => $auto_renew,	176	auto_renew => $auto_renew,
		177	no_auto_renewal_after => $no_auto_renewal_after,
175	reservesallowed => $reservesallowed,	178	reservesallowed => $reservesallowed,
176	holds_per_record => $holds_per_record,	179	holds_per_record => $holds_per_record,
177	issuelength => $issuelength,	180	issuelength => $issuelength,

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_15581.sql (+1 lines)
	1	ALTER TABLE issuingrules ADD COLUMN no_auto_renewal_after INT(4) DEFAULT NULL AFTER auto_renew;

Lines 869-874 CREATE TABLE `issuingrules` ( -- circulation and fine rules Link Here

(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
869	`renewalperiod` int(4) default NULL, -- renewal period in the unit set in issuingrules.lengthunit	869	`renewalperiod` int(4) default NULL, -- renewal period in the unit set in issuingrules.lengthunit
870	`norenewalbefore` int(4) default NULL, -- no renewal allowed until X days or hours before due date.	870	`norenewalbefore` int(4) default NULL, -- no renewal allowed until X days or hours before due date.
871	`auto_renew` BOOLEAN default FALSE, -- automatic renewal	871	`auto_renew` BOOLEAN default FALSE, -- automatic renewal
		872	`no_auto_renewal_after` int(4) default NULL, -- no auto renewal allowed after X days or hours after the issue date
872	`reservesallowed` smallint(6) NOT NULL default "0", -- how many holds are allowed	873	`reservesallowed` smallint(6) NOT NULL default "0", -- how many holds are allowed
873	`holds_per_record` SMALLINT(6) NOT NULL DEFAULT 1, -- How many holds a patron can have on a given bib	874	`holds_per_record` SMALLINT(6) NOT NULL DEFAULT 1, -- How many holds a patron can have on a given bib
874	`branchcode` varchar(10) NOT NULL default '', -- the branch this rule is for (branches.branchcode)	875	`branchcode` varchar(10) NOT NULL default '', -- the branch this rule is for (branches.branchcode)




                <th>Renewal period</th>
                <th>No renewal before</th>
                <th>Automatic renewal</th>
                <th>No automatic renewal after</th>
                <th>Holds allowed (count)</th>
                <th>Holds per record (count)</th>
                <th>On shelf holds allowed</th>

                                No
                                [% END %]
                            </td>
                            <td>[% rule.no_auto_renewal_after %]</td>
							<td>[% rule.reservesallowed %]</td>
                                                        <td>[% rule.holds_per_record %]</td>
                                                        <td>

                            <option value="yes">Yes</option>
                        </select>
                    </td>
                    <td><input type="text" name="no_auto_renewal_after" id="no_auto_renewal_after" size="3" /></td>
                    <td><input type="text" name="reservesallowed" id="reservesallowed" size="2" /></td>
                    <td><input type="text" name="holds_per_record" id="holds_per_record" size="2" /></td>
                    <td>

                      <th>Renewal period</th>
                      <th>No renewal before</th>
                      <th>Automatic renewal</th>
                      <th>No automatic renewal after</th>
                      <th>Holds allowed (count)</th>
                      <th>Holds per record (count)</th>
                      <th>On shelf holds allowed</th>




                                    </form>
                                [% END %]

                            [% ELSIF error == "auto_too_late" %]

                                <p>[% item.biblio.title %] [% item.biblioitem.subtitle %] ( [% item.barcode %] ) has been scheduled for automatic renewal and cannot be renewed since [% latestrenewdate | $KohaDates %]. </p>

                                [% IF Koha.Preference('AllowRenewalLimitOverride') %]
                                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
                                        <input type="hidden" name="barcode" value="[% item.barcode %]"/>
                                        <input type="hidden" name="override_limit" value="1" />
                                        <input type="submit" class="approve" value="Override and renew" />
                                    </form>
                                [% END %]

                            [% ELSIF error == "auto_renew" %]

                                <p>[% item.biblio.title %] [% item.biblioitem.subtitle %] ( [% item.barcode %] ) has been scheduled for automatic renewal. </p>





use t::lib::TestBuilder;

use Test::More tests => 89;

BEGIN {
    use_ok('C4::Circulation');

        'Bug 14101: Cannot renew, renewal is automatic (returned code is auto_renew)'
    );

    subtest "too_late_renewal / no_auto_renewal_after" => sub {
        plan tests => 8;
        my $item_to_auto_renew = $builder->build(
            {   source => 'Item',
                value  => {
                    biblionumber  => $biblionumber,
                    homebranch    => $branch,
                    holdingbranch => $branch,
                }
            }
        );

        my $ten_days_before = dt_from_string->add( days => -10 );
        my $ten_days_ahead  = dt_from_string->add( days => 10 );
        AddIssue( $renewing_borrower, $item_to_auto_renew->{barcode}, $ten_days_ahead, undef, $ten_days_before, undef, { auto_renew => 1 } );

        $dbh->do('UPDATE issuingrules SET norenewalbefore = 7, no_auto_renewal_after = 9');
        ( $renewokay, $error ) =
          CanBookBeRenewed( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber} );
        is( $renewokay, 0, 'Do not renew, renewal is automatic' );
        is( $error, 'auto_too_late', 'Cannot renew, too late(returned code is auto_too_late)' );

        $dbh->do('UPDATE issuingrules SET norenewalbefore = 7, no_auto_renewal_after = 10');
        ( $renewokay, $error ) =
          CanBookBeRenewed( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber} );
        is( $renewokay, 0, 'Do not renew, renewal is automatic' );
        is( $error, 'auto_too_late', 'Cannot auto renew, too late - no_auto_renewal_after is inclusive(returned code is auto_too_late)' );

        $dbh->do('UPDATE issuingrules SET norenewalbefore = 7, no_auto_renewal_after = 11');
        ( $renewokay, $error ) =
          CanBookBeRenewed( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber} );
        is( $renewokay, 0, 'Do not renew, renewal is automatic' );
        is( $error, 'auto_too_soon', 'Cannot auto renew, too soon - no_auto_renewal_after is defined(returned code is auto_too_soon)' );

        $dbh->do('UPDATE issuingrules SET norenewalbefore = 10, no_auto_renewal_after = 11');
        ( $renewokay, $error ) =
          CanBookBeRenewed( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber} );
        is( $renewokay, 0,            'Do not renew, renewal is automatic' );
        is( $error,     'auto_renew', 'Cannot renew, renew is automatic' );
    };

    # Too many renewals

    # set policy to forbid renewals
- 

Return to bug 15581

Lines 2850-2855 sub CanBookBeRenewed { Link Here

(-)a/C4/Circulation.pm (-1 / +17 lines)
2850	return ( 0, 'overdue');	2850	return ( 0, 'overdue');
2851	}	2851	}
2852		2852
		2853	if ( $itemissue->{auto_renew}
		2854	and defined $issuingrule->{no_auto_renewal_after}
		2855	and $issuingrule->{no_auto_renewal_after} ne "" ) {
		2856
		2857	# Get issue_date and add no_auto_renewal_after
		2858	# If this is greater than today, it's too late for renewal.
		2859	my $maximum_renewal_date = dt_from_string($itemissue->{issuedate});
		2860	$maximum_renewal_date->add(
		2861	$issuingrule->{lengthunit} => $issuingrule->{no_auto_renewal_after}
		2862	);
		2863	my $now = dt_from_string;
		2864	if ( $now >= $maximum_renewal_date ) {
		2865	return ( 0, "auto_too_late" );
		2866	}
		2867	}
		2868
2853	if ( defined $issuingrule->{norenewalbefore}	2869	if ( defined $issuingrule->{norenewalbefore}
2854	and $issuingrule->{norenewalbefore} ne "" )	2870	and $issuingrule->{norenewalbefore} ne "" )
2855	{	2871	{
Lines 2879-2885 sub CanBookBeRenewed { Link Here
2879		2895
2880	# Fallback for automatic renewals:	2896	# Fallback for automatic renewals:
2881	# If norenewalbefore is undef, don't renew before due date.	2897	# If norenewalbefore is undef, don't renew before due date.
2882	elsif ( $itemissue->{auto_renew} ) {	2898	if ( $itemissue->{auto_renew} ) {
2883	my $now = dt_from_string;	2899	my $now = dt_from_string;
2884	return ( 0, "auto_renew" )	2900	return ( 0, "auto_renew" )
2885	if $now >= $itemissue->{date_due};	2901	if $now >= $itemissue->{date_due};

Lines 185-190 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (+4 lines)
185	<th>Renewal period</th>	185	<th>Renewal period</th>
186	<th>No renewal before</th>	186	<th>No renewal before</th>
187	<th>Automatic renewal</th>	187	<th>Automatic renewal</th>
		188	<th>No automatic renewal after</th>
188	<th>Holds allowed (count)</th>	189	<th>Holds allowed (count)</th>
189	<th>Holds per record (count)</th>	190	<th>Holds per record (count)</th>
190	<th>On shelf holds allowed</th>	191	<th>On shelf holds allowed</th>
Lines 264-269 $(document).ready(function() { Link Here
264	No	265	No
265	[% END %]	266	[% END %]
266	</td>	267	</td>
		268	<td>[% rule.no_auto_renewal_after %]</td>
267	<td>[% rule.reservesallowed %]</td>	269	<td>[% rule.reservesallowed %]</td>
268	<td>[% rule.holds_per_record %]</td>	270	<td>[% rule.holds_per_record %]</td>
269	<td>	271	<td>
Lines 339-344 $(document).ready(function() { Link Here
339	<option value="yes">Yes</option>	341	<option value="yes">Yes</option>
340	</select>	342	</select>
341	</td>	343	</td>
		344	<td><input type="text" name="no_auto_renewal_after" id="no_auto_renewal_after" size="3" /></td>
342	<td><input type="text" name="reservesallowed" id="reservesallowed" size="2" /></td>	345	<td><input type="text" name="reservesallowed" id="reservesallowed" size="2" /></td>
343	<td><input type="text" name="holds_per_record" id="holds_per_record" size="2" /></td>	346	<td><input type="text" name="holds_per_record" id="holds_per_record" size="2" /></td>
344	<td>	347	<td>
Lines 383-388 $(document).ready(function() { Link Here
383	<th>Renewal period</th>	386	<th>Renewal period</th>
384	<th>No renewal before</th>	387	<th>No renewal before</th>
385	<th>Automatic renewal</th>	388	<th>Automatic renewal</th>
		389	<th>No automatic renewal after</th>
386	<th>Holds allowed (count)</th>	390	<th>Holds allowed (count)</th>
387	<th>Holds per record (count)</th>	391	<th>Holds per record (count)</th>
388	<th>On shelf holds allowed</th>	392	<th>On shelf holds allowed</th>

Lines 29-35 use Koha::Database; Link Here

(-)a/t/db_dependent/Circulation.t (-2 / +42 lines)
29		29
30	use t::lib::TestBuilder;	30	use t::lib::TestBuilder;
31		31
32	use Test::More tests => 88;	32	use Test::More tests => 89;
33		33
34	BEGIN {	34	BEGIN {
35	use_ok('C4::Circulation');	35	use_ok('C4::Circulation');
Lines 550-555 C4::Context->dbh->do("DELETE FROM accountlines"); Link Here
550	'Bug 14101: Cannot renew, renewal is automatic (returned code is auto_renew)'	550	'Bug 14101: Cannot renew, renewal is automatic (returned code is auto_renew)'
551	);	551	);
552		552
		553	subtest "too_late_renewal / no_auto_renewal_after" => sub {
		554	plan tests => 8;
		555	my $item_to_auto_renew = $builder->build(
		556	{ source => 'Item',
		557	value => {
		558	biblionumber => $biblionumber,
		559	homebranch => $branch,
		560	holdingbranch => $branch,
		561	}
		562	}
		563	);
		564
		565	my $ten_days_before = dt_from_string->add( days => -10 );
		566	my $ten_days_ahead = dt_from_string->add( days => 10 );
		567	AddIssue( $renewing_borrower, $item_to_auto_renew->{barcode}, $ten_days_ahead, undef, $ten_days_before, undef, { auto_renew => 1 } );
		568
		569	$dbh->do('UPDATE issuingrules SET norenewalbefore = 7, no_auto_renewal_after = 9');
		570	( $renewokay, $error ) =
		571	CanBookBeRenewed( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber} );
		572	is( $renewokay, 0, 'Do not renew, renewal is automatic' );
		573	is( $error, 'auto_too_late', 'Cannot renew, too late(returned code is auto_too_late)' );
		574
		575	$dbh->do('UPDATE issuingrules SET norenewalbefore = 7, no_auto_renewal_after = 10');
		576	( $renewokay, $error ) =
		577	CanBookBeRenewed( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber} );
		578	is( $renewokay, 0, 'Do not renew, renewal is automatic' );
		579	is( $error, 'auto_too_late', 'Cannot auto renew, too late - no_auto_renewal_after is inclusive(returned code is auto_too_late)' );
		580
		581	$dbh->do('UPDATE issuingrules SET norenewalbefore = 7, no_auto_renewal_after = 11');
		582	( $renewokay, $error ) =
		583	CanBookBeRenewed( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber} );
		584	is( $renewokay, 0, 'Do not renew, renewal is automatic' );
		585	is( $error, 'auto_too_soon', 'Cannot auto renew, too soon - no_auto_renewal_after is defined(returned code is auto_too_soon)' );
		586
		587	$dbh->do('UPDATE issuingrules SET norenewalbefore = 10, no_auto_renewal_after = 11');
		588	( $renewokay, $error ) =
		589	CanBookBeRenewed( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber} );
		590	is( $renewokay, 0, 'Do not renew, renewal is automatic' );
		591	is( $error, 'auto_renew', 'Cannot renew, renew is automatic' );
		592	};
		593
553	# Too many renewals	594	# Too many renewals
554		595
555	# set policy to forbid renewals	596	# set policy to forbid renewals
556	-

Lines 77-82 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (+12 lines)
77	</form>	77	</form>
78	[% END %]	78	[% END %]
79		79
		80	[% ELSIF error == "auto_too_late" %]
		81
		82	<p>[% item.biblio.title %] [% item.biblioitem.subtitle %] ( [% item.barcode %] ) has been scheduled for automatic renewal and cannot be renewed since [% latestrenewdate \| $KohaDates %]. </p>
		83
		84	[% IF Koha.Preference('AllowRenewalLimitOverride') %]
		85	<form method="post" action="/cgi-bin/koha/circ/renew.pl">
		86	<input type="hidden" name="barcode" value="[% item.barcode %]"/>
		87	<input type="hidden" name="override_limit" value="1" />
		88	<input type="submit" class="approve" value="Override and renew" />
		89	</form>
		90	[% END %]
		91
80	[% ELSIF error == "auto_renew" %]	92	[% ELSIF error == "auto_renew" %]
81		93
82	<p>[% item.biblio.title %] [% item.biblioitem.subtitle %] ( [% item.barcode %] ) has been scheduled for automatic renewal. </p>	94	<p>[% item.biblio.title %] [% item.biblioitem.subtitle %] ( [% item.barcode %] ) has been scheduled for automatic renewal. </p>