X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fpayment.cgi;h=2c889d73b964be37ad1ec416c4695f291e96b4b0;hb=fca1ac5d298b3896c1c42c4ffc7bdd3bab9b8516;hp=4c6ae33499a3df23bb0c47a9b9ee5d185db4352c;hpb=3ce7691203a7737406bf2d4442f7fd84b81f847e;p=freeside.git

diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 4c6ae3349..2c889d73b 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -1,41 +1,9 @@
-%
-%   my %type = ( 'CARD' => 'credit card',
-%                'CHEK' => 'electronic check (ACH)',
-%              );
-%
-%   $cgi->param('payby') =~ /^(CARD|CHEK)$/
-%     or die "unknown payby ". $cgi->param('payby');
-%   my $payby = $1;
-%
-%   $cgi->param('custnum') =~ /^(\d+)$/
-%     or die "illegal custnum ". $cgi->param('custnum');
-%   my $custnum = $1;
-%
-%   my $cust_main = qsearchs( 'cust_main', { 'custnum'=>$custnum } );
-%   die "unknown custnum $custnum" unless $cust_main;
-%
-%   my $balance = $cust_main->balance;
-%
-%   my $payinfo = '';
-%
-%   #false laziness w/selfservice make_payment.html shortcut for one-country
-%   my $conf = new FS::Conf;
-%   my %states = map { $_->state => 1 }
-%                  qsearch('cust_main_county', {
-%                    'country' => $conf->config('countrydefault') || 'US'
-%                  } );
-%   my @states = sort { $a cmp $b } keys %states;
-%
-%   my $paybatch = "webui-payment-". time. "-$$-". rand() * 2**32;
-%
-%
-
 <% include( '/elements/header.html', "Process $type{$payby} payment" ) %>
-<% include( '/elements/small_custview.html', $cust_main ) %>
+<% include( '/elements/small_custview.html', $cust_main, '', '', popurl(2) . "view/cust_main.cgi" ) %>
 <FORM NAME="OneTrueForm" ACTION="process/payment.cgi" METHOD="POST" onSubmit="document.OneTrueForm.process.disabled=true">
 <INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>">
 <INPUT TYPE="hidden" NAME="payby" VALUE="<% $payby %>">
-<INPUT TYPE="hidden" NAME="paybatch" VALUE="<% $paybatch %>">
+<INPUT TYPE="hidden" NAME="payunique" VALUE="<% $payunique %>">
 
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
@@ -67,7 +35,7 @@ function OLiframeContent(src, width, height, name) {
 %     my $state    = $cust_main->state;
 %     my $zip     = $cust_main->zip;
 %     if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
-%       $payinfo = $cust_main->payinfo;
+%       $payinfo = $cust_main->paymask;
 %       $paycvv = $cust_main->paycvv;
 %       ( $month, $year ) = $cust_main->paydate_monthyear;
 %       $payname = $cust_main->payname if $cust_main->payname;
@@ -151,13 +119,19 @@ function OLiframeContent(src, width, height, name) {
     </TD>
   </TR>
 % } elsif ( $payby eq 'CHEK' ) {
-%     my( $payinfo1, $payinfo2, $payname, $ss ) = ( '', '', '', '' );
+%     my( $payinfo1, $payinfo2, $payname, $ss, $paytype, $paystate,
+%         $stateid, $stateid_state )
+%       = ( '', '', '', '', '', '', '', '' );
 %     if ( $cust_main->payby =~ /^(CHEK|DCHK)$/ ) {
-%       $cust_main->payinfo =~ /^(\d+)\@(\d+)$/
+%       $cust_main->paymask =~ /^([\dx]+)\@([\dx]+)$/i
 %         or die "unparsable payinfo ". $cust_main->payinfo;
 %       ($payinfo1, $payinfo2) = ($1, $2);
 %       $payname = $cust_main->payname;
 %       $ss = $cust_main->ss;
+%       $paytype = $cust_main->getfield('paytype');
+%       $paystate = $cust_main->getfield('paystate');
+%       $stateid = $cust_main->getfield('stateid');
+%       $stateid_state = $cust_main->getfield('stateid_state');
 %     }
 %
 
@@ -166,6 +140,8 @@ function OLiframeContent(src, width, height, name) {
   <TR>
     <TD ALIGN="right">Account&nbsp;number</TD>
     <TD><INPUT TYPE="text" SIZE=10 NAME="payinfo1" VALUE="<%$payinfo1%>"></TD>
+    <TD ALIGN="right">Type</TD>
+    <TD><SELECT NAME="paytype"><% join('', map { qq!<OPTION VALUE="$_" !.($paytype eq $_ ? 'SELECTED' : '').">$_</OPTION>" } @FS::cust_main::paytypes) %></SELECT></TD>
   </TR>
   <TR>
     <TD ALIGN="right">ABA/Routing&nbsp;number</TD>
@@ -179,12 +155,35 @@ function OLiframeContent(src, width, height, name) {
     <TD><INPUT TYPE="text" NAME="payname" VALUE="<%$payname%>"></TD>
   </TR>
   <TR>
+    <TD ALIGN="right">Bank&nbsp;state</TD>
+    <TD><% include('../edit/cust_main/select-state.html', #meh 
+                   'empty'   => '(choose)',
+                   'state'   => $paystate,
+                   'country' => $cust_main->country,
+                   'prefix'  => 'pay',
+                  ) %></TD>
+  </TR>
+  <TR>
     <TD ALIGN="right">
       Account&nbsp;holder<BR>
       Social&nbsp;security&nbsp;or&nbsp;tax&nbsp;ID&nbsp;#
     </TD>
     <TD><INPUT TYPE="text" NAME="ss" VALUE="<%$ss%>"></TD>
   </TR>
+  <TR>
+    <TD ALIGN="right">
+      Account&nbsp;holder<BR>
+      Driver&rsquo;s&nbsp;license&nbsp;or&nbsp;state&nbsp;ID&nbsp;#
+    </TD>
+    <TD><INPUT TYPE="text" NAME="stateid" VALUE="<%$stateid%>"></TD>
+    <TD ALIGN="right">State</TD>
+    <TD><% include('../edit/cust_main/select-state.html', #meh 
+                   'empty'   => '(choose)',
+                   'state'   => $stateid_state,
+                   'country' => $cust_main->country,
+                   'prefix'  => 'stateid_',
+                  ) %></TD>
+  </TR>
 % } 
 
 
@@ -194,6 +193,16 @@ function OLiframeContent(src, width, height, name) {
     Remember this information
   </TD>
 </TR><TR>
+% if ($conf->exists("batch-enable")) {
+  <TD COLSPAN=2>
+    <INPUT TYPE="checkbox" <% ( $conf->exists("paymentforcedtobatch") && $payby eq 'CHEK' ) ? 'CHECKED DISABLED' : '' %> NAME="batch" VALUE="1">
+    Add to current batch
+% if ($conf->exists("paymentforcedtobatch") && $payby eq 'CHEK' ) {
+    <INPUT TYPE="hidden" NAME="batch" VALUE="1">
+% }
+  </TD>
+</TR><TR>
+% }
   <TD COLSPAN=2>
     <INPUT TYPE="checkbox"<% ( ( $payby eq 'CARD' && $cust_main->payby ne 'DCRD' ) || ( $payby eq 'CHEK' && $cust_main->payby eq 'CHEK' ) ) ? ' CHECKED' : '' %> NAME="auto" VALUE="1" onClick="if (this.checked) { document.OneTrueForm.save.checked=true; }">
     Charge future payments to this <% $type{$payby} %> automatically
@@ -205,3 +214,37 @@ function OLiframeContent(src, width, height, name) {
 </FORM>
 
 <% include('/elements/footer.html') %>
+<%init>
+
+my %type = ( 'CARD' => 'credit card',
+             'CHEK' => 'electronic check (ACH)',
+           );
+
+$cgi->param('payby') =~ /^(CARD|CHEK)$/
+  or die "unknown payby ". $cgi->param('payby');
+my $payby = $1;
+
+$cgi->param('custnum') =~ /^(\d+)$/
+  or die "illegal custnum ". $cgi->param('custnum');
+my $custnum = $1;
+
+my $cust_main = qsearchs( 'cust_main', { 'custnum'=>$custnum } );
+die "unknown custnum $custnum" unless $cust_main;
+
+my $balance = $cust_main->balance;
+
+my $payinfo = '';
+
+#false laziness w/selfservice make_payment.html shortcut for one-country
+my $conf = new FS::Conf;
+my %states = map { $_->state => 1 }
+               qsearch('cust_main_county', {
+                 'country' => $conf->config('countrydefault') || 'US'
+               } );
+my @states = sort { $a cmp $b } keys %states;
+
+my $payunique = "webui-payment-". time. "-$$-". rand() * 2**32;
+
+</%init>
+
+