[Koha-cvs] koha/acqui basket.pl [dev_week]

[Ryan Higgins]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Ryan Higgins <rych>	07/01/01 01:52:58

Modified files:
	acqui          : basket.pl 

Log message:
	sync with rel22

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/basket.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.24.2.9&r2=1.24.2.9.2.1

Patches:
Index: basket.pl
===================================================================
RCS file: /sources/koha/koha/acqui/basket.pl,v
retrieving revision 1.24.2.9
retrieving revision 1.24.2.9.2.1
diff -u -b -r1.24.2.9 -r1.24.2.9.2.1
--- basket.pl	5 Feb 2006 21:59:21 -0000	1.24.2.9
+++ basket.pl	1 Jan 2007 01:52:58 -0000	1.24.2.9.2.1
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: basket.pl,v 1.24.2.9 2006/02/05 21:59:21 kados Exp $
+# $Id: basket.pl,v 1.24.2.9.2.1 2007/01/01 01:52:58 rych Exp $
 
 #script to show display basket of orders
 #written by chris at katipo.co.nz 24/2/2000
@@ -54,6 +54,10 @@
 # warn "=>".$basket->{booksellerid};
 $booksellerid = $basket->{booksellerid} unless $booksellerid;
 my ($count2, at booksellers)=bookseller($booksellerid);
+$booksellers[0]->{'postal'} =~ s/\n/<br\/>/g;
+
+# get branches information, to show branchaddress in template
+my $branches = getbranches();
 
 # get librarian branch...
 if (C4::Context->preference("IndependantBranches")) {
@@ -73,7 +77,7 @@
 
 # if new basket, pre-fill infos
 $basket->{creationdate} = "" unless ($basket->{creationdate});
-$basket->{authorisedby} = $loggedinuser unless ($basket->{authorisedby});
+$basket->{authorisedbyname} = $loggedinuser unless ($basket->{authorisedbyname});
 ($count, at results)=getbasketcontent($basketno,'',$order);
 
 my $line_total; # total of each line
@@ -123,30 +127,28 @@
 $grand_total_est = $sub_total_est+sprintf("%.2f",$sub_total_est*$prefgist);
 $gist_est = sprintf("%.2f",$sub_total_est*$prefgist);
 $template->param(basketno => $basketno,
-				creationdate => $basket->{creationdate},
-				authorisedby => $basket->{authorisedby},
+				creationdate => format_date($basket->{creationdate}),
 				authorisedbyname => $basket->{authorisedbyname},
 				closedate => format_date($basket->{closedate}),
 				active => $booksellers[0]->{'active'},
 				booksellerid=> $booksellers[0]->{'id'},
 				name => $booksellers[0]->{'name'},
-				address1 => $booksellers[0]->{'address1'},
-				address2 => $booksellers[0]->{'address2'},
-				address3 => $booksellers[0]->{'address3'},
-				address4 => $booksellers[0]->{'address4'},
+				postal => $booksellers[0]->{'postal'},
 				entrydate => format_date($results[0]->{'entrydate'}),
 				books_loop => \@books_loop,
 				count =>$count,
-				sub_total => $sub_total,
-				gist => $gist,
-				grand_total =>$grand_total,
-				sub_total_est => $sub_total_est,
-				gist_est => $gist_est,
-				grand_total_est =>$grand_total_est,
+				sub_total => sprintf("%.2f",$sub_total),
+				gist => sprintf("%.2f",$gist),
+				grand_total =>sprintf("%.2f",$grand_total),
+				sub_total_est => sprintf("%.2f",$sub_total_est),
+				gist_est => sprintf("%.2f",$gist_est),
+				grand_total_est =>sprintf("%.2f",$grand_total_est),
 				currency => $booksellers[0]->{'listprice'},
 				qty_total => $qty_total,
-				intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
+				GST => C4::Context->preference("gist"),
+				branchname => $branches->{C4::Context->userenv->{branch}}->{branchname},
+				branchaddress1 => $branches->{C4::Context->userenv->{branch}}->{branchaddress1},
+				branchaddress2 => $branches->{C4::Context->userenv->{branch}}->{branchaddress2},
+				branchaddress3 => $branches->{C4::Context->userenv->{branch}}->{branchaddress3},
 				);
 output_html_with_http_headers $query, $cookie, $template->output;