projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[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
74f8f23
..
baacd5e
100755
(executable)
--- a/
httemplate/edit/process/cust_main.cgi
+++ b/
httemplate/edit/process/cust_main.cgi
@@
-15,7
+15,14
@@
%
% } else {
%
%
% } else {
%
-<% $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new->custnum) %>
+<% $cgi->redirect( -uri => popurl(3). "view/cust_main.cgi?". $new->custnum,
+ -cookie => CGI::Cookie->new(
+ -name => 'freeside_status',
+ -value => mt($freeside_status),
+ -expires => '+5m',
+ ),
+ )
+%>
%
% }
<%once>
%
% }
<%once>
@@
-90,6
+97,11
@@
my $new = new FS::cust_main ( {
(map { ( "ship_$_", '' ) } (FS::cust_main->location_fields))
} );
(map { ( "ship_$_", '' ) } (FS::cust_main->location_fields))
} );
+# add any virtual fields to the new cust_main record
+foreach ($new->virtual_fields) {
+ $new->setfield($_, scalar($cgi->param($_)));
+}
+
warn Dumper( $new ) if $DEBUG > 1;
if ( $duplicate_of ) {
warn Dumper( $new ) if $DEBUG > 1;
if ( $duplicate_of ) {
@@
-109,7
+121,12
@@
if ( $cgi->param('no_credit_limit') ) {
$new->setfield('credit_limit', '');
}
$new->setfield('credit_limit', '');
}
-$new->tagnum( [ $cgi->param('tagnum') ] );
+#$new->tagnum( [ $cgi->param('tagnum') ] );
+my $params = $cgi->Vars;
+$new->tagnum( [
+ map { /^tagnum(\d+)/ && $1 }
+ grep { /^tagnum(\d+)/ && $cgi->param($_) } keys %$params
+] );
$error ||= $new->set_national_id_from_cgi( $cgi );
$error ||= $new->set_national_id_from_cgi( $cgi );
@@
-175,7
+192,7
@@
if ( $cgi->param('residential_commercial') eq 'Residential' ) {
$error = 'Email address required';
}
$error = 'Email address required';
}
- $options{'invoicing_list'} = [ split(/
\s*,\s*
/, $email) ];
+ $options{'invoicing_list'} = [ split(/
[,\s]+
/, $email) ];
# XXX really should include the phone numbers in here also
} else {
# XXX really should include the phone numbers in here also
} else {
@@
-208,8
+225,11
@@
if ( $vendor eq 'avalara' or $vendor eq 'suretax' ) {
}
#perhaps this stuff should go to cust_main.pm
}
#perhaps this stuff should go to cust_main.pm
+my $freeside_status = '';
if ( $new->custnum eq '' or $duplicate_of ) {
if ( $new->custnum eq '' or $duplicate_of ) {
+ $freeside_status = 'Customer added';
+
my $cust_pkg = '';
my $svc;
my $cust_pkg = '';
my $svc;
@@
-331,6
+351,8
@@
if ( $new->custnum eq '' or $duplicate_of ) {
} else { #create old record object
} else { #create old record object
+ $freeside_status = 'Customer edited';
+
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;