projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#41124: Backend Unti Search
[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
c1f8155
..
6961d18
100755
(executable)
--- a/
httemplate/edit/process/cust_main.cgi
+++ b/
httemplate/edit/process/cust_main.cgi
@@
-1,7
+1,7
@@
% if ( $error ) {
% $cgi->param('error', $error);
% if ( $error ) {
% $cgi->param('error', $error);
-%
-<% $cgi->redirect(popurl(2). "cust_main.cgi?
". $cgi->query_string
) %>
+%
my $query = $m->scomp('/elements/create_uri_query', 'secure'=>1);
+<% $cgi->redirect(popurl(2). "cust_main.cgi?
$query"
) %>
%
% } else {
%
%
% } else {
%
@@
-59,6
+59,9
@@
$cgi->param('invoicing_list', join(',', @invoicing_list) );
# is this actually used? if so, we need to clone locations...
# but I can't find anything that sets this parameter to a non-empty value
# is this actually used? if so, we need to clone locations...
# but I can't find anything that sets this parameter to a non-empty value
+# yes, fec48523d3cf056da08813f9b2b7d633b27aaf8d for #16582 is where it came in,
+# for "duplicate address checking for new customers". afaict still in
+# edit/cust_main/bottomfixup.html (and working?)
$cgi->param('duplicate_of_custnum') =~ /^(\d+)$/;
my $duplicate_of = $1;
$cgi->param('duplicate_of_custnum') =~ /^(\d+)$/;
my $duplicate_of = $1;
@@
-83,7
+86,7
@@
for my $pre (qw(bill ship)) {
}
$hash{'custnum'} = $cgi->param('custnum');
warn Dumper \%hash if $DEBUG;
}
$hash{'custnum'} = $cgi->param('custnum');
warn Dumper \%hash if $DEBUG;
- $locations{$pre} = FS::cust_location->new
_or_existing
(\%hash);
+ $locations{$pre} = FS::cust_location->new(\%hash);
}
if ( ($cgi->param('same') || '') eq 'Y' ) {
}
if ( ($cgi->param('same') || '') eq 'Y' ) {
@@
-94,8
+97,8
@@
if ( ($cgi->param('same') || '') eq 'Y' ) {
# but explicitly avoid setting ship_ fields
my $new = new FS::cust_main ( {
# but explicitly avoid setting ship_ fields
my $new = new FS::cust_main ( {
-
map { ( $_, scalar($cgi->param($_)) ) } (fields('cust_main'
)),
-
map { ( "ship_$_", '' ) } (FS::cust_main->location_fields
)
+
(map { ( $_, scalar($cgi->param($_)) ) } (fields('cust_main')
)),
+
(map { ( "ship_$_", '' ) } (FS::cust_main->location_fields)
)
} );
$new->invoice_noemail( ($cgi->param('invoice_email') eq 'Y') ? '' : 'Y' );
} );
$new->invoice_noemail( ($cgi->param('invoice_email') eq 'Y') ? '' : 'Y' );
@@
-213,6
+216,7
@@
if ( $new->custnum eq '' or $duplicate_of ) {
#later 'custnum' => $custnum,
'pkgpart' => $pkgpart,
'locationnum' => scalar($cgi->param('locationnum')),
#later 'custnum' => $custnum,
'pkgpart' => $pkgpart,
'locationnum' => scalar($cgi->param('locationnum')),
+ 'salesnum' => scalar($cgi->param('salesnum')),
} );
} );
@@
-349,15
+353,11
@@
if ( $new->custnum eq '' or $duplicate_of ) {
}
}
-unless ( $error ) { #XXX i
guess i
should be transactional... all in the insert
+unless ( $error ) { #XXX i should be transactional... all in the insert
# or replace call
# or replace call
- my @contact_fields = qw( classnum first last title comment emailaddress );
- foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) {
- push @contact_fields, 'phonetypenum'.$phone_type->phonetypenum;
- }
$error = $new->process_o2m( 'table' => 'contact',
$error = $new->process_o2m( 'table' => 'contact',
- 'fields' =>
\@
contact_fields,
+ 'fields' =>
FS::contact->cgi_
contact_fields,
'params' => scalar($cgi->Vars),
);
}
'params' => scalar($cgi->Vars),
);
}