[Koha-cvs] CVS: koha/circ circulation.pl,1.30,1.31

[Chris Cormack]

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

Modified Files:
        circulation.pl 
Log Message:
pop up pay window is working again


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** circulation.pl      19 Jun 2002 01:04:47 -0000      1.30
--- circulation.pl      19 Jun 2002 01:32:37 -0000      1.31
***************
*** 67,71 ****
  
  my $borrowernumber = $query->param('borrnumber');    
! 
  # check and see if we should print
  my $print=$query->param('print');
--- 67,71 ----
  
  my $borrowernumber = $query->param('borrnumber');    
! my $bornum = $query->param('borrnumber');    
  # check and see if we should print
  my $print=$query->param('print');
***************
*** 320,323 ****
--- 320,332 ----
  <input type=hidden name=printer value=$printer>
  <input type=hidden name=print value=maybe>
+ EOF
+ if ($flags->{'CHARGES'}){
+     $barcodeentrytext.="<input type=hidden name=charges value=yes>";
+ }
+ my $amountold=$flags->{'CHARGES'}->{'message'};
+ my @temp=split(/\$/,$amountold);
+ $amountold=$temp[1];
+ $barcodeentrytext.="<input type=hidden name=oldamount value=$amountold>";
+ $barcodeentrytext.=<<"EOF";
  </td></tr></table>
  </td></tr></table>
***************
*** 421,425 ****
  
  print startpage();
! print startmenu('circulation');
  
  print $title;
--- 430,455 ----
  
  print startpage();
! my @inp=startmenu('circulation');
! if ($query->param('barcode') eq '' && $query->param('charges') eq 'yes'){
!     my address@hidden;
!      for (my $i=0;$i<$count;$i++){
!        $inp[$i]=~ 
s/onLoad=focusinput\(\)/onLoad=focusinput\(\)\;messenger\(\"\/cgi-bin\/koha\/pay.pl?bornum=$bornum\"\)\;window1.focus\(\)/;
!      }
! }
! 
! print @inp;
! print <<EOF
!   <script language="javascript" type="text/javascript">
!   <!--
!   function messenger(url){
!          
window1=window.open(url,"window1","height=700,width=600,left=150,top=50,350,screenY=50");
!       }
! //-->
!   </script>
! EOF
! ;
! 
! 
! #print startmenu('circulation');
  
  print $title;