payment gateway editing

3 files changed, 69 insertions, 47 deletions

diff --git a/httemplate/browse/payment_gateway.html b/httemplate/browse/payment_gateway.html
index 002932ccd..791906b78 100644
--- a/httemplate/browse/payment_gateway.html
+++ b/httemplate/browse/payment_gateway.html
@@ -40,10 +40,13 @@
       <TD><%= $payment_gateway->disabled ? 'DISABLED' : '' %></TD>
     <% } %>
     <TD><%= $payment_gateway->gateway_module %>
-      <%= !$payment_gateway->disabled 
-            ? '<FONT SIZE="-1"> <A HREF="misc/disable-payment_gateway.cgi?'. $payment_gateway->gatewaynum.'">(disable)</A></FONT>'
-            : ''
-      %>
+      <FONT SIZE="-1">
+        <A HREF="<%=$p%>edit/payment_gateway.html?<%= $payment_gateway->gatewaynum %>">(edit)</A>
+        <%= !$payment_gateway->disabled 
+              ? '<A HREF="'. $p. 'misc/disable-payment_gateway.cgi?'. $payment_gateway->gatewaynum.'">(disable)</A>'
+              : ''
+        %>
+      </FONT>
     </TD>
     <TD><%= $payment_gateway->gateway_username %></TD>
     <TD> - </TD>
diff --git a/httemplate/edit/payment_gateway.html b/httemplate/edit/payment_gateway.html
index cf825df00..1eda11249 100644
--- a/httemplate/edit/payment_gateway.html
+++ b/httemplate/edit/payment_gateway.html
@@ -34,70 +34,89 @@ Gateway #<%= $payment_gateway->gatewaynum || "(NEW)" %>
 
 <TR>
   <TH ALIGN="right">Gateway: </TH>
-  <TD><SELECT NAME="gateway_module" SIZE=1>
-    <% foreach my $module ( qw(
-         2CheckOut
-         AuthorizeNet
-         BankOfAmerica
-         Beanstream
-         Capstone
-         Cardstream
-         CashCow
-         CyberSource
-         eSec
-         eSelectPlus
-         Exact
-         iAuthorizer
-         IPaymentTPG
-         Jettis
-         LinkPoint
-         MerchantCommerce
-         Network1Financial
-         OCV
-         OpenECHO
-         PayConnect
-         PayflowPro
-         PaymentsGateway
-         PXPost
-         SecureHostingUPG
-         Skipjack
-         StGeorge
-         SurePay
-         TCLink
-         TransactionCentral
-         VirtualNet
-       ) ) {
-    %>
-      <OPTION VALUE="<%= $module %>"><%= $module %>
+  <TD>
+
+    <% if ( $payment_gateway->gatewaynum ) { %>
+
+      <%= $payment_gateway->gateway_module %>
+      <INPUT TYPE="hidden" NAME="gateway_module" VALUE="<%= $payment_gateway->gateway_module %>">
+
+    <% } else { %>
+
+      <SELECT NAME="gateway_module" SIZE=1>
+        <% foreach my $module ( qw(
+             2CheckOut
+             AuthorizeNet
+             BankOfAmerica
+             Beanstream
+             Capstone
+             Cardstream
+             CashCow
+             CyberSource
+             eSec
+             eSelectPlus
+             Exact
+             iAuthorizer
+             IPaymentTPG
+             Jettis
+             LinkPoint
+             MerchantCommerce
+             Network1Financial
+             OCV
+             OpenECHO
+             PayConnect
+             PayflowPro
+             PaymentsGateway
+             PXPost
+             SecureHostingUPG
+             Skipjack
+             StGeorge
+             SurePay
+             TCLink
+             TransactionCentral
+             VirtualNet
+           ) ) {
+        %>
+          <OPTION VALUE="<%= $module %>"><%= $module %>
+        <% } %>
+      </SELECT>
+
     <% } %>
-    </SELECT>
+
   </TD>
 </TR>
 
 <TR>
   <TH ALIGN="right">Username: </TH>
-  <TD><INPUT TYPE="text" NAME="gateway_username"></TD>
+  <TD><INPUT TYPE="text" NAME="gateway_username" VALUE="<%= $payment_gateway->gateway_username %>"></TD>
 </TR>
 
 <TR>
   <TH ALIGN="right">Password: </TH>
-  <TD><INPUT TYPE="text" NAME="gateway_password"></TD>
+  <TD><INPUT TYPE="text" NAME="gateway_password" VALUE="<%= $payment_gateway->gateway_password %>"></TD>
 </TR>
 
 <TR>
   <TH ALIGN="right">Action: </TH>
   <TD>
     <SELECT NAME="gateway_action" SIZE=1>
-      <OPTION VALUE="Normal Authorization">Normal Authorization
-      <OPTION VALUE="Authorization Only">Authorization Only
-      <OPTION VALUE="Authorization Only, Post Authorization">Authorization Only, Post Authorization
+      <% foreach my $action ( 
+                              'Normal Authorization',
+                              'Authorization Only',
+                              'Authorization Only, Post Authorization',
+                            ) {
+      %>
+        <OPTION VALUE="<%= $action %>"<%= $action eq $payment_gateway->gateway_action ? ' SELECTED' : '' %>><%= $action %>
+      <% } %>
     </SELECT>
   </TD>
 </TR>
 
 <TR>
   <TH ALIGN="right">Options: </TH>
-  <TD><TEXTAREA ROWS="5" NAME="gateway_options"></TEXTAREA></TD>
+  <TD>
+    <TEXTAREA ROWS="5" NAME="gateway_options"><%= join("\r", $payment_gateway->options ) %></TEXTAREA>
+  </TD>
 </TR>
 
 </TABLE>
diff --git a/httemplate/edit/process/payment_gateway.html b/httemplate/edit/process/payment_gateway.html
index b9e4d47da..42205a02d 100644
--- a/httemplate/edit/process/payment_gateway.html
+++ b/httemplate/edit/process/payment_gateway.html
@@ -17,7 +17,7 @@ my %options = @options;
 
 my $error;
 if ( $gatewaynum ) {
-  $error=$new->replace($old);
+  $error=$new->replace($old, \%options);
 } else {
   $error=$new->insert(\%options);
   $gatewaynum=$new->getfield('gatewaynum');