[Koha-cvs] CVS: koha/circ returns.pl,1.7,1.8

[Finlay Thompson]

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv9940

Modified Files:
	returns.pl 
Log Message:

changed the behaviour when a reserved book is returned according to the wishes of HLT.


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** returns.pl	19 Jul 2002 03:33:52 -0000	1.7
--- returns.pl	23 Jul 2002 03:28:36 -0000	1.8
***************
*** 9,12 ****
--- 9,13 ----
  use C4::Search;
  use C4::Output;
+ use C4::Print;
  use C4::Reserves2;
  
***************
*** 29,34 ****
  ($printer) || ($printer=$query->cookie('printer')) ;
  
- my $request=$query->param('request');
- 
  
  #
--- 30,33 ----
***************
*** 66,94 ****
  # Collect a few messages here...
  my $messagetext='';
  
  ############
  # Deal with the requests....
! if ($request eq "KillWaiting") {
!     my $item = $query->param('itemnumber');
!     my $borrnum = $query->param('borrowernumber');
!     CancelReserve(0, $item, $borrnum);
!     $messagetext .= "Reserve Cancelled<br>";
! }
! if ($request eq "SetWaiting") {
      my $item = $query->param('itemnumber');
      my $borrnum = $query->param('borrowernumber');
!     my $barcode2 = $query->param('barcode2');
      my $tobranchcd = ReserveWaiting($item, $borrnum);
!     my ($transfered, $messages, $iteminfo) = transferbook($tobranchcd, $barcode2, 1);
!     $messagetext .= "Item should now be waiting at branch: <b>$branches->{$tobranchcd}->{'branchname'}</b><br>";
! }
! if ($request eq 'KillReserved'){
!     my $biblio = $query->param('biblionumber');
!     my $borrnum = $query->param('borrowernumber');
!     warn "In Kill Reserved";
!     CancelReserve($biblio, 0, $borrnum);
!     $messagetext .= "Reserve Cancelled<br>";
! }
  
  
  
--- 65,98 ----
  # Collect a few messages here...
  my $messagetext='';
+ my $reservetext='';
  
  ############
  # Deal with the requests....
! if ($query->param('resbarcode')) {
      my $item = $query->param('itemnumber');
      my $borrnum = $query->param('borrowernumber');
!     my $resbarcode = $query->param('resbarcode');
      my $tobranchcd = ReserveWaiting($item, $borrnum);
!     my $branchname = $branches->{$tobranchcd}->{'branchname'};
!     my ($borr) = getpatroninformation(\%env, $borrnum);
!     my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
!     my $number = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borr->{'borrowernumber'} onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}</a>";
  
+     if ($tobranchcd ne $branch) {
+ 	my ($transfered, $messages, $iteminfo) = transferbook($tobranchcd, $resbarcode, 1);
+ 	$reservetext .= <<"EOF";
+ <font color='red' size='+2'>Item marked Waiting:</font><br>
+     Item needs to be transfered to <b>$branchname</b> <br>
+ to be picked up by $name ($number).
+ <center><form method=post action='returns.pl'>
+ $ritext
+ <input type=hidden name=barcode value=0>
+ <input type=submit value="OK">
+ </form></center>
+ EOF
+     }
+     my ($iteminfo) = getiteminformation(\%env, $item);
+     printreserve(\%env, $branchname, $borr, $iteminfo);
+ }
  
  
***************
*** 168,175 ****
  
  
- my $reservefoundtext;
  if ($messages->{'ResFound'}) {
      my $res = $messages->{'ResFound'};
-     my $reservetext;
      my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
      my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
--- 172,177 ----
***************
*** 179,203 ****
  	$reservetext = <<"EOF";
  <font color='red' size='+2'>Item marked Waiting:</font><br>
!     Item is marked waiting at <b>$branchname</b> for $name ($number).<br>
! <table cellpadding=5 cellspacing=0>
! <tr><td>Cancel reservation: </td>
! <td>
! <form method=post action='returns.pl'>
! $ritext
! <input type=hidden name=itemnumber value=$res->{'itemnumber'}>
! <input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
! <input type=hidden name=request value='KillWaiting'>
! <input type=hidden name=barcode value=0>
! <input type=submit value="Cancel">
! </form>
! </td></tr>
! <tr><td>Back to returns: </td>
! <td>
! <form method=post action='returns.pl'>
  $ritext
  <input type=hidden name=barcode value=0>
  <input type=submit value="OK">
! </form>
! </td></tr></table>
  EOF
      } 
--- 181,190 ----
  	$reservetext = <<"EOF";
  <font color='red' size='+2'>Item marked Waiting:</font><br>
!     Item is marked waiting at <b>$branchname</b> for $name ($number).
! <center><form method=post action='returns.pl'>
  $ritext
  <input type=hidden name=barcode value=0>
  <input type=submit value="OK">
! </form></center>
  EOF
      } 
***************
*** 206,240 ****
  <font color='red' size='+2'>Reserved found:</font> for $name ($number).
  <table cellpadding=5 cellspacing=0>
! <tr><td>Set reserve to waiting and transfer book to <b>$branchname </b>: </td>
! <td>
  <form method=post action='returns.pl'>
  $ritext
  <input type=hidden name=itemnumber value=$res->{'itemnumber'}>
  <input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
! <input type=hidden name=barcode2 value=$barcode>
! <input type=hidden name=request value='SetWaiting'>
! <input type=submit value="Waiting">
  </form>
  </td></tr>
! <tr><td>Cancel reservation: </td>
! <td>
! <form method=post action='returns.pl'>
! $ritext
! <input type=hidden name=biblionumber value=$res->{'biblionumber'}>
! <input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
! <input type=hidden name=barcode value=0>
! <input type=hidden name=request value='KillReserved'>
! <input type=submit value="Cancel">
! </form>
! </td></tr><tr><td>Back to returns: </td>
! <td>
! <form method=post action='returns.pl'>
! <input type=hidden name=barcode value=0>
! $ritext
! <input type=submit value="OK">
! </form>
! </td></tr></table>
  EOF
      }
      $reservefoundtext = <<"EOF";
  <table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
--- 193,212 ----
  <font color='red' size='+2'>Reserved found:</font> for $name ($number).
  <table cellpadding=5 cellspacing=0>
! <tr><td valign="top">Change status to waiting and print slip?: </td>
! <td valign="top">
  <form method=post action='returns.pl'>
  $ritext
  <input type=hidden name=itemnumber value=$res->{'itemnumber'}>
  <input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
! <input type=hidden name=resbarcode value=$barcode>
! <input type=submit value="Print">
  </form>
  </td></tr>
! </table>
  EOF
      }
+ }
+ my $reservefoundtext;
+ if ($reservetext) {
      $reservefoundtext = <<"EOF";
  <table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>