Attachment #69489 for bug #18450

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

Lines 2639-2644 sub CanBookBeRenewed { Link Here

(-)a/C4/Circulation.pm (+1 lines)
2639	my ( $reserve_found, $reserve, undef ) =	2639	my ( $reserve_found, $reserve, undef ) =
2640	C4::Reserves::CheckReserves( $itemnumber, undef, undef, \@borrowernumbers );	2640	C4::Reserves::CheckReserves( $itemnumber, undef, undef, \@borrowernumbers );
2641		2641
		2642	warn $reserve_found;
2642	if ($reserve_found) {	2643	if ($reserve_found) {
2643	push( @borrowernumbers, $reserve->{borrowernumber} );	2644	push( @borrowernumbers, $reserve->{borrowernumber} );
2644	}	2645	}

Lines 76-81 if ($barcode) { Link Here

(-)a/circ/renew.pl (+2 lines)
76	else {	76	else {
77	$can_renew = 0;	77	$can_renew = 0;
78	}	78	}
		79
		80	$template->param(can_renew => $can_renew );
79	}	81	}
80		82
81	if ( $error && ($error eq 'too_soon' or $error eq 'auto_too_soon') ) {	83	if ( $error && ($error eq 'too_soon' or $error eq 'auto_too_soon') ) {





                                    <p>This item is on hold for another patron.</p>

                                    [% IF ((!Koha.Preference('AllowRenewalLimitOverride')) && ((Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) && can_renew == 1) || ((Koha.Preference('AllowRenewalLimitOverride')) && ((Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) && can_renew == 1 )%]
                                    <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="hidden" name="override_holds" value="1" />
                                            <button type="submit" class="approve"><i class="fa fa-check"></i> Override and renew</button>
                                        </form>
                                    [% ELSIF ((Koha.Preference('AllowRenewalLimitOverride')) && (!Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) %]
                                        <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="hidden" name="override_holds" value="1" />
                                            <button type="submit" class="approve"><i class="fa fa-check"></i> Override and renew</button>
                                        </form>
                                [% END %]
                            [% ELSIF error == "patron_restricted" %]

- 

Return to bug 18450

Lines 106-125 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (-14 / +13 lines)
106		106
107	<p>This item is on hold for another patron.</p>	107	<p>This item is on hold for another patron.</p>
108		108
109	[% IF (Koha.Preference('AllowRenewalLimitOverride')) && (Koha.Preference('AllowRenewalIfOtherItemsAvailable')) %]	109	[% IF ((!Koha.Preference('AllowRenewalLimitOverride')) && ((Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) && can_renew == 1) \|\| ((Koha.Preference('AllowRenewalLimitOverride')) && ((Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) && can_renew == 1 )%]
110	<form method="post" action="/cgi-bin/koha/circ/renew.pl">	110	<form method="post" action="/cgi-bin/koha/circ/renew.pl">
111	<input type="hidden" name="barcode" value="[% item.barcode %]"/>	111	<input type="hidden" name="barcode" value="[% item.barcode %]"/>
112	<input type="hidden" name="override_limit" value="1" />	112	<input type="hidden" name="override_limit" value="1" />
113	<input type="hidden" name="override_holds" value="1" />	113	<input type="hidden" name="override_holds" value="1" />
114	<button type="submit" class="approve"><i class="fa fa-check"></i> Override and renew</button>	114	<button type="submit" class="approve"><i class="fa fa-check"></i> Override and renew</button>
115	</form>	115	</form>
116	[% ELSIF (!(Koha.Preference('AllowRenewalLimitOverride')) && (Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) \|\| (Koha.Preference('AllowRenewalLimitOverride') && (!(Koha.Preference('AllowRenewalIfOtherItemsAvaliable')))) %]	116	[% ELSIF ((Koha.Preference('AllowRenewalLimitOverride')) && (!Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) %]
117	<form method="post" action="/cgi-bin/koha/circ/renew.pl">	117	<form method="post" action="/cgi-bin/koha/circ/renew.pl">
118	<input type="hidden" name="barcode" value="[% item.barcode %]"/>	118	<input type="hidden" name="barcode" value="[% item.barcode %]"/>
119	<input type="hidden" name="override_limit" value="1" />	119	<input type="hidden" name="override_limit" value="1" />
120	<input type="hidden" name="override_holds" value="1" />	120	<input type="hidden" name="override_holds" value="1" />
121	<button type="submit" class="approve"><i class="fa fa-check"></i> Override and renew</button>	121	<button type="submit" class="approve"><i class="fa fa-check"></i> Override and renew</button>
122	</form>	122	</form>
123	[% END %]	123	[% END %]
124	[% ELSIF error == "patron_restricted" %]	124	[% ELSIF error == "patron_restricted" %]
125		125
126	-