[Koha-cvs] CVS: koha/circ returns.pl,1.11,1.12

[Finlay Thompson]

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

Modified Files:
        returns.pl 
Log Message:

all items are listed in the returned items list, regardless of whether they 
were issued or not.
Changed some messageing stuff as well, but will be back to fix that up some 
more.


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** returns.pl  26 Jul 2002 02:27:16 -0000      1.11
--- returns.pl  14 Aug 2002 05:35:53 -0000      1.12
***************
*** 107,117 ****
      $barcode = cuecatbarcodedecode($barcode);
      ($returned, $messages, $iteminformation, $borrower) = 
returnbook($barcode, $branch);
      if ($returned) {
-       $returneditems{0} = $barcode;
        $riborrowernumber{0} = $borrower->{'borrowernumber'};
        $riduedate{0} = $iteminformation->{'date_due'};
-       $ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
        $ritext.= "<input type=hidden name=dd-0 
value=$iteminformation->{'date_due'}>\n";
        $ritext.= "<input type=hidden name=bn-0 
value=$borrower->{'borrowernumber'}>\n";
      }
  }
--- 107,122 ----
      $barcode = cuecatbarcodedecode($barcode);
      ($returned, $messages, $iteminformation, $borrower) = 
returnbook($barcode, $branch);
+     $returneditems{0} = $barcode;
+     $ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
      if ($returned) {
        $riborrowernumber{0} = $borrower->{'borrowernumber'};
        $riduedate{0} = $iteminformation->{'date_due'};
        $ritext.= "<input type=hidden name=dd-0 
value=$iteminformation->{'date_due'}>\n";
        $ritext.= "<input type=hidden name=bn-0 
value=$borrower->{'borrowernumber'}>\n";
+     } else {
+       $riborrowernumber{0} = 0;
+       $riduedate{0} = 0;
+       $ritext.= "<input type=hidden name=dd-0 value=0>\n";
+       $ritext.= "<input type=hidden name=bn-0 value=0>\n";
      }
  }
***************
*** 207,211 ****
  
  BORROWER:
! $borr->{'surname'}, $borr->{'firstname'}
  card number: $borr->{'cardnumber'}
  Phone: $borr->{'phone'}
--- 212,216 ----
  
  BORROWER:
! $borr->{'title'} $borr->{'surname'}, $borr->{'firstname'}
  card number: $borr->{'cardnumber'}
  Phone: $borr->{'phone'}
***************
*** 216,224 ****
  
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  EOF
  
        $reservetext = <<"EOF";
! <font color='red' size='+2'>Reserved found:</font> Item: $iteminfo->{'title'} 
($iteminfo->{'author'}) <br>
! for $name ($number).
  <table cellpadding=5 cellspacing=0>
  <tr><td valign="top">Change status to waiting and print 
--- 221,230 ----
  
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
  EOF
  
        $reservetext = <<"EOF";
! <font color='red' size='+2'>Reserve found:</font> Item: $iteminfo->{'title'} 
($iteminfo->{'author'}) <br>
! for $name ($number) to be collected at <b>$branchname</b>.
  <table cellpadding=5 cellspacing=0>
  <tr><td valign="top">Change status to waiting and print 
***************
*** 249,252 ****
--- 255,259 ----
  # collect the messages and put into message table....
  foreach my $code (keys %$messages) {
+     warn $code;
      if ($code eq 'BadBarcode'){
        $messagetext .= "<font color='red' size='+2'> No Item with barcode: 
$messages->{'BadBarcode'} </font> <br>";
***************
*** 259,262 ****
--- 266,272 ----
        $messagetext .= "<font color='red' size='+2'> Item was lost, now found. 
</font> <br>";
      }
+     if ($code eq 'wthdrawm'){
+       $messagetext .= "<font color='red' size='+2'> Item Cancelled. </font> 
<br>";
+     }
      if (($code eq 'IsPermanent') && (not $messages->{'ResFound'})) {
        if ($messages->{'IsPermanent'} ne $branch) {
***************
*** 345,351 ****
  <b>Flags</b></td></tr>
  $flaginfotext 
- </table>
  EOF
      }
  }
  
--- 355,361 ----
  <b>Flags</b></td></tr>
  $flaginfotext 
  EOF
      }
+     $borrowertable .= "</table>";
  }
  
***************
*** 366,382 ****
        my $barcode = $returneditems{$_};
        my $duedate = $riduedate{$_};
!       my @datearr = localtime(time());
!       ###
!       # convert to nz date format
!       my @tempdate = split(/-/,$duedate);
!       my $duedatenz = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
!       ####
!       my $todaysdate 
!           = (1900+$datearr[5]).'-'.sprintf ("%0.2d", 
($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
!       my $overduetext = "$duedatenz";
!       ($overduetext="<font color=red>$duedate</font>") if ($duedate lt 
$todaysdate);
!       ($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
!       my $borrowernumber = $riborrowernumber{$_};
!       my ($borrower) = getpatroninformation(\%env,$borrowernumber,0);
        my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
        $returneditemstable .= << "EOF";
--- 376,399 ----
        my $barcode = $returneditems{$_};
        my $duedate = $riduedate{$_};
!       my $overduetext;
!       if ($duedate) {
!           my @tempdate = split ( /-/ , $duedate ) ;
!             my $duedatenz = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
!             my @datearr = localtime(time());
!             my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", 
($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
!           $overduetext = "$duedatenz";
!           ($overduetext="<font color=red>$duedate</font>") if ($duedate lt 
$todaysdate);
!           ($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
!         } else {
!             $overduetext = "Not on loan.";
!       }
!         my $borrowernumber = $riborrowernumber{$_};
!         my $borrowerinfo;
!         if ($borrowernumber) {
!           my ($borrower) = getpatroninformation(\%env,$borrowernumber,0);
!             my $borrowerinfo = "<a 
href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} 
onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> 
$borrower->{'firstname'} $borrower->{'surname'}";
!         } else {
!           $borrowerinfo = "Not on loan.";
!       }
        my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
        $returneditemstable .= << "EOF";
***************
*** 388,392 ****
  <td bgcolor=$color align=center>$iteminformation->{'itemtype'}</td>
  <td bgcolor=$color>
! <a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} 
onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> 
$borrower->{'firstname'} $borrower->{'surname'}</td></tr>
  EOF
      } else {
--- 405,409 ----
  <td bgcolor=$color align=center>$iteminformation->{'itemtype'}</td>
  <td bgcolor=$color>
! $borrowerinfo</td></tr>
  EOF
      } else {