From rangi@users.sourceforge.net Tue Feb 26 01:06:23 2002
From: Chris Cormack <rangi@users.sourceforge.net>
To: koha-devel@lists.koha-community.org
Subject: [Koha-devel] CVS: koha/acqui basket.pl,1.1.1.1,1.2
Date: Tue, 26 Feb 2002 01:07:02 +0000
Message-ID: <E16fdYz-0006g1-00@usw-pr-cvs1.sourceforge.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5440674749585720724=="

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

Update of /cvsroot/koha/koha/acqui
In directory usw-pr-cvs1:/tmp/cvs-serv25553/acqui

Modified Files:
	basket.pl=20
Log Message:
Fix for displaying prices



Index: basket.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/acqui/basket.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** basket.pl	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- basket.pl	26 Feb 2002 09:06:19 -0000	1.2
***************
*** 15,21 ****
  print startpage;
 =20
! print startmenu('acquisitions');
 =20
! #print $count;
  my ($count2,@booksellers)=3Dbookseller($results[0]->{'booksellerid'});
 =20
--- 15,26 ----
  print startpage;
 =20
! my @inp=3Dstartmenu('acquisitions');
 =20
! my $count3=3D@inp;
! for (my $i=3D0;$i<$count3;$i++){
!       $inp[$i]=3D~ s/leftmargin=3D0 topmargin=3D0\>/leftmargin=3D0 topmargi=
n=3D0 onload=3D'update(orderform)'\>/;
!     }
! print @inp;
! # print $count;
  my ($count2,@booksellers)=3Dbookseller($results[0]->{'booksellerid'});
 =20
***************
*** 25,39 ****
  Authorised By: $results[0]->{'authorisedby'}<br>
  $results[0]->{'entrydate'};
-=20
  </div>
! <FONT SIZE=3D6><em>Shopping Basket For: <a href=3Dsupplier.pl?id=3D$results=
[0]->{'booksellerid'}></a> $booksellers[0]->{'name'}</em></FONT>
!=20
! <a href=3Dnewbasket.pl?id=3D$results[0]->{'booksellerid'}&basket=3D$basket>=
Add more orders</a>=20
!=20
!=20
  <CENTER>
-=20
  <FORM ACTION=3D"/cgi-bin/koha/search.pl" method=3Dpost>
! <b>Search ISBN, Title or Author:</b> <INPUT TYPE=3D"text"  SIZE=3D"25"   NA=
ME=3D"recieve">
  </form>
  <p>
--- 30,39 ----
  Authorised By: $results[0]->{'authorisedby'}<br>
  $results[0]->{'entrydate'};
  </div>
! <FONT SIZE=3D6><em>Shopping Basket For: <a href=3Dsupplier.pl?id=3D$results=
[0]->{'booksellerid'}></a> $booksellers[0]->{'name'}</em></FONT> =20
! <a href=3Dnewbasket.pl?id=3D$results[0]->{'booksellerid'}&basket=3D$basket>=
Add more orders</a>
  <CENTER>
  <FORM ACTION=3D"/cgi-bin/koha/search.pl" method=3Dpost>
!  <b>Search ISBN, Title or Author:</b> <INPUT TYPE=3D"text"  SIZE=3D"25"   N=
AME=3D"recieve">
  </form>
  <p>
***************
*** 41,124 ****
  <table border=3D0 cellspacing=3D0 cellpadding=3D5>
  <tr valign=3Dtop bgcolor=3D#99cc33>
! <td background=3D"/images/background-mem.gif"><b>ORDER</b></td>
! <td background=3D"/images/background-mem.gif"><b>ISBN</b></td>
! <td background=3D"/images/background-mem.gif"><b>TITLE</b></td>
! <td background=3D"/images/background-mem.gif"><b>AUTHOR</b></td>
! <td background=3D"/images/background-mem.gif"><b>RRP</b></td><td background=
=3D"/images/background-mem.gif"><b>\$EST</b></td><td background=3D"/images/ba=
ckground-mem.gif"><b>QUANTITY</b></td><td background=3D"/images/background-me=
m.gif"><b>TOTAL</b></td></tr>
  printend
  ;
  for (my $i=3D0;$i<$count;$i++){
  my $rrp=3D$results[$i]->{'listprice'};
  if ($results[$i]->{'currency'} ne 'NZD'){
!   $rrp=3Dcurconvert($results[$i]->{'currency'},$rrp);
  }
- print <<EOP
 =20
 =20
  <tr valign=3Dtop bgcolor=3D#ffffcc>
! <td>$results[$i]->{'ordernumber'}</td>
! <td>$results[$i]->{'isbn'}</td>
! <td><a href=3D"newbiblio.pl?ordnum=3D$results[$i]->{'ordernumber'}&id=3D$re=
sults[$i]->{'booksellerid'}&basket=3D$basket">$results[$i]->{'title'}</a></td>
! <td>$results[$i]->{'author'}</td>
! <td>\$<input type=3Dtext name=3Drrp$i size=3D6 value=3D"$results[$i]->{'rrp=
'}"></td>
! <td>\$<input type=3Dtext name=3Deup$i size=3D6 value=3D"$results[$i]->{'eco=
st'}"></td>
! <td><input type=3Dtext name=3Dquantity$i size=3D6 value=3D$results[$i]->{'q=
uantity'}></td>
! <td>\$<input type=3Dtext name=3Dtotal$i size=3D10 value=3D16.95></td>
! <input type=3Dhidden name=3Dordnum$i value=3D$results[$i]->{'ordernumber'}>
! <input type=3Dhidden name=3Dbibnum$i value=3D$results[$i]->{'biblionumber'}>
  </tr>
-=20
  EOP
  ;
  }
! # onchange=3D'update(this.form)'></td>
  print "<input type=3Dhidden name=3Dnumber value=3D$count>
  <input type=3Dhidden name=3Dbasketno value=3D\"$basket\">";
  print <<EOP
  <tr valign=3Dtop bgcolor=3Dwhite>
!=20
! <td colspan=3D6 rowspan=3D3  bgcolor=3D#cccc99  background=3D"/images/backg=
round-mem.gif">
! <b>HELP</b><br>
! To cancel an order, just change the quantity to 0 and click "save changes".=
<br>
! To change any of the catalogue or accounting information attached to an ord=
er,  click on the title.<br>
! To add new orders to this supplier, start with a search. </td>=20
! <td><b>SubTotal</b></td>
! <td>\$<input type=3Dtext name=3Dsubtotal size=3D10></td>
! </tr>
! <tr valign=3Dtop bgcolor=3Dwhite>
! <td><b>GST</b></td>
! <td>\$<input type=3Dtext name=3Dgst size=3D10></td>
!=20
! </tr>
!=20
! <tr valign=3Dtop bgcolor=3Dwhite>
!=20
!=20
! <td><b>TOTAL</b></td>
! <td>\$<input type=3Dtext name=3Dgrandtotal size=3D10></td>
!=20
! </tr>
!=20
  <tr valign=3Dtop bgcolor=3Dwhite>
! <td></td>
! <td></td>
! <td></td>
! <td></td>
! <td></td>
! <td></td>
! <td colspan=3D3><input type=3Dimage  name=3Dsubmit src=3D/images/save-chang=
es.gif border=3D0 width=3D187 height=3D42 align=3Dright></td>
!=20
! </tr>
!=20
!=20
!=20
!=20
  </table>
! </CENTER>
!=20
!=20
!=20
  EOP
! ;
 =20
  print endmenu('acquisitions');
--- 41,116 ----
  <table border=3D0 cellspacing=3D0 cellpadding=3D5>
  <tr valign=3Dtop bgcolor=3D#99cc33>
!   <td background=3D"/images/background-mem.gif"><b>ORDER</b></td>
!   <td background=3D"/images/background-mem.gif"><b>ISBN</b></td>
!   <td background=3D"/images/background-mem.gif"><b>TITLE</b></td>
!   <td background=3D"/images/background-mem.gif"><b>AUTHOR</b></td>
!   <td background=3D"/images/background-mem.gif"><b>RRP</b></td>
!   <td background=3D"/images/background-mem.gif"><b>\$EST</b></td>
!   <td background=3D"/images/background-mem.gif"><b>QUANTITY</b></td>
!   <td background=3D"/images/background-mem.gif"><b>TOTAL</b></td></tr>
  printend
  ;
+=20
+=20
+ my $line_total; # total of each line
+ my $sub_total; # total of line totals
+ my $gist;      # GST
+ my $grand_total; # $subttotal + $gist
+=20
  for (my $i=3D0;$i<$count;$i++){
  my $rrp=3D$results[$i]->{'listprice'};
  if ($results[$i]->{'currency'} ne 'NZD'){
! $rrp=3Dcurconvert($results[$i]->{'currency'},$rrp);
  }
 =20
+ $line_total=3D$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
+ $sub_total+=3D$line_total;
+ $gist=3Dsprintf("%.2f",$sub_total*0.125);
+ $grand_total=3D$sub_total+$gist;
 =20
+ print <<EOP     =20
  <tr valign=3Dtop bgcolor=3D#ffffcc>
!   <td>$results[$i]->{'ordernumber'}</td>
!   <td>$results[$i]->{'isbn'}</td>
!   <td><a href=3D"newbiblio.pl?ordnum=3D$results[$i]->{'ordernumber'}&id=3D$=
results[$i]->{'booksellerid'}&basket=3D$basket">$results[$i]->{'title'}</a></=
td>
!   <td>$results[$i]->{'author'}</td>
!   <td>\$<input type=3Dtext name=3Drrp$i size=3D6 value=3D"$results[$i]->{'r=
rp'}"></td>
!   <td>\$<input type=3Dtext name=3Deup$i size=3D6 value=3D"$results[$i]->{'e=
cost'}"></td>
!   <td><input type=3Dtext name=3Dquantity$i size=3D6 value=3D$results[$i]->{=
'quantity'} onchange=3D'update(this.form)'></td>
!   <td>\$<input type=3Dtext name=3Dtotal$i size=3D10 value=3D$line_total></t=
d>
!   <input type=3Dhidden name=3Dordnum$i value=3D$results[$i]->{'ordernumber'=
}>
!   <input type=3Dhidden name=3Dbibnum$i value=3D$results[$i]->{'biblionumber=
'}>=20
  </tr>
  EOP
  ;
  }
! #=20
  print "<input type=3Dhidden name=3Dnumber value=3D$count>
  <input type=3Dhidden name=3Dbasketno value=3D\"$basket\">";
  print <<EOP
+ <tr valign=3Dtop bgcolor=3Dwhite><td colspan=3D6 rowspan=3D3  bgcolor=3D#cc=
cc99  background=3D"/images/background-mem.gif">
+   <b>HELP</b><br>
+   To cancel an order, just change the quantity to 0 and click "save changes=
".<br>
+   To change any of the catalogue or accounting information attached to an o=
rder,  click on the title.<br>
+   To add new orders to this supplier, start with a search. </td>=20
+   <td><b>SubTotal</b></td>
+   <td>\$<input type=3Dtext name=3Dsubtotal size=3D10 value=3D$sub_total></t=
d></tr>
  <tr valign=3Dtop bgcolor=3Dwhite>
!   <td><b>GST</b></td>
!   <td>\$<input type=3Dtext name=3Dgst size=3D10 value=3D$gist></td></tr>
! <tr valign=3Dtop bgcolor=3Dwhite><td><b>TOTAL</b></td>
!   <td>\$<input type=3Dtext name=3Dgrandtotal size=3D10 value=3D$grand_total=
></td></tr>
  <tr valign=3Dtop bgcolor=3Dwhite>
!   <td></td>
!   <td></td>
!   <td></td>
!   <td></td>
!   <td></td>
!   <td></td>
!   <td colspan=3D3><input type=3Dimage  name=3Dsubmit src=3D/images/save-cha=
nges.gif border=3D0 width=3D187 height=3D42 align=3Dright></td></tr>
  </table>
! </CENTER> =20
  EOP
!   ;
 =20
  print endmenu('acquisitions');



--===============5440674749585720724==--