use a domsvc when passed in, patch from Sean Hanson/S1

[freeside.git] / httemplate / edit / process / cust_main.cgi

diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 38821c3..a4a70ca 100755 (executable)
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,5 +1,3 @@
-%
-%
 %my $error = '';
 %
 %#unmunge stuff
@@ -116,12 +114,16 @@
 %
 %    #$error ||= $cust_svc->check;
 %
-%    $svc_acct = new FS::svc_acct ( {
-%                                     'svcpart'   => $svcpart,
-%                                     'username'  => $cgi->param('username'),
-%                                     '_password' => $cgi->param('_password'),
-%                                     'popnum'    => $cgi->param('popnum'),
-%                                   } );
+%    my %svc_acct = (
+%                     'svcpart'   => $svcpart,
+%                     'username'  => $cgi->param('username'),
+%                     '_password' => $cgi->param('_password'),
+%                     'popnum'    => $cgi->param('popnum'),
+%                   );
+%    $svc_acct{'domsvc'} = $cgi->param('domsvc')
+%      if $cgi->param('domsvc');
+%
+%    $svc_acct = new FS::svc_acct \%svc_acct;
 %
 %    #and just in case you were silly
 %    $svc_acct->svcpart($svcpart);
@@ -144,8 +146,7 @@
 %  if ( $conf->exists('backend-realtime') && ! $error ) {
 %
 %    my $berror = $new->bill;
-%    $new->apply_payments;
-%    $new->apply_credits;
+%    $new->apply_payments_and_credits;
 %    $berror ||= $new->collect( 'realtime' => 1 );
 %    warn "Warning, error billing during backend-realtime: $berror" if $berror;
 %
@@ -160,7 +161,7 @@
 %       && $new->paycvv =~ /^\s*\*+\s*$/ ) {
 %    $new->paycvv($old->paycvv);
 %  }
-%  if ($new->payby =~ /CARD|DCRD|CHEK|DCHK/ && $new->payinfo =~ /xx/) {
+%  if ($new->payby =~ /^(CARD|DCRD|CHEK|DCHK)$/ && $new->payinfo =~ /xx/) {
 %    $new->payinfo($old->payinfo);
 %  }
 %  $error ||= $new->replace($old, \@invoicing_list);
@@ -173,6 +174,3 @@
 %} else { 
 %  print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new->custnum);
 %} 
-%
-
-