projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
default to commercial new cusotomer, RT#22560
[freeside.git]
/
httemplate
/
edit
/
cust_main
/
top_misc.html
diff --git
a/httemplate/edit/cust_main/top_misc.html
b/httemplate/edit/cust_main/top_misc.html
index
f3fde53
..
8f8a96a
100644
(file)
--- a/
httemplate/edit/cust_main/top_misc.html
+++ b/
httemplate/edit/cust_main/top_misc.html
@@
-39,8
+39,10
@@
var ship_locked_agents = <% encode_json(\%ship_locked_agents) %>;
var ship_locked_agents = <% encode_json(\%ship_locked_agents) %>;
- var ship_fields = ['address1', 'city', 'state', 'zip', 'country',
- 'latitude', 'longitude', 'district'];
+ var ship_fields = [
+ 'locationname', 'address1', 'city', 'state', 'zip', 'country',
+ 'latitude', 'longitude', 'district'
+ ];
function agent_changed(what) {
var agentnum = what.value;
function agent_changed(what) {
var agentnum = what.value;
@@
-81,6
+83,7
@@
}
<&| /elements/onload.js &>
}
<&| /elements/onload.js &>
+ rescom_changed(document.getElementById('residential_commercial_Residential'));
agent_changed(document.getElementById('agentnum'))
</&>
agent_changed(document.getElementById('agentnum'))
</&>
@@
-238,6
+241,8
@@
my( $cust_main, %opt ) = @_;
my $custnum = $opt{'custnum'};
my $custnum = $opt{'custnum'};
+my $conf = new FS::Conf;
+
if ( $cgi->param('error') ) {
$cust_main->set('residential_commercial',
($cgi->param('residential_commercial') eq 'Commercial')
if ( $cgi->param('error') ) {
$cust_main->set('residential_commercial',
($cgi->param('residential_commercial') eq 'Commercial')
@@
-251,12
+256,13
@@
if ( $cgi->param('error') ) {
: 'Residential'
);
} else { #new customer
: 'Residential'
);
} else { #new customer
- #config to default to commercial and/or disable residential when someone needs
- $cust_main->set('residential_commercial', 'Residential');
+ $cust_main->set('residential_commercial',
+ $conf->exists('cust_main-default_commercial')
+ ? 'Commercial'
+ : 'Residential'
+ );
}
}
-my $conf = new FS::Conf;
-
my $curuser = $FS::CurrentUser::CurrentUser;
my $r = qq!<font color="#ff0000">*</font> !;
my $curuser = $FS::CurrentUser::CurrentUser;
my $r = qq!<font color="#ff0000">*</font> !;
@@
-270,7
+276,7
@@
foreach (qsearch('agent',{})) {
my $agent_ship_location = $cust_main->ship_location;
$ship_locked_agents{$agentnum} = +{
map { $_ => $agent_ship_location->$_ }
my $agent_ship_location = $cust_main->ship_location;
$ship_locked_agents{$agentnum} = +{
map { $_ => $agent_ship_location->$_ }
- qw(address1 city state zip country latitude longitude district)
+ qw(
locationname
address1 city state zip country latitude longitude district)
};
}
};
}