diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/edit/cust_main/top_misc.html | 8 | ||||
| -rw-r--r-- | httemplate/elements/location.html | 36 | ||||
| -rw-r--r-- | httemplate/view/cust_main/contacts.html | 8 |
3 files changed, 45 insertions, 7 deletions
diff --git a/httemplate/edit/cust_main/top_misc.html b/httemplate/edit/cust_main/top_misc.html index f3fde53fa..41dd5636b 100644 --- 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_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; @@ -270,7 +272,7 @@ foreach (qsearch('agent',{})) { 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) }; } diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html index 799531e01..5cdc424a7 100644 --- a/httemplate/elements/location.html +++ b/httemplate/elements/location.html @@ -41,6 +41,33 @@ Example: % } +% if ( $label_prefix eq '_location' ) { + + <TR> + <TD ALIGN="right" ><% $opt{'locationname_label'} || emt('Location ID') %></TD> + <TD COLSPAN=7> + <INPUT TYPE = "text" + NAME = "<%$pre%>locationname" + ID = "<%$pre%>locationname" + VALUE = "<% $object->get('locationname') |h %>" + SIZE = 24 + onChange = "<% $onchange %>" + <% $disabled %> + <% $style %> + > + </TD> + </TR> + +% } else { + + <INPUT TYPE = "hidden" + NAME = "<%$pre%>locationname" + ID = "<%$pre%>locationname" + VALUE = "<% $object->get('locationname') |h %>" + > + +% } + <TR> <<%$th%> STYLE="width:16ex" ALIGN="right"><%$r%><% $opt{'address1_label'} || emt('Address') %></<%$th%>> <TD COLSPAN=7> @@ -291,13 +318,14 @@ my $object = $opt{'object'}; my $onchange = $opt{'onchange'}; my $disabled = $opt{'disabled'}; -my $conf = new FS::Conf; - my $r = $opt{'no_asterisks'} ? '' : qq!<font color="#ff0000">*</font> !; +my $conf = new FS::Conf; my $countrydefault = $conf->config('countrydefault') || 'US'; -my $statedefault = $conf->config('statedefault') - || ($countrydefault eq 'US' ? 'CA' : ''); +my $statedefault = $conf->config('statedefault') + || ($countrydefault eq 'US' ? 'CA' : ''); +my $label_prefix = $conf->config('cust_location-label_prefix'); + $object ||= FS::cust_location->new({ 'country' => $countrydefault, 'state' => $statedefault, diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html index 739cd588b..c9f8005b0 100644 --- a/httemplate/view/cust_main/contacts.html +++ b/httemplate/view/cust_main/contacts.html @@ -62,6 +62,14 @@ % if ( $location ) { # now the actual address + +% if ( $location->locationname ) { + <TR> + <TD ALIGN="right"><% mt('Location ID') |h %></TD> + <TD COLSPAN=7 BGCOLOR="#ffffff"><% $location->locationname |h %></TD> + </TR> +% } + <TR> <TD ALIGN="right"><% mt('Address') |h %></TD> <TD COLSPAN=7 BGCOLOR="#ffffff"><% $location->address1 |h %></TD> |