Update of /cvsroot/koha/koha/acqui In directory usw-pr-cvs1:/tmp/cvs-serv25553/acqui Modified Files: basket.pl Log Message: Fix for displaying prices Index: basket.pl =================================================================== 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; ! print startmenu('acquisitions'); ! #print $count; my ($count2,@booksellers)=bookseller($results[0]->{'booksellerid'}); --- 15,26 ---- print startpage; ! my @inp=startmenu('acquisitions'); ! my $count3=@inp; ! for (my $i=0;$i<$count3;$i++){ ! $inp[$i]=~ s/leftmargin=0 topmargin=0\>/leftmargin=0 topmargin=0 onload='update(orderform)'\>/; ! } ! print @inp; ! # print $count; my ($count2,@booksellers)=bookseller($results[0]->{'booksellerid'}); *************** *** 25,39 **** Authorised By: $results[0]->{'authorisedby'}<br> $results[0]->{'entrydate'}; - </div> ! <FONT SIZE=6><em>Shopping Basket For: <a href=supplier.pl?id=$results[0]->{'booksellerid'}></a> $booksellers[0]->{'name'}</em></FONT> ! ! <a href=newbasket.pl?id=$results[0]->{'booksellerid'}&basket=$basket>Add more orders</a> ! ! <CENTER> - <FORM ACTION="/cgi-bin/koha/search.pl" method=post> ! <b>Search ISBN, Title or Author:</b> <INPUT TYPE="text" SIZE="25" NAME="recieve"> </form> <p> --- 30,39 ---- Authorised By: $results[0]->{'authorisedby'}<br> $results[0]->{'entrydate'}; </div> ! <FONT SIZE=6><em>Shopping Basket For: <a href=supplier.pl?id=$results[0]->{'booksellerid'}></a> $booksellers[0]->{'name'}</em></FONT> ! <a href=newbasket.pl?id=$results[0]->{'booksellerid'}&basket=$basket>Add more orders</a> <CENTER> <FORM ACTION="/cgi-bin/koha/search.pl" method=post> ! <b>Search ISBN, Title or Author:</b> <INPUT TYPE="text" SIZE="25" NAME="recieve"> </form> <p> *************** *** 41,124 **** <table border=0 cellspacing=0 cellpadding=5> <tr valign=top bgcolor=#99cc33> ! <td background="/images/background-mem.gif"><b>ORDER</b></td> ! <td background="/images/background-mem.gif"><b>ISBN</b></td> ! <td background="/images/background-mem.gif"><b>TITLE</b></td> ! <td background="/images/background-mem.gif"><b>AUTHOR</b></td> ! <td background="/images/background-mem.gif"><b>RRP</b></td><td background="/images/background-mem.gif"><b>\$EST</b></td><td background="/images/background-mem.gif"><b>QUANTITY</b></td><td background="/images/background-mem.gif"><b>TOTAL</b></td></tr> printend ; for (my $i=0;$i<$count;$i++){ my $rrp=$results[$i]->{'listprice'}; if ($results[$i]->{'currency'} ne 'NZD'){ ! $rrp=curconvert($results[$i]->{'currency'},$rrp); } - print <<EOP <tr valign=top bgcolor=#ffffcc> ! <td>$results[$i]->{'ordernumber'}</td> ! <td>$results[$i]->{'isbn'}</td> ! <td><a href="newbiblio.pl?ordnum=$results[$i]->{'ordernumber'}&id=$results[$i]->{'booksellerid'}&basket=$basket">$results[$i]->{'title'}</a></td> ! <td>$results[$i]->{'author'}</td> ! <td>\$<input type=text name=rrp$i size=6 value="$results[$i]->{'rrp'}"></td> ! <td>\$<input type=text name=eup$i size=6 value="$results[$i]->{'ecost'}"></td> ! <td><input type=text name=quantity$i size=6 value=$results[$i]->{'quantity'}></td> ! <td>\$<input type=text name=total$i size=10 value=16.95></td> ! <input type=hidden name=ordnum$i value=$results[$i]->{'ordernumber'}> ! <input type=hidden name=bibnum$i value=$results[$i]->{'biblionumber'}> </tr> - EOP ; } ! # onchange='update(this.form)'></td> print "<input type=hidden name=number value=$count> <input type=hidden name=basketno value=\"$basket\">"; print <<EOP <tr valign=top bgcolor=white> ! ! <td colspan=6 rowspan=3 bgcolor=#cccc99 background="/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 order, click on the title.<br> ! To add new orders to this supplier, start with a search. </td> ! <td><b>SubTotal</b></td> ! <td>\$<input type=text name=subtotal size=10></td> ! </tr> ! <tr valign=top bgcolor=white> ! <td><b>GST</b></td> ! <td>\$<input type=text name=gst size=10></td> ! ! </tr> ! ! <tr valign=top bgcolor=white> ! ! ! <td><b>TOTAL</b></td> ! <td>\$<input type=text name=grandtotal size=10></td> ! ! </tr> ! <tr valign=top bgcolor=white> ! <td></td> ! <td></td> ! <td></td> ! <td></td> ! <td></td> ! <td></td> ! <td colspan=3><input type=image name=submit src=/images/save-changes.gif border=0 width=187 height=42 align=right></td> ! ! </tr> ! ! ! ! </table> ! </CENTER> ! ! ! EOP ! ; print endmenu('acquisitions'); --- 41,116 ---- <table border=0 cellspacing=0 cellpadding=5> <tr valign=top bgcolor=#99cc33> ! <td background="/images/background-mem.gif"><b>ORDER</b></td> ! <td background="/images/background-mem.gif"><b>ISBN</b></td> ! <td background="/images/background-mem.gif"><b>TITLE</b></td> ! <td background="/images/background-mem.gif"><b>AUTHOR</b></td> ! <td background="/images/background-mem.gif"><b>RRP</b></td> ! <td background="/images/background-mem.gif"><b>\$EST</b></td> ! <td background="/images/background-mem.gif"><b>QUANTITY</b></td> ! <td background="/images/background-mem.gif"><b>TOTAL</b></td></tr> printend ; + + + my $line_total; # total of each line + my $sub_total; # total of line totals + my $gist; # GST + my $grand_total; # $subttotal + $gist + for (my $i=0;$i<$count;$i++){ my $rrp=$results[$i]->{'listprice'}; if ($results[$i]->{'currency'} ne 'NZD'){ ! $rrp=curconvert($results[$i]->{'currency'},$rrp); } + $line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'}; + $sub_total+=$line_total; + $gist=sprintf("%.2f",$sub_total*0.125); + $grand_total=$sub_total+$gist; + print <<EOP <tr valign=top bgcolor=#ffffcc> ! <td>$results[$i]->{'ordernumber'}</td> ! <td>$results[$i]->{'isbn'}</td> ! <td><a href="newbiblio.pl?ordnum=$results[$i]->{'ordernumber'}&id=$results[$i]->{'booksellerid'}&basket=$basket">$results[$i]->{'title'}</a></td> ! <td>$results[$i]->{'author'}</td> ! <td>\$<input type=text name=rrp$i size=6 value="$results[$i]->{'rrp'}"></td> ! <td>\$<input type=text name=eup$i size=6 value="$results[$i]->{'ecost'}"></td> ! <td><input type=text name=quantity$i size=6 value=$results[$i]->{'quantity'} onchange='update(this.form)'></td> ! <td>\$<input type=text name=total$i size=10 value=$line_total></td> ! <input type=hidden name=ordnum$i value=$results[$i]->{'ordernumber'}> ! <input type=hidden name=bibnum$i value=$results[$i]->{'biblionumber'}> </tr> EOP ; } ! # print "<input type=hidden name=number value=$count> <input type=hidden name=basketno value=\"$basket\">"; print <<EOP + <tr valign=top bgcolor=white><td colspan=6 rowspan=3 bgcolor=#cccc99 background="/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 order, click on the title.<br> + To add new orders to this supplier, start with a search. </td> + <td><b>SubTotal</b></td> + <td>\$<input type=text name=subtotal size=10 value=$sub_total></td></tr> <tr valign=top bgcolor=white> ! <td><b>GST</b></td> ! <td>\$<input type=text name=gst size=10 value=$gist></td></tr> ! <tr valign=top bgcolor=white><td><b>TOTAL</b></td> ! <td>\$<input type=text name=grandtotal size=10 value=$grand_total></td></tr> <tr valign=top bgcolor=white> ! <td></td> ! <td></td> ! <td></td> ! <td></td> ! <td></td> ! <td></td> ! <td colspan=3><input type=image name=submit src=/images/save-changes.gif border=0 width=187 height=42 align=right></td></tr> </table> ! </CENTER> EOP ! ; print endmenu('acquisitions');