[Koha-cvs] CVS: koha/circ circulation.pl,1.32,1.33

[Finlay Thompson]

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

Modified Files:
	circulation.pl 
Log Message:

Fixed up the Print module. Added a function printslip that takes a string as an argument. It is easier to prepare the slip and then call the print function.
in circulation.pl I have moved some javascript out to the circulation-top.inc



Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** circulation.pl	23 Jul 2002 01:28:42 -0000	1.32
--- circulation.pl	24 Jul 2002 03:16:22 -0000	1.33
***************
*** 101,106 ****
  
  
! # if the barcode is set    
! 
  my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer);
  
--- 101,105 ----
  
  
! # if the barcode is set
  my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer);
  
***************
*** 451,469 ****
      my $count=@inp;
       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
- ;
  
  
--- 450,458 ----
      my $count=@inp;
       for (my $i=0;$i<$count;$i++){
! 	 $inp[$i]=~ s/onLoad=focusinput\(\)/onLoad=focusinput\(\)\;messenger\(\"\/cgi-bin\/koha\/pay.pl?bornum=$bornum\",700,600\)\;window1.focus\(\)/;
       }
  }
  
  print @inp;