From rangi@users.sourceforge.net Tue Apr  3 14:34:46 2001
From: Chris Cormack <rangi@users.sourceforge.net>
To: koha-devel@lists.koha-community.org
Subject: [Koha-devel] CVS: koha/circ circulation.pl,1.17,1.18
Date: Tue, 03 Apr 2001 14:32:39 -0700
Message-ID: <E14kYPn-0006Ls-00@usw-pr-cvs1.sourceforge.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6717825871605051439=="

--===============6717825871605051439==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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

Modified Files:
	circulation.pl=20
Log Message:
Making a change to the way charges are handled, the system originally worked =
such that if a borrower owed more than $5 issues werent allowed. This worked =
fine except that often borrowers wish to borrows say 3 pay videos at $2 each,=
 then 2 books say. The three pay videos rack up charges of $6 and then they c=
ant issue the books until that is paid.
Reworked so that it cares about previous charges, not the ones accrued during=
 current issue process.


Index: circulation.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** circulation.pl	2001/03/28 03:00:56	1.17
--- circulation.pl	2001/04/03 21:32:37	1.18
***************
*** 73,78 ****
  #print $query->dump;
  print startpage();
! print startmenu('circulation');
!=20
 =20
  print <<EOF
--- 73,86 ----
  #print $query->dump;
  print startpage();
! #print startmenu('circulation');
! my @inp=3Dstartmenu('circulation');
! if ($query->param('module') eq 'issues' && $query->param('barcode') eq '' &=
& $query->param('charges') eq 'yes'){
!  my $count=3D@inp;
!  for (my $i=3D0;$i<$count;$i++){
!   my $bornum=3D$query->param('borrnumber');
!   $inp[$i]=3D~ s/onLoad=3Dfocusinput\(\)/onLoad=3Dfocusinput\(\)\;messenger=
\(\"\/cgi-bin\/koha\/pay.pl?bornum=3D$bornum\"\)\;window1.focus\(\)/;
!  }
! }
! print @inp;
 =20
  print <<EOF
***************
*** 85,89 ****
  </script>
  EOF
!=20
  if ($printer && $branch) {
 =20
--- 93,97 ----
  </script>
  EOF
! ;
  if ($printer && $branch) {
 =20
***************
*** 226,230 ****
  =09
      my $barcodeentrytext=3D << "EOF";
!     <form method=3Dget>
      <table border=3D0 cellpadding=3D5 cellspacing=3D0 bgcolor=3D#dddddd>
  	<tr><td colspan=3D2 bgcolor=3D$headerbackgroundcolor align=3Dcenter backgr=
ound=3D$backgroundimage><font color=3Dblack><b>Enter Book Barcode</b></font><=
/td></tr>
--- 234,238 ----
  =09
      my $barcodeentrytext=3D << "EOF";
!     <form method=3Dpost action=3D/cgi-bin/koha/circ/circulation.pl>
      <table border=3D0 cellpadding=3D5 cellspacing=3D0 bgcolor=3D#dddddd>
  	<tr><td colspan=3D2 bgcolor=3D$headerbackgroundcolor align=3Dcenter backgr=
ound=3D$backgroundimage><font color=3Dblack><b>Enter Book Barcode</b></font><=
/td></tr>
***************
*** 488,492 ****
  	    }
  	    unless ($invalidduedate) {
! 		my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $d=
efaultanswer, $message) =3D issuebook(\%env, $borrower, $barcode, \%responses=
);
  		unless ($iteminformation) {
  		    print << "EOF";
--- 496,502 ----
  	    }
  	    unless ($invalidduedate) {
! 	        my @time=3Dlocaltime(time);
! 		my $date=3D (1900+$time[5])."-".($time[4]+1)."-".$time[3];
! 		my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $d=
efaultanswer, $message) =3D issuebook(\%env, $borrower, $barcode, \%responses=
,$date);
  		unless ($iteminformation) {
  		    print << "EOF";
***************
*** 506,511 ****
  			print << "EOF"
  			<table border=3D0 cellpadding=3D5 cellspacing=3D0 bgcolor=3D#dddddd>
! 			<tr><th bgcolor=3D background=3D$backgroundimage><font color=3Dblack>Err=
or Issuing Book</font></th></tr>
! 			<tr><td><font color=3Dred>$rejected</font></td></tr>
  			</table>
  			<br>
--- 516,521 ----
  			print << "EOF"
  			<table border=3D0 cellpadding=3D5 cellspacing=3D0 bgcolor=3D#dddddd>
! 			<tr><th><font color=3Dblack size=3D6>Error Issuing Book</font></th></tr>
! 			<tr><td><font color=3Dred size=3D6>$rejected</font></td></tr>
  			</table>
  			<br>
***************
*** 698,702 ****
  	<input type=3Dhidden name=3Dbranch value=3D$branch>
  	<input type=3Dhidden name=3Dprinter value=3D$printer>
! 	</form>
  	</td>
 =20
--- 708,723 ----
  	<input type=3Dhidden name=3Dbranch value=3D$branch>
  	<input type=3Dhidden name=3Dprinter value=3D$printer>
! =09
! EOF
! ;
!   my $amountold=3D$flags->{'CHARGES'}->{'message'};
!   my @temp=3Dsplit(/\$/,$amountold);
!   $amountold=3D$temp[1];
!   print "<input type=3Dhidden name=3Doldamount value=3D$amountold>";
!   if ($flags->{'CHARGES'}){
!             print "<input type=3Dhidden name=3Dcharges value=3Dyes>";
!   }
! print <<EOF
! </form>
  	</td>
 =20
***************
*** 806,810 ****
  	} else {
  	    if ($flag eq 'CHARGES') {
! 		$flaginfotext.=3D"<tr><td valign=3Dtop>$flag</td><td $flags->{$flag}->{'m=
essage'} <a href=3D/cgi-bin/koha/pay.pl?bornum=3D$borrower->{'borrowernumber'=
} onClick=3D\"openWindow(this, 'Payment', 480,640)\">Payment</a></td></tr>\n";
  	    } elsif ($flag eq 'WAITING') {
  		my $itemswaiting=3D'';
--- 827,831 ----
  	} else {
  	    if ($flag eq 'CHARGES') {
! 		$flaginfotext.=3D"<tr><td valign=3Dtop>$flag</td><td> $flags->{$flag}->{'=
message'} <a href=3D/cgi-bin/koha/pay.pl?bornum=3D$borrower->{'borrowernumber=
'} onClick=3D\"openWindow(this, 'Payment', 480,640)\">Payment</a></td></tr>\n=
";
  	    } elsif ($flag eq 'WAITING') {
  		my $itemswaiting=3D'';
***************
*** 838,842 ****
  	}
      }
!     ($flaginfotext) && ($flaginfotext=3D"<tr><td bgcolor=3D$headerbackgroun=
dcolor background=3D$backgroundimage colspan=3D2><b>Flags</b></td></tr>$flagi=
nfotext</table>\n");
      my $patrontable=3D << "EOF";
      <table border=3D1
--- 859,864 ----
  	}
      }
!     ($flaginfotext) && ($flaginfotext=3D"<tr><td bgcolor=3D$headerbackgroun=
dcolor background=3D$backgroundimage colspan=3D2><b>Flags</b></td></tr>$flagi=
nfotext\n");
!     $flaginfotext.=3D"</table>";
      my $patrontable=3D << "EOF";
      <table border=3D1



--===============6717825871605051439==--