From 6595290272567fe7048489de3a0e0db9b1ce414c Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 8 Feb 2006 18:13:39 +0000
Subject: [PATCH] merge of commerce labeling

---
 lib/WebGUI/Commerce/Transaction.pm        |  4 ----
 lib/WebGUI/Operation/Commerce.pm          |  8 +++++++-
 lib/WebGUI/i18n/English/TransactionLog.pm | 12 ++++++++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/lib/WebGUI/Commerce/Transaction.pm b/lib/WebGUI/Commerce/Transaction.pm
index bbc9356b9..a89b45e7e 100644
--- a/lib/WebGUI/Commerce/Transaction.pm
+++ b/lib/WebGUI/Commerce/Transaction.pm
@@ -111,10 +111,6 @@ sub delete {
 	undef $self;
 }
 
-sub deleteItem {
-
-}
-
 #-------------------------------------------------------------------
 
 =head2 deleteItem ( itemId, itemType )
diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm
index ee6ce0d8e..04f9b1ca7 100644
--- a/lib/WebGUI/Operation/Commerce.pm
+++ b/lib/WebGUI/Operation/Commerce.pm
@@ -645,7 +645,13 @@ sub www_listTransactions {
 	@transactions = WebGUI::Commerce::Transaction->getTransactions(\%criteria);
 
 	$output .= '<table border="1">';
-	$output .= '<tr><th></th><th>Init Date</th><th>Completion Date</th><th>Amount</th><th>Shipping Cost</th><th>Status</th><th>Shipping Status</th></tr>';
+	$output .= '<tr><th></th>'.
+		'<th>'. $i18n->get('init date'). '</th>'.
+		'<th>'. $i18n->get('completion date'). '</th>'.
+		'<th>'. $i18n->get('amount'). '</th>'.
+		'<th>'. $i18n->get('shipping cost'). '</th>'.
+		'<th>'. $i18n->get('status'). '</th>'.
+		'<th>'. $i18n->get('shipping status'). '</th></tr>';
 	foreach $transaction (@transactions) {
 		$output .= '<tr bgcolor="#ddd">';
 		$output .= '<td>'.$session->icon->delete('op=deleteTransaction;tid='.$transaction->get('transactionId')).'</td>';
diff --git a/lib/WebGUI/i18n/English/TransactionLog.pm b/lib/WebGUI/i18n/English/TransactionLog.pm
index c4b539d1e..5068442d6 100644
--- a/lib/WebGUI/i18n/English/TransactionLog.pm
+++ b/lib/WebGUI/i18n/English/TransactionLog.pm
@@ -156,6 +156,18 @@ A loop containing the transactions in the transaction history. Within this loop
 		message => q|Delivered|,
 		lastUpdated => 1135291969,
 	},
+	'amount' => {
+		message => q|Amount|,
+		lastUpdated => 1139422433,
+	},
+	'shipping cost' => {
+		message => q|Shipping Cost|,
+		lastUpdated => 1139422453,
+	},
+	'status' => {
+		message => q|Status|,
+		lastUpdated => 1139422455,
+	},
 	
 };