projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DHTML progress bar for glacial rate adding and editing, closes: Bug#1100
[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
6ce60d1
..
a1d3698
100755
(executable)
--- a/
httemplate/edit/process/cust_main.cgi
+++ b/
httemplate/edit/process/cust_main.cgi
@@
-10,16
+10,23
@@
$cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
my $payby = $cgi->param('payby');
if ( $payby ) {
my $payby = $cgi->param('payby');
if ( $payby ) {
- $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
+ if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
+ $cgi->param('payinfo',
+ $cgi->param($payby. '_payinfo1'). '@'. $cgi->param($payby. '_payinfo2') );
+ } else {
+ $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
+ }
$cgi->param('paydate',
$cgi->param('paydate',
- $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
+
$cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
$cgi->param('payname', $cgi->param( $payby. '_payname' ) );
$cgi->param('payname', $cgi->param( $payby. '_payname' ) );
+ $cgi->param('paycvv', $cgi->param( $payby. '_paycvv' ) )
+ if defined $cgi->param( $payby. '_paycvv' );
}
}
-$cgi->param('otaker', &getotaker );
-
my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
+$cgi->param('invoicing_list', join(',', @invoicing_list) );
+
#create new record object
#create new record object
@@
-46,7
+53,7
@@
if ( $new->custnum eq '' ) {
if ( $cgi->param('pkgpart_svcpart') ) {
my $x = $cgi->param('pkgpart_svcpart');
if ( $cgi->param('pkgpart_svcpart') ) {
my $x = $cgi->param('pkgpart_svcpart');
- $x =~ /^(\d+)_(\d+)$/;
+ $x =~ /^(\d+)_(\d+)$/
or die "illegal pkgpart_svcpart $x\n"
;
my($pkgpart, $svcpart) = ($1, $2);
#false laziness: copied from FS::cust_pkg::order (which should become a
#FS::cust_main method)
my($pkgpart, $svcpart) = ($1, $2);
#false laziness: copied from FS::cust_pkg::order (which should become a
#FS::cust_main method)
@@
-64,7
+71,7
@@
if ( $new->custnum eq '' ) {
#eslaf
# this should wind up in FS::cust_pkg!
#eslaf
# this should wind up in FS::cust_pkg!
- $error ||= "Agent ". $new->agentnum. " (type ". $agent->typenum. ") can't".
+ $error ||= "Agent ". $new->agentnum. " (type ". $agent->typenum. ") can't
".
"purchase pkgpart ". $pkgpart
#unless $part_pkg{ $pkgpart };
unless $pkgpart_href->{ $pkgpart };
"purchase pkgpart ". $pkgpart
#unless $part_pkg{ $pkgpart };
unless $pkgpart_href->{ $pkgpart };
@@
-73,7
+80,7
@@
if ( $new->custnum eq '' ) {
#later 'custnum' => $custnum,
'pkgpart' => $pkgpart,
} );
#later 'custnum' => $custnum,
'pkgpart' => $pkgpart,
} );
- $error ||= $cust_pkg->check;
+
#
$error ||= $cust_pkg->check;
#$cust_svc = new FS::cust_svc ( { 'svcpart' => $svcpart } );
#$cust_svc = new FS::cust_svc ( { 'svcpart' => $svcpart } );
@@
-94,7
+101,7
@@
if ( $new->custnum eq '' ) {
$svc_acct->_password($cgi->param('_password'));
$svc_acct->popnum($cgi->param('popnum'));
$svc_acct->_password($cgi->param('_password'));
$svc_acct->popnum($cgi->param('popnum'));
- $error ||= $svc_acct->check;
+
#
$error ||= $svc_acct->check;
} elsif ( $cgi->param('username') ) { #good thing to catch
$error = "Can't assign username without a package!";
} elsif ( $cgi->param('username') ) { #good thing to catch
$error = "Can't assign username without a package!";
@@
-107,6
+114,11
@@
if ( $new->custnum eq '' ) {
} else { #create old record object
my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } );
$error ||= "Old record not found!" unless $old;
} else { #create old record object
my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } );
$error ||= "Old record not found!" unless $old;
+ if ( defined dbdef->table('cust_main')->column('paycvv')
+ && length($old->paycvv)
+ && $new->paycvv =~ /^\s*\*+\s*$/ ) {
+ $new->paycvv($old->paycvv);
+ }
$error ||= $new->replace($old, \@invoicing_list);
}
$error ||= $new->replace($old, \@invoicing_list);
}