projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ACLs: finish group edit (agents + rights) & browse
[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
86e6abe
..
09a4254
100755
(executable)
--- a/
httemplate/edit/process/cust_main.cgi
+++ b/
httemplate/edit/process/cust_main.cgi
@@
-1,56
+1,43
@@
<%
<%
-# $Id: cust_main.cgi,v 1.3 2001-08-13 23:10:34 ivan Exp $
-use strict;
-use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
-use vars qw( $cust_pkg $cust_svc $svc_acct );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw( popurl );
-use FS::Record qw( qsearch qsearchs fields );
-use FS::cust_main;
-use FS::type_pkgs;
-use FS::agent;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$error = '';
+my $error = '';
#unmunge stuff
#unmunge stuff
-$cgi->param('tax','') unless defined
($cgi->param('tax')
);
+$cgi->param('tax','') unless defined
$cgi->param('tax'
);
$cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
$cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
-$cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
- or die "Oops, illegal \"state\" param: ". $cgi->param('state');
-$cgi->param('state', $1);
-$cgi->param('county', $3 || '');
-$cgi->param('country', $4);
+#my $payby = $cgi->param('payby');
+my $payby = $cgi->param('select'); # XXX key
-$cgi->param('ship_state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
- or die "Oops, illegal \"ship_state\" param: ". $cgi->param('ship_state');
-$cgi->param('ship_state', $1);
-$cgi->param('ship_county', $3 || '');
-$cgi->param('ship_country', $4);
+my %noauto = (
+ 'CARD' => 'DCRD',
+ 'CHEK' => 'DCHK',
+);
+$payby = $noauto{$payby}
+ if ! $cgi->param('payauto') && exists $noauto{$payby};
-if ( $payby = $cgi->param('payby') ) {
- $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
+$cgi->param('payby', $payby);
+
+if ( $payby ) {
+ if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
+ $cgi->param('payinfo',
+ $cgi->param('payinfo1'). '@'. $cgi->param('payinfo2') );
+ }
$cgi->param('paydate',
$cgi->param('paydate',
- $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
- $cgi->param('payname', $cgi->param( $payby. '_payname' ) );
+ $cgi->param( 'exp_month' ). '-'. $cgi->param( 'exp_year' ) );
}
}
-$cgi->param('otaker', &getotaker );
-
-@invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
+my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
+push @invoicing_list, 'FAX' if $cgi->param('invoicing_list_FAX');
+$cgi->param('invoicing_list', join(',', @invoicing_list) );
+
#create new record object
#create new record object
-$new = new FS::cust_main ( {
+
my
$new = new FS::cust_main ( {
map {
$_, scalar($cgi->param($_))
# } qw(custnum agentnum last first ss company address1 address2 city county
map {
$_, scalar($cgi->param($_))
# } qw(custnum agentnum last first ss company address1 address2 city county
@@
-66,14
+53,17
@@
if ( defined($cgi->param('same')) && $cgi->param('same') eq "Y" ) {
);
}
);
}
+$new->setfield('paid', $cgi->param('paid') )
+ if $cgi->param('paid');
+
#perhaps this stuff should go to cust_main.pm
#perhaps this stuff should go to cust_main.pm
-$cust_pkg = '';
-$svc_acct = '';
+
my
$cust_pkg = '';
+
my
$svc_acct = '';
if ( $new->custnum eq '' ) {
if ( $cgi->param('pkgpart_svcpart') ) {
my $x = $cgi->param('pkgpart_svcpart');
if ( $new->custnum eq '' ) {
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)
@@
-91,7
+81,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 };
@@
-100,7
+90,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 } );
@@
-121,7
+111,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!";
@@
-131,17
+121,35
@@
if ( $new->custnum eq '' ) {
tie my %hash, 'Tie::RefHash';
%hash = ( $cust_pkg => [ $svc_acct ] ) if $cust_pkg;
$error ||= $new->insert( \%hash, \@invoicing_list );
tie my %hash, 'Tie::RefHash';
%hash = ( $cust_pkg => [ $svc_acct ] ) if $cust_pkg;
$error ||= $new->insert( \%hash, \@invoicing_list );
+
+ my $conf = new FS::Conf;
+ if ( $conf->exists('backend-realtime') && ! $error ) {
+
+ my $berror = $new->bill;
+ $new->apply_payments;
+ $new->apply_credits;
+ $berror ||= $new->collect;
+ warn "Warning, error billing during backend-realtime: $berror" if $berror;
+
+ }
+
} else { #create old record object
} else { #create old record object
+
my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } );
$error ||= "Old record not found!" unless $old;
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);
+
}
if ( $error ) {
$cgi->param('error', $error);
print $cgi->redirect(popurl(2). "cust_main.cgi?". $cgi->query_string );
} else {
}
if ( $error ) {
$cgi->param('error', $error);
print $cgi->redirect(popurl(2). "cust_main.cgi?". $cgi->query_string );
} else {
- $custnum = $new->custnum;
- print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+ print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new->custnum);
}
%>
}
%>