[Koha-cvs] CVS: koha/circ returns.pl,1.19,1.20

[Finlay Thompson]

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

Modified Files:
	returns.pl 
Log Message:

Fixed bug in flags display



Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** returns.pl	22 Aug 2002 04:20:33 -0000	1.19
--- returns.pl	29 Aug 2002 00:00:45 -0000	1.20
***************
*** 329,341 ****
      my $flags = $borrower->{'flags'};
      my $flaginfotext='';
      my $color = '';
      foreach my $flag (sort keys %$flags) {
  	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  	if ($flags->{$flag}->{'noissues'}) {
! 	    $flag = "<font color=red>$flag</font>";
  	}
  	if ($flag eq 'CHARGES') {
  	    $flaginfotext.= <<"EOF";
! <tr><td valign=top>$flag</td>
  <td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> 
  <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} 
--- 329,344 ----
      my $flags = $borrower->{'flags'};
      my $flaginfotext='';
+     my $displayflag = '';
      my $color = '';
      foreach my $flag (sort keys %$flags) {
  	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  	if ($flags->{$flag}->{'noissues'}) {
! 	    $displayflag = "<font color=red>$flag</font>";
! 	} else {
! 	    $displayflag = $flag;
  	}
  	if ($flag eq 'CHARGES') {
  	    $flaginfotext.= <<"EOF";
! <tr><td valign=top>$displayflag</td>
  <td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> 
  <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} 
***************
*** 354,358 ****
  EOF
              }
!             $flaginfotext.="<tr><td valign=top>$flag</td><td>$itemswaiting</td></tr>\n";
  	} elsif ($flag eq 'ODUES') {
  	    my $itemsoverdue = '';
--- 357,361 ----
  EOF
              }
!             $flaginfotext.="<tr><td valign=top>$displayflag</td><td>$itemswaiting</td></tr>\n";
  	} elsif ($flag eq 'ODUES') {
  	    my $itemsoverdue = '';
***************
*** 368,375 ****
  EOF
  	    }
! 	    $flaginfotext .= "<tr><td valign=top>$flag</td><td>$itemsoverdue</td></tr>\n";
          } else {
  	    $flaginfotext.= <<"EOF";
! <tr><td valign=top>$flag</td>
  <td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>
  EOF
--- 371,378 ----
  EOF
  	    }
! 	    $flaginfotext .= "<tr><td valign=top>$displayflag</td><td>$itemsoverdue</td></tr>\n";
          } else {
  	    $flaginfotext.= <<"EOF";
! <tr><td valign=top>$displayflag</td>
  <td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>
  EOF