X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Flocation.html;h=c5ef10ee448920d21f04764f144aec2dd1de616f;hb=b4dd79750936de7aa6998cea77f9091cdbd67392;hp=1bfca00f2b506d9980408cf03d434d08d5e59d85;hpb=8cbe016ac2c28cd209c48f053f361573368e7988;p=freeside.git
diff --git a/httemplate/view/cust_main/packages/location.html b/httemplate/view/cust_main/packages/location.html
index 1bfca00f2..c5ef10ee4 100644
--- a/httemplate/view/cust_main/packages/location.html
+++ b/httemplate/view/cust_main/packages/location.html
@@ -1,58 +1,82 @@
-
-
-% unless ( $cust_pkg->locationnum ) {
- (<% mt('default service address') |h %>)
-% }
+% if ( $cust_pkg->change_from_pkg
+% and $cust_pkg->change_from_pkg->locationnum == $cust_pkg->locationnum)
+% {
+% # don't show the location
+% } else {
+% if ( !$opt{'cust_pkg-group_by_location'} ) {
+% if ( $default ) {
+
+% }
- <% $loc->location_label( 'join_string' => ' ',
- 'double_space' => ' ',
- 'escape_function' => \&encode_entities,
- 'countrydefault' => $countrydefault,
- )
- %>
+ <% $loc->location_label( 'join_string' => ' ',
+ 'double_space' => ' ',
+ 'escape_function' => \&encode_entities,
+ 'countrydefault' => $countrydefault,
+ 'cust_main' => $opt{'cust_main'},
+ )
+ %>
-% if ( $loc->latitude && $loc->longitude ) {
-
-
- <% $loc->latitude %>, <% $loc->longitude %>
- <& /elements/coord-links.html,
- $loc->latitude,
- $loc->longitude,
- $opt{'cust_main'}->name_short. ': '. $opt{'part_pkg'}->pkg
- &>
-
-% }
+% if ( $loc->latitude && $loc->longitude ) {
+
+
+ <% $loc->latitude %>, <% $loc->longitude %>
+ <& /elements/coord-links.html, {
+ 'latitude' => $loc->latitude,
+ 'longitude' => $loc->longitude,
+ 'name' => $opt{'cust_main'}->name_short.
+ ': '. $opt{'part_pkg'}->pkg,
+ 'company_address' => $opt{'company_address'},
+ }
+ &>
+
+% }
+% if ( $loc->censustract ) {
+
+
+ <% $loc->censustract %> (<% $loc->censusyear %> census)
+
+% } elsif ( $opt{'cust_main-require_censustract'} ) {
+
+
+ <% emt('Census tract unknown') %>
+
+% }
-% unless ( $cust_pkg->locationnum ) {
-
-% }
+% if ( $default ) {
+
+% }
+% } # all of this is hidden if packages are grouped by location, because
+% # it's in the top banner
-% if ( ! $cust_pkg->get('cancel')
+% if ( ! $cust_pkg->get('cancel')
% && $FS::CurrentUser::CurrentUser->access_right('Change customer package')
-% )
-% {
+% )
+% {
- ( <%pkg_change_location_link($cust_pkg)%> )
-% if ( $cust_pkg->locationnum ) {
- ( <%edit_location_link($cust_pkg->locationnum)%> )
-% }
+% unless ( $opt{no_links} or $opt{'change_from'} ) {
+ ( <%pkg_change_location_link($cust_pkg)%> )
+% }
+% if ( $cust_pkg->locationnum && ! $opt{no_links} ) {
+ ( <%pkg_edit_location_link($cust_pkg->locationnum)%> )
+% }
-% }
-
- |
+% }
+% } # if the package is a scheduled future package change without location
+% # change, then don't show any of this at all. It's all implied by the
+% # preceding package.
<%init>
-my $conf = new FS::Conf;
my %opt = @_;
-my $bgcolor = $opt{'bgcolor'};
my $cust_pkg = $opt{'cust_pkg'};
my $countrydefault = $opt{'countrydefault'} || 'US';
my $statedefault = $opt{'statedefault'}
|| ($countrydefault eq 'US' ? 'CA' : '');
-my $loc = $cust_pkg->cust_location_or_main;
+my $loc = $cust_pkg->cust_location_or_main('_cache'=>$opt{cust_location_cache});
+# dubious--they should all have a location now
+my $default = $cust_pkg->locationnum == $opt{'cust_main'}->ship_locationnum;
sub pkg_change_location_link {
my $cust_pkg = shift;
@@ -64,16 +88,20 @@ sub pkg_change_location_link {
'label' => emt('Change location'),
'actionlabel' => emt('Change'),
'cust_pkg' => $cust_pkg,
+ 'width' => 960,
+ 'height' => 490,
);
}
-sub edit_location_link {
+sub pkg_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'),
- );
+ 'width' => 700,
+ 'height' => 355,
+ );
}
%init>