Attachment 12209 Details for Bug 6151 – Bug 6151 - Followup - Display message for failed returns on circulation.pl when returning via issues table.

[patch] Bug 6151 - Followup - Display message for failed returns on circulation.pl when returning via issues table.

Bug-6151---Followup---Display-message-for-failed-r.patch (text/plain), 3.10 KB, created by Mason James on 2012-09-14 08:53:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mason James

Created: 2012-09-14 08:53:48 UTC

Size: 3.10 KB

patch

obsolete

>From d8998a2b9cd9e7372d304c940ed41c7223dcc72e Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Thu, 2 Aug 2012 08:23:50 -0400
>Subject: [PATCH] Bug 6151 - Followup - Display message for failed returns on circulation.pl when returning via issues table.
>Content-Type: text/plain; charset="utf-8"
>http://koha-community.org
>
>Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
>---
> circ/circulation.pl                                |    5 +++++
> .../prog/en/modules/circ/circulation.tt            |    2 +-
> .../prog/en/modules/members/moremember.tt          |    2 +-
> 3 files changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/circ/circulation.pl b/circ/circulation.pl
>index 91adc09..c9fd1f1 100755
>--- a/circ/circulation.pl
>+++ b/circ/circulation.pl
>@@ -97,6 +97,10 @@ my @failedrenews = $query->param('failedrenew');    # expected to be itemnumbers
> our %renew_failed = {};
> for (@failedrenews) { $renew_failed{$_} = 1; }
> 
>+my @failedreturns = $query->param('failedreturn');
>+our %return_failed = {};
>+for (@failedreturns) { $return_failed{$_} = 1; }
>+
> my $findborrower = $query->param('findborrower');
> $findborrower =~ s|,| |g;
> my $borrowernumber = $query->param('borrowernumber');
>@@ -460,6 +464,7 @@ sub build_issue_data {
>         $it->{'od'} = $it->{'overdue'};
>         ($it->{'author'} eq '') and $it->{'author'} = ' ';
>         $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
>+        $it->{'return_failed'} = $return_failed{$it->{'itemnumber'}};
> 
>         if ( $it->{'issuedate'} gt $todaysdate or $it->{'lastreneweddate'} gt $todaysdate ) {
>             (!$relatives) ? push @todaysissues, $it : push @relissues, $it;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index c95002d..5f8fb99 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -900,7 +900,7 @@ No patron matched <span class="ex">[% message %]</span>
>         </td>
>         [% END %]
> 		  [% IF ( previssue.return_failed ) %]
>-            <td class="problem">Checkin failed</td>
>+            <td class="problem">Check-in failed</td>
>         [% ELSE %]
>             [% IF ( previssue.renew_error_on_reserve ) %]
>                <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% previssue.biblionumber %]">On hold</a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index a5530b3..abbf26f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -498,7 +498,7 @@ function validate1(date) {
>             </td>
>       [% END %]
>       [% IF ( issueloo.return_failed ) %]
>-            <td class="problem">Checkin failed</td>
>+            <td class="problem">Check-in failed</td>
>       [% ELSE %]
>         [% IF ( issueloo.norenew_reason_on_reserve ) %]
>             <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% issueloo.biblionumber %]">On hold</a></td>
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 6151: 6497 | 6701 | 11250 | 11294 | 11295 | 11410 | 11585 | 11595 | 12208 | 12209 | 12210