projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usability: customer tags with checkboxes instead of a select-multiple
[freeside.git]
/
httemplate
/
edit
/
cust_main
/
basics.html
diff --git
a/httemplate/edit/cust_main/basics.html
b/httemplate/edit/cust_main/basics.html
index
e16aafa
..
a30d7f8
100644
(file)
--- a/
httemplate/edit/cust_main/basics.html
+++ b/
httemplate/edit/cust_main/basics.html
@@
-31,6
+31,8
@@
$('#spouse_label').slideUp();
$('#spouse_last_input').slideUp();
$('#spouse_first_input').slideUp();
$('#spouse_label').slideUp();
$('#spouse_last_input').slideUp();
$('#spouse_first_input').slideUp();
+ $('#invoice_email_label').slideUp();
+ $('#invoice_email_input').slideUp();
} else {
if ( document.getElementById('company').value.length == 0 ) {
$('#company_label').slideUp();
} else {
if ( document.getElementById('company').value.length == 0 ) {
$('#company_label').slideUp();
@@
-40,13
+42,15
@@
$('#spouse_label').slideDown();
$('#spouse_last_input').slideDown();
$('#spouse_first_input').slideDown();
$('#spouse_label').slideDown();
$('#spouse_last_input').slideDown();
$('#spouse_first_input').slideDown();
+ $('#invoice_email_label').slideDown();
+ $('#invoice_email_input').slideDown();
}
}
var ship_locked_agents = <% encode_json(\%ship_locked_agents) %>;
var ship_fields = [
}
}
var ship_locked_agents = <% encode_json(\%ship_locked_agents) %>;
var ship_fields = [
- 'locationname', 'address1',
'city',
'state', 'zip', 'country',
+ 'locationname', 'address1',
<% $conf->exists('cust_main-no_city_in_address') ? '' : q( 'city',) %>
'state', 'zip', 'country',
'latitude', 'longitude', 'district'
];
'latitude', 'longitude', 'district'
];
@@
-119,6
+123,7
@@
%# tags
<& /elements/tr-select-cust_tag.html,
'custnum' => $custnum,
%# tags
<& /elements/tr-select-cust_tag.html,
'custnum' => $custnum,
+ 'default' => { map { $_=>1 } FS::part_tag->default_tags },
'cgi' => $cgi,
&>
'cgi' => $cgi,
&>
@@
-307,7
+312,10
@@
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(locationname address1 city state zip country latitude longitude district)
+ (
+ qw(locationname address1 state zip country latitude longitude district),
+ ($conf->exists('cust_main-no_city_in_address') ? () : 'city')
+ )
};
}
};
}