X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fpayment.cgi;h=ec50c03f166797be96aca56a68b2fa0e8c23679e;hb=2c757d7db4cb6a7b9655de13206fcc84fb7ce61f;hp=cea77fe1a3833b2add908289736334ce3afd36f4;hpb=83ce2076d59c3c27beb78dd5892b2da99fd60ec1;p=freeside.git

diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index cea77fe1a..ec50c03f1 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -22,7 +22,7 @@
    my $conf = new FS::Conf;
    my %states = map { $_->state => 1 }
                   qsearch('cust_main_county', {
-                    'country' => $conf->config('defaultcountry') || 'US'
+                    'country' => $conf->config('countrydefault') || 'US'
                   } );
    my @states = sort { $a cmp $b } keys %states;
 
@@ -35,28 +35,18 @@
 <INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $custnum %>">
 <INPUT TYPE="hidden" NAME="payby" VALUE="<%= $payby %>">
 <INPUT TYPE="hidden" NAME="paybatch" VALUE="<%= $paybatch %>">
-<SCRIPT>
-var mywindow = -1;
-function myopen(filename,windowname,properties) {
-  myclose();
-  mywindow = window.open(filename,windowname,properties);
-}
-function myclose() {
-  if ( mywindow != -1 )
-    mywindow.close();
-  mywindow = -1;
-}
-var achwindow = -1;
-function achopen(filename,windowname,properties) {
-  achclose();
-  achwindow = window.open(filename,windowname,properties);
-}
-function achclose() {
-  if ( achwindow != -1 )
-    achwindow.close();
-  achwindow = -1;
+
+<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript">
+function OLiframeContent(src, width, height, name) {
+  return ('<iframe src="'+src+'" width="'+width+'" height="'+height+'"'
+   +(name?' name="'+name+'" id="'+name+'"':'')+' scrolling="auto">'
+   +'<div>[iframe not supported]</div></iframe>');
 }
 </SCRIPT>
+
 <% #include( '/elements/table.html', '#cccccc' ) %>
 <%= ntable('#cccccc') %>
   <TR>
@@ -92,7 +82,7 @@ function achclose() {
           <TD>Exp.</TD>
           <TD>
             <SELECT NAME="month">
-              <% for ( ( map "0$_", 1 .. 9 ), 11, 12 ) { %>
+              <% for ( ( map "0$_", 1 .. 9 ), 10 .. 12 ) { %>
                 <OPTION<%= $_ == $month ? ' SELECTED' : '' %>><%= $_ %>
               <% } %>
             </SELECT>
@@ -112,7 +102,7 @@ function achclose() {
   <TR>
     <TD ALIGN="right">CVV2</TD>
     <TD><INPUT TYPE="text" NAME="paycvv" VALUE="<%= $paycvv %>" SIZE=4 MAXLENGTH=4>
-        (<A HREF="javascript:myopen('../docs/cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)
+        (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/cvv2.html', 480, 352, 'cvv2_popup' ), CAPTION, 'CVV2 Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">help</A>)
     </TD>
   </TR>
   <TR>
@@ -173,7 +163,7 @@ function achclose() {
     <TD ALIGN="right">ABA/Routing&nbsp;number</TD>
     <TD>
       <INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="payinfo2" VALUE="<%=$payinfo2%>">
-      (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)
+      (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/ach.html', 380, 240, 'ach_popup' ), CAPTION, 'ACH Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">help</A>)
     </TD>
   </TR>
   <TR>
@@ -183,7 +173,7 @@ function achclose() {
   <TR>
     <TD ALIGN="right">
       Account&nbsp;holder<BR>
-      Social&nbsp;security&nbsp;or&nbsp;tax&nbspID&nbsp;#
+      Social&nbsp;security&nbsp;or&nbsp;tax&nbsp;ID&nbsp;#
     </TD>
     <TD><INPUT TYPE="text" NAME="ss" VALUE="<%=$ss%>"></TD>
   </TR>
@@ -205,5 +195,5 @@ function achclose() {
 <BR>
 <INPUT TYPE="submit" NAME="process" VALUE="Process payment">
 </FORM>
-</BODY>
-</HTML>
+
+<%= include('/elements/footer.html') %>