From 42162f285ac193d521d8b8be7b07383c3323754c Mon Sep 17 00:00:00 2001
From: Kyle M Hall
Date: Fri, 14 Sep 2012 15:03:49 -0400
Subject: [PATCH] Bug 8559 - Conflicting item statuses - Make issuing a waiting item impossible.
Content-Type: text/plain; charset="utf-8"
---
C4/Circulation.pm | 17 ++++++++++-------
.../prog/en/modules/circ/circulation.tt | 16 +++++-----------
2 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index e64f07d..58a5b48 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -928,13 +928,16 @@ sub CanBookBeIssued {
{
# The item is on reserve and waiting, but has been
# reserved by some other patron.
- $needsconfirmation{RESERVE_WAITING} = 1;
- $needsconfirmation{'resfirstname'} = $resborrower->{'firstname'};
- $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
- $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
- $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
- $needsconfirmation{'resbranchname'} = $branchname;
- $needsconfirmation{'reswaitingdate'} = format_date($res->{'waitingdate'});
+ $issuingimpossible{RESERVE_WAITING} = 1;
+ $issuingimpossible{'resfirstname'} = $resborrower->{'firstname'};
+ $issuingimpossible{'ressurname'} = $resborrower->{'surname'};
+ $issuingimpossible{'rescardnumber'} = $resborrower->{'cardnumber'};
+ $issuingimpossible{'resborrowernumber'} = $resborrower->{'borrowernumber'};
+ $issuingimpossible{'resbranchname'} = $branchname;
+ $issuingimpossible{'reswaitingdate'} = format_date($res->{'waitingdate'});
+ $issuingimpossible{'resbarcode'} = $item->{'barcode'};
+ $issuingimpossible{'restitle'} = $biblioitem->{'title'};
+
}
elsif ( $restype eq "Reserved" ) {
# The item is on reserve for someone else.
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..eff8ce5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -329,9 +329,6 @@ function validate1(date) {
Item [% getTitleMessageIteminfo %] ([% getBarcodeMessageIteminfo %]) is currently checked out to this patron. Renew?
[% END %]
-[% IF ( RESERVE_WAITING ) %]
-
Item [% getTitleMessageIteminfo %] ([% getBarcodeMessageIteminfo %]) has been waiting for [% resfirstname %] [% ressurname %] ([% rescardnumber %]) at [% resbranchname %] since [% reswaitingdate %]
-[% END %]
[% IF ( RESERVED ) %]
Item [% getTitleMessageIteminfo %] ([% getBarcodeMessageIteminfo %]) has been on hold for [% resfirstname %] [% ressurname %] ([% rescardnumber %]) at [% resbranchname %] since [% resreservedate %]
@@ -375,13 +372,6 @@ function validate1(date) {
[% END %]
-[% IF ( RESERVE_WAITING ) %]
-
-
-
-
-[% END %]
-
@@ -488,9 +478,13 @@ function validate1(date) {
Patron has had overdue items and is blocked for [% USERBLOCKEDREMAINING %] day(s).
[% END %]
- [% IF ( USERBLOCKEDOVERDUE ) %]
+ [% IF ( USERBLOCKEDOVERDUE ) %]
Checkouts are BLOCKED because patron has overdue items
[% END %]
+
+ [% IF ( RESERVE_WAITING ) %]
+
Item [% restitle %] ( [% resbarcode %] ) has been waiting for [% resfirstname %] [% ressurname %] ([% rescardnumber %]) at [% resbranchname %] since [% reswaitingdate %]