projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add latitude/longitude to prospects, customers and package locations, RT#15539
[freeside.git]
/
httemplate
/
view
/
cust_main
/
packages
/
location.html
diff --git
a/httemplate/view/cust_main/packages/location.html
b/httemplate/view/cust_main/packages/location.html
index
59efce1
..
1bfca00
100644
(file)
--- a/
httemplate/view/cust_main/packages/location.html
+++ b/
httemplate/view/cust_main/packages/location.html
@@
-1,48
+1,58
@@
-<TD CLASS="inv" BGCOLOR="<% $bgcolor %>">
+<TD CLASS="inv" BGCOLOR="<% $bgcolor %>"
WIDTH="20%"
>
% unless ( $cust_pkg->locationnum ) {
% unless ( $cust_pkg->locationnum ) {
- <I><FONT SIZE=-1>(
default service address
)</FONT><BR>
+ <I><FONT SIZE=-1>(
<% mt('default service address') |h %>
)</FONT><BR>
% }
% }
- <% $loc->get($prefix.'address1') |h %><BR>
+ <% $loc->location_label( 'join_string' => '<BR>',
+ 'double_space' => ' ',
+ 'escape_function' => \&encode_entities,
+ 'countrydefault' => $countrydefault,
+ )
+ %>
-% if ( $loc->get($prefix.'address2') !~ /^\s*$/ ) {
- <% $loc->get($prefix.'address2') |h %><BR>
-% }
-
- <% $loc->get($prefix.'city') |h %><% $loc->get($prefix.'county') ? ' ('.$loc->get($prefix.'county').' county)' : '' |h %>,
- <% $loc->get($prefix.'state') |h %> <% $loc->get($prefix.'zip') |h %><BR>
-
-% if ( $loc->get($prefix.'country') ne $countrydefault ) {
- <% code2country( $loc->get($prefix.'country') ) %>
-% }
+% if ( $loc->latitude && $loc->longitude ) {
+ <BR>
+ <FONT SIZE=-1>
+ <% $loc->latitude %>, <% $loc->longitude %>
+ <& /elements/coord-links.html,
+ $loc->latitude,
+ $loc->longitude,
+ $opt{'cust_main'}->name_short. ': '. $opt{'part_pkg'}->pkg
+ &>
+ </FONT>
+% }
+% unless ( $cust_pkg->locationnum ) {
</I>
</I>
+% }
% if ( ! $cust_pkg->get('cancel')
% && $FS::CurrentUser::CurrentUser->access_right('Change customer package')
% )
% {
% if ( ! $cust_pkg->get('cancel')
% && $FS::CurrentUser::CurrentUser->access_right('Change customer package')
% )
% {
+ <BR>
<FONT SIZE=-1>
( <%pkg_change_location_link($cust_pkg)%> )
<FONT SIZE=-1>
( <%pkg_change_location_link($cust_pkg)%> )
+% if ( $cust_pkg->locationnum ) {
+ ( <%edit_location_link($cust_pkg->locationnum)%> )
+% }
</FONT>
% }
</TD>
<%init>
</FONT>
% }
</TD>
<%init>
+my $conf = new FS::Conf;
my %opt = @_;
my $bgcolor = $opt{'bgcolor'};
my $cust_pkg = $opt{'cust_pkg'};
my %opt = @_;
my $bgcolor = $opt{'bgcolor'};
my $cust_pkg = $opt{'cust_pkg'};
-my $part_pkg = $opt{'part_pkg'};
my $countrydefault = $opt{'countrydefault'} || 'US';
my $statedefault = $opt{'statedefault'}
|| ($countrydefault eq 'US' ? 'CA' : '');
my $loc = $cust_pkg->cust_location_or_main;
my $countrydefault = $opt{'countrydefault'} || 'US';
my $statedefault = $opt{'statedefault'}
|| ($countrydefault eq 'US' ? 'CA' : '');
my $loc = $cust_pkg->cust_location_or_main;
-my $prefix =
- ( $loc->table eq 'cust_main' && length($loc->ship_last) ) ? 'ship_' : ''; #doh
sub pkg_change_location_link {
my $cust_pkg = shift;
sub pkg_change_location_link {
my $cust_pkg = shift;
@@
-51,10
+61,19
@@
sub pkg_change_location_link {
'action' => $p. "misc/change_pkg.cgi?locationnum=-1;pkgpart=$pkgpart;".
"address1=;address2=;city=;county=;state=$statedefault;".
"zip=;country=$countrydefault",
'action' => $p. "misc/change_pkg.cgi?locationnum=-1;pkgpart=$pkgpart;".
"address1=;address2=;city=;county=;state=$statedefault;".
"zip=;country=$countrydefault",
- 'label' =>
'Change location'
,
- 'actionlabel' =>
'Change'
,
+ 'label' =>
emt('Change location')
,
+ 'actionlabel' =>
emt('Change')
,
'cust_pkg' => $cust_pkg,
);
}
'cust_pkg' => $cust_pkg,
);
}
+sub edit_location_link {
+ my $locationnum = shift;
+ include( '/elements/popup_link.html',
+ 'action' => $p. "edit/cust_location.cgi?locationnum=$locationnum",
+ 'label' => emt('Edit location'),
+ 'actionlabel' => emt('Edit'),
+ );
+}
+
</%init>
</%init>