Attachment 31201 Details for Bug 11577 – [PASSED QA] Bug 11577: Add 'auto_renew' and 'auto_too_soon' to renewal page

[patch] [PASSED QA] Bug 11577: Add 'auto_renew' and 'auto_too_soon' to renewal page

PASSED-QA-Bug-11577-Add-autorenew-and-autotoosoon-.patch (text/plain), 4.03 KB, created by Martin Renvoize (ashimema) on 2014-08-27 17:36:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2014-08-27 17:36:23 UTC

Size: 4.03 KB

patch

obsolete

>From f863397c5e41cb9359dae2ca755af4f6a240274d Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Holger=20Mei=C3=9Fner?= <h.meissner.82@web.de>
>Date: Wed, 21 May 2014 15:15:11 +0200
>Subject: [PATCH] [PASSED QA] Bug 11577: Add 'auto_renew' and 'auto_too_soon'
> to renewal page
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This patch adds the new renewal errors 'auto_renew' and 'auto_too_soon'
>to the renewal interface.
>
>To test:
>
>1) Issue two items:
>   - one with automatic renewal and no value for "No renewal before"
>   - another with automatic renewal and a value for "No renewal before"
>2) Try to renew:
>   Home > Circulation > Renew
>3) Confirm there are error messages explaining that the items have been
>   scheduled for automatic renewal and that one of the renewals is also
>   premature.
>4) If global syspref AllowRenewalLimitOverride is set to "Allow" you
>   should be given the option to override.
>
>Sponsored-by: Hochschule fÃ¼r Gesundheit (hsg), Germany
>Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> circ/renew.pl                                      |    2 +-
> .../intranet-tmpl/prog/en/modules/circ/renew.tt    |   24 ++++++++++++++++++++
> 2 files changed, 25 insertions(+), 1 deletion(-)
>
>diff --git a/circ/renew.pl b/circ/renew.pl
>index 38a7611..7800fc9 100755
>--- a/circ/renew.pl
>+++ b/circ/renew.pl
>@@ -76,7 +76,7 @@ if ($barcode) {
>                     }
>                 }
> 
>-                if ( $error && ($error eq 'too_soon') ) {
>+                if ( $error && ($error eq 'too_soon' or $error eq 'auto_too_soon') ) {
>                     $soonest_renew_date = C4::Circulation::GetSoonestRenewDate(
>                         $borrower->borrowernumber(),
>                         $item->itemnumber(),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
>index 3ebd006..46a68ea 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
>@@ -66,6 +66,30 @@
>                                     </form>
>                                 [% END %]
> 
>+                            [% ELSIF error == "auto_too_soon" %]
>+
>+                                <p>[% item.biblio.title | $EncodeUTF8 %] [% item.biblioitem.subtitle | $EncodeUTF8 %] ( [% item.barcode %] ) has been scheduled for automatic renewal and cannot be renewed before [% soonestrenewdate | $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 | $EncodeUTF8 %] [% item.biblioitem.subtitle | $EncodeUTF8 %] ( [% item.barcode %] ) has been scheduled for automatic renewal. </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 limit and renew" />
>+                                    </form>
>+                                [% END %]
>+
>                             [% ELSIF error == "on_reserve" %]
> 
>                                 <p>This item is on hold for another patron.</p>
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 11577: 28425 | 28426 | 28427 | 28428 | 28429 | 28430 | 28431 | 28432 | 28433 | 28434 | 28454 | 28595 | 28596 | 28597 | 28598 | 28599 | 28600 | 28601 | 28602 | 28603 | 28604 | 29393 | 29394 | 29395 | 29396 | 29397 | 29398 | 29399 | 29400 | 29401 | 29402 | 29966 | 29967 | 29968 | 29969 | 29970 | 29971 | 29972 | 29973 | 29974 | 29975 | 30248 | 30249 | 30250 | 30251 | 30252 | 30253 | 30254 | 30255 | 30256 | 30257 | 30258 | 30692 | 30693 | 30694 | 30695 | 30696 | 30697 | 30698 | 30699 | 30700 | 30701 | 30702 | 31076 | 31077 | 31078 | 31079 | 31080 | 31081 | 31082 | 31083 | 31084 | 31085 | 31086 | 31198 | 31199 | 31200 | 31201 | 31202 | 31203 | 31204 | 31205 | 31206 | 31207 | 31208 | 31209 | 31640 | 31641 | 31642 | 31643 | 31644 | 31645 | 31646 | 31647 | 31648 | 31649 | 31650 | 31651 | 31652 | 31653 | 31654 | 31655 | 31656 | 31657 | 31658 | 31659 | 31660 | 31661 | 31662 | 31663 | 57734