[Koha-cvs] CVS: koha/opac opac-reserve.pl,1.1.2.3,1.1.2.4 opac-user.pl,1.1.2.5,1.1.2.6

[Finlay Thompson]

Update of /cvsroot/koha/koha/opac
In directory usw-pr-cvs1:/tmp/cvs-serv28644

Modified Files:
      Tag: rel-1-2
	opac-reserve.pl opac-user.pl 
Log Message:

more fixes according to hlt requests


Index: opac-reserve.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** opac-reserve.pl	14 Oct 2002 09:39:36 -0000	1.1.2.3
--- opac-reserve.pl	15 Oct 2002 04:43:09 -0000	1.1.2.4
***************
*** 109,112 ****
--- 109,125 ----
  	$template->param(TYPES => \@types);
  	$template->param(item_types_selected => 1);
+ 
+ 	my %reqbibs;
+ 	foreach my $item (@items) {
+ 	    foreach my $type (@itemtypes) {
+ 		if ($item->{'itemtype'} == $type) {
+ 		    $reqbibs{$item->{'biblioitemnumber'}} = 1;
+ 		}
+ 	    }
+ 	}
+ 	my @reqbibs = keys %reqbibs;
+ 	my $fee = CalcReserveFee(undef,$borrowernumber,$biblionumber,'o',\@reqbibs);
+ 	$fee = sprintf "%.02f", $fee;
+ 	$template->param(fee => $fee);
      } else {
  	$template->param(message => 1);
***************
*** 114,136 ****
      }
  
- 
  } elsif ($query->param('place_reserve')) {
  # here we actually do the reserveration. Stage 3.
      my $title = $bibdata->{'title'};
!     my @reqbibs;
      my @itemtypes = $query->param('itemtype');
      foreach my $item (@items) {
  	foreach my $type (@itemtypes) {
  	    if ($item->{'itemtype'} == $type) {
! 		my $addbibitem = 1;
! 		foreach my $bibitemno (@reqbibs) {
! 		    $addbibitem = 0 if $bibitemno == $item->{'biblioitemnumber'};
! 		}
! 		push @reqbibs, $item->{'biblioitemnumber'} if $addbibitem;
  	    }
  	}
      }
      CreateReserve(undef,$branch,$borrowernumber,$biblionumber,'o',\@reqbibs,$rank,'',$title);
-     warn "reserve created\n";
      print $query->redirect("/cgi-bin/koha/opac-user.pl");
  } else {
--- 127,144 ----
      }
  
  } elsif ($query->param('place_reserve')) {
  # here we actually do the reserveration. Stage 3.
      my $title = $bibdata->{'title'};
!     my %reqbibs;
      my @itemtypes = $query->param('itemtype');
      foreach my $item (@items) {
  	foreach my $type (@itemtypes) {
  	    if ($item->{'itemtype'} == $type) {
! 		$reqbibs{$item->{'biblioitemnumber'}} = 1;
  	    }
  	}
      }
+     my @reqbibs = keys %reqbibs;
      CreateReserve(undef,$branch,$borrowernumber,$biblionumber,'o',\@reqbibs,$rank,'',$title);
      print $query->redirect("/cgi-bin/koha/opac-user.pl");
  } else {

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** opac-user.pl	14 Oct 2002 22:47:55 -0000	1.1.2.5
--- opac-user.pl	15 Oct 2002 04:43:09 -0000	1.1.2.6
***************
*** 30,40 ****
  if ($borr->{'amountoutstanding'} > 5) {
      $borr->{'amountoverfive'} = 1;
- } else {
-     $borr->{'amountoverfive'} = 0;
  }
! if ($borr->{'amountoutstanding'} > 0) {
      $borr->{'amountoverzero'} = 1;
! } else {
!     $borr->{'amountoverzero'} = 0;
      $borr->{'amountoutstanding'} = -1*($borr->{'amountoutstanding'});
  }
--- 30,39 ----
  if ($borr->{'amountoutstanding'} > 5) {
      $borr->{'amountoverfive'} = 1;
  }
! if (5 >= $borr->{'amountoutstanding'} && $borr->{'amountoutstanding'} > 0 ) {
      $borr->{'amountoverzero'} = 1;
! }
! if ($borr->{'amountoutstanding'} < 0) {
!     $borr->{'amountlessthanzero'} = 1;
      $borr->{'amountoutstanding'} = -1*($borr->{'amountoutstanding'});
  }