Index: /main/waeup.custom/trunk/src/waeup/custom/etranzact/browser.py
===================================================================
--- /main/waeup.custom/trunk/src/waeup/custom/etranzact/browser.py	(revision 7975)
+++ /main/waeup.custom/trunk/src/waeup/custom/etranzact/browser.py	(revision 7976)
@@ -35,12 +35,17 @@
     icon = 'actionicon_call.png'
     text = _('Query eTranzact History')
-    target = 'enter_pin'
+    target = 'enterpin'
 
 class EtranzactEnterPinPage(KofaPage):
+    """
+    """
     grok.context(IStudentOnlinePayment)
-    grok.name('enter_pin')
-    grok.template('enter_pin')
+    grok.name('enterpin')
+    grok.template('enterpin')
     grok.require('waeup.payStudent')
 
+    buttonname = _('Submit to eTranzact')
+    label = _('Requery eTranzact History')
+    action = 'query_history'
 
 class EtranzactQueryHistoryPage(UtilityView, grok.View):
Index: /main/waeup.custom/trunk/src/waeup/custom/etranzact/browser_templates/enterpin.pt
===================================================================
--- /main/waeup.custom/trunk/src/waeup/custom/etranzact/browser_templates/enterpin.pt	(revision 7976)
+++ /main/waeup.custom/trunk/src/waeup/custom/etranzact/browser_templates/enterpin.pt	(revision 7976)
@@ -0,0 +1,22 @@
+<form tal:attributes="action view/action"
+    method="POST" i18n:domain="waeup.custom">
+  <table class="form-table">
+    <tbody>
+      <tr>
+        <td i18n:translate="">
+        Confirmation Number (PIN):
+        </td>
+        <td>
+        <input name="confirmation_number" type="text" class="span5" maxlength=""
+               value="" />
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2">
+          <input type="submit" name="SUBMIT" class="btn primary"
+                 tal:attributes="value view/buttonname" />
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</form>
Index: /main/waeup.custom/trunk/src/waeup/custom/etranzact/tests.py
===================================================================
--- /main/waeup.custom/trunk/src/waeup/custom/etranzact/tests.py	(revision 7975)
+++ /main/waeup.custom/trunk/src/waeup/custom/etranzact/tests.py	(revision 7976)
@@ -37,5 +37,5 @@
 
 class EtranzactTests(StudentsFullSetup):
-    """Tests foreTranzact payment gateway.
+    """Tests for the eTranzact payment gateway.
     """
 
@@ -44,10 +44,6 @@
     CONFIRMATION_NO = '500856521315472785095'
 
-    def test_dummy(self):
-        return
-
-    @external_test
-    def test_etranzact_query_history(self):
-
+    def setUp(self):
+        super(EtranzactTests, self).setUp()
         # Managers can add online payment tickets
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
@@ -63,7 +59,16 @@
         self.assertMatches('...Amount Authorized...',
                            self.browser.contents)
-        payment_url = self.browser.url
-        
-        self.browser.open(payment_url + '/query_history?confirmation_number=%s'
+        self.payment_url = self.browser.url
+
+    def test_enterpin(self):
+        self.browser.getLink("Query eTranzact History").click()
+        self.assertMatches(
+            '...Confirmation Number (PIN):...',
+            self.browser.contents)
+
+    @external_test
+    def test_etranzact_query_history(self):
+
+        self.browser.open(self.payment_url + '/query_history?confirmation_number=%s'
             % self.CONFIRMATION_NO)
         self.assertMatches('...Wrong amount...',
@@ -72,5 +77,5 @@
         self.student['payments'][value].amount_auth = self.student[
             'payments'][value].r_amount_approved
-        self.browser.open(payment_url + '/query_history?confirmation_number=%s'
+        self.browser.open(self.payment_url + '/query_history?confirmation_number=%s'
             % self.CONFIRMATION_NO)
         self.assertMatches('...Wrong transaction id...',
