From 93b01eb2a5c925eb67097a311fc2f7eec16cc31f Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Fri, 23 Sep 2005 08:55:57 +0000
Subject: [PATCH] adding total (qty & price) in historysearch

---
 acqui/histsearch.pl                           |  4 +-
 .../default/en/acqui/histsearch.tmpl          | 79 ++++++++++++++-----
 2 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl
index 75e910842d..6c47ad832a 100755
--- a/acqui/histsearch.pl
+++ b/acqui/histsearch.pl
@@ -24,8 +24,10 @@ my ($template, $loggedinuser, $cookie)
 			     flagsrequired => {acquisition => 1},
 			     debug => 1,
 			     });
-my $order_loop= &histsearch($title,$author,$name,$from_placed_on,$to_placed_on);
+my ($order_loop,$total_qty,$total_price)= &histsearch($title,$author,$name,$from_placed_on,$to_placed_on);
 $template->param(suggestions_loop => $order_loop,
+				total_qty => $total_qty,
+				total_price => sprintf  ("%.2f",$total_price),
 				numresults => scalar(@$order_loop),
 				title => $title,
 				author => $author,
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl
index 6e1570cd4c..9a7a22c45b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl
@@ -6,9 +6,8 @@
 	<table>
 		<tr>
 			<th class="acquisition">&nbsp;</th>
-			<th class="acquisition">Title</th>
-			<th class="acquisition">Author</th>
 			<th class="acquisition">Supplier</th>
+			<th class="acquisition">Title/Author</th>
 			<th class="acquisition">Placed on</th>
 			<th class="acquisition">Recieved on</th>
 			<th class="acquisition">Quantity ordered</th>
@@ -21,14 +20,12 @@
 					Filter on
 				</th>
 				<th class="acquisition">
-					<input type="text" name="title" value="<!-- TMPL_VAR name="title"-->">
+					<input type="text" name="name" value="<!-- TMPL_VAR name="name" -->">
 				</th>
 				<th class="acquisition">
+					<input type="text" name="title" value="<!-- TMPL_VAR name="title"-->">/
 					<input type="text" name="author" value="<!-- TMPL_VAR name="author" -->">
 				</th>
-				<th class="acquisition">
-					<input type="text" name="name" value="<!-- TMPL_VAR name="name" -->">
-				</th>
 				<th class="acquisition">
 					From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
 					<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
@@ -58,6 +55,7 @@
 							}
 						);
 					</script>
+					<br/>
 					To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
 					<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text">
 					<script type="text/javascript">
@@ -104,32 +102,77 @@
 		</tr>
 		<!-- TMPL_LOOP NAME="suggestions_loop" -->
 			<tr>
-				<td>
+				<!-- TMPL_IF name="toggle" -->
+					<td class="hilighted">
+				<!-- TMPL_ELSE -->
+					<td>
+				<!-- /TMPL_IF -->
 					<!-- TMPL_VAR NAME="count" -->
 				</td>
-				<td>
-					<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a>
-				</td>
-				<td>
-					<!-- TMPL_VAR NAME="author" -->
-				</td>
-				<td>
+				<!-- TMPL_IF name="toggle" -->
+					<td class="hilighted">
+				<!-- TMPL_ELSE -->
+					<td>
+				<!-- /TMPL_IF -->
 					<!-- TMPL_VAR NAME="name" -->
 				</td>
-				<td>
+				<!-- TMPL_IF name="toggle" -->
+					<td class="hilighted">
+				<!-- TMPL_ELSE -->
+					<td>
+				<!-- /TMPL_IF -->
+					<p><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></p>
+					<p><!-- TMPL_VAR NAME="author" --></p>
+				</td>
+				<!-- TMPL_IF name="toggle" -->
+					<td class="hilighted">
+				<!-- TMPL_ELSE -->
+					<td>
+				<!-- /TMPL_IF -->
 					<!-- TMPL_VAR name="creationdate" -->
 				</td>
-				<td>
+				<!-- TMPL_IF name="toggle" -->
+					<td class="hilighted">
+				<!-- TMPL_ELSE -->
+					<td>
+				<!-- /TMPL_IF -->
 					<!-- TMPL_VAR name="datereceived" -->
 				</td>
-				<td>
+				<!-- TMPL_IF name="toggle" -->
+					<td class="hilighted number">
+				<!-- TMPL_ELSE -->
+					<td class="number">
+				<!-- /TMPL_IF -->
 					<!-- TMPL_VAR name="quantity" -->
 				</td>
-				<td>
+				<!-- TMPL_IF name="toggle" -->
+					<td class="hilighted number">
+				<!-- TMPL_ELSE -->
+					<td class="number">
+				<!-- /TMPL_IF -->
 					<!-- TMPL_VAR name="ecost" -->
 				</td>
+				<!-- TMPL_IF name="toggle" -->
+					<td class="hilighted">
+				<!-- TMPL_ELSE -->
+					<td>
+				<!-- /TMPL_IF -->
+					&nbsp;
+				</td>
+
 			</tr>
 		<!-- /TMPL_LOOP -->
+		<tr>
+			<th class="acquisition">&nbsp;</th>
+			<th class="acquisition">&nbsp;</th>
+			<th class="acquisition">&nbsp;</th>
+			<th class="acquisition">&nbsp;</th>
+			<th class="acquisition">&nbsp;</th>
+			<th class="acquisition">&nbsp;</th>
+			<th class="acquisition"><!-- TMPL_VAR name="total_qty" --></th>
+			<th class="acquisition"><!-- TMPL_VAR name="total_price" --></th>
+			<th class="acquisition">&nbsp;</th>
+		</tr>
 	</table>
 </div>
 
-- 
2.39.5