From 59f561eabe630393f5f6568a844106f2e2cdc97e Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sat, 19 Jul 2008 03:36:00 +0000
Subject: [PATCH] change i18n labels in the listSubscriptionCodes screen to try
 and clear things up

---
 docs/changelog/7.x.x.txt                      | 1 +
 lib/WebGUI/Asset/Sku/Subscription.pm          | 8 ++++----
 lib/WebGUI/i18n/English/Asset_Subscription.pm | 9 +++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index ed235f27b..89fc980fe 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -4,6 +4,7 @@
    stop problems from certain flags that get set once per session.
  - fixed: Clicking on Widget gear causes user to jump to another part of the page.
  - fixed: Manage Subscription Code Batches: Names of Batches not Displayed
+ - fixed: Manage Subscription Codes: No way to Select
 
 7.5.17
  - fixed: Payment Methods Hover Help Incomplete
diff --git a/lib/WebGUI/Asset/Sku/Subscription.pm b/lib/WebGUI/Asset/Sku/Subscription.pm
index ed5b5abd2..15081961e 100644
--- a/lib/WebGUI/Asset/Sku/Subscription.pm
+++ b/lib/WebGUI/Asset/Sku/Subscription.pm
@@ -737,7 +737,7 @@ sub www_listSubscriptionCodeBatches {
 	$output .= '<table border="1" cellpadding="5" cellspacing="0" align="center">';
 	foreach my $batch ( @{$batches} ) {
 		$output .= '<tr><td>';		
-		$output .= $session->icon->delete(
+        $output .= $session->icon->delete(
             'func=deleteSubscriptionCodeBatch;bid='.$batch->{batchId}, 
             $self->getUrl,
             $i18n->get('delete batch confirm'));
@@ -780,7 +780,7 @@ sub www_listSubscriptionCodes {
     my $batchId     = $session->form->process('bid');
     my $selection   = $session->form->process('selection');
 	my $batches = 
-        $session->db->buildHashRef('select batchId, description from Subscription_codeBatch where subscriptionId=?',
+        $session->db->buildHashRef('select batchId, name from Subscription_codeBatch where subscriptionId=?',
         [
             $self->getId,
         ]);	
@@ -816,7 +816,7 @@ sub www_listSubscriptionCodes {
     $f->readOnly(
         label   =>
             WebGUI::Form::radio( $session, { name => 'selection', value => 'b', checked => ($selection eq 'b') } )
-            . $i18n->get('selection batch id'),
+            . $i18n->get('selection batch name'),
         value   =>
             WebGUI::Form::selectBox( $session, { name => 'bid', value => $batchId, options => $batches } ),
     );
@@ -860,7 +860,7 @@ sub www_listSubscriptionCodes {
 	$output .= '<br />';
 	$output .= '<table border="1" cellpadding="5" cellspacing="0" align="center">';
 	$output .= '<tr>';
-	$output .= '<th>'.$i18n->get('batch id').'</th><th>'.$i18n->get('code').'</th><th>'.$i18n->get('creation date').
+	$output .= '<th>&nbsp;</th><th>'.$i18n->get('batch id').'</th><th>'.$i18n->get('code').'</th><th>'.$i18n->get('creation date').
 		'</th><th>'.$i18n->get('dateUsed').'</th><th>'.$i18n->get('status').'</th>';	$output .= '</tr>';
 	foreach (@{$codes}) {
 		$output .= '<tr>';
diff --git a/lib/WebGUI/i18n/English/Asset_Subscription.pm b/lib/WebGUI/i18n/English/Asset_Subscription.pm
index e0249e9cd..38f4d2cc3 100755
--- a/lib/WebGUI/i18n/English/Asset_Subscription.pm
+++ b/lib/WebGUI/i18n/English/Asset_Subscription.pm
@@ -281,8 +281,8 @@ our $I18N = {
 	},
 
 	'delete codes' => {
-		message => q|Delete selected codes|,
-		lastUpdated => 1101228391,
+		message => q|Delete all codes selected above.|,
+		lastUpdated => 1216437724,
 		context => q|Shows up in listSubscriptionCodes.|
 	},
 
@@ -345,8 +345,9 @@ characters long.</p>|,
 		lastUpdated => 0,
 		context => q|The enter a code message for the code redemption function.|
 	},
-	'selection batch id' => {
-		message => q|batch ID|,
+
+	'selection batch name' => {
+		message => q|batch name|,
 		lastUpdated => 0,
 		context => q|Shows up in the selection part of listSubscriptionCodes.|
 	},