X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Flocation.html;h=595d6b3b16ec31509c6177d1e43e41c6119fe2e2;hb=4dc075fc38008d1c6cbe9b88b2bdb32bdc92adbf;hp=ab961b79eb96df15a8c4436673bf1e4929d0df56;hpb=3d0a1bb06b895c5be6e3f0517d355442a6b1e125;p=freeside.git
diff --git a/httemplate/view/cust_main/packages/location.html b/httemplate/view/cust_main/packages/location.html
index ab961b79e..595d6b3b1 100644
--- a/httemplate/view/cust_main/packages/location.html
+++ b/httemplate/view/cust_main/packages/location.html
@@ -1,49 +1,74 @@
-% if ( $default ) {
-
-% }
+% 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,
- $opt{'cust_main'}->agentnum,
- &>
-
-% }
+% 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->country eq 'US' ) {
+% if ( $loc->censustract ) {
+
+
+ <% $loc->censustract %> (<% $loc->censusyear %> census)
+
+% } elsif ( $opt{'cust_main-require_censustract'} ) {
+
+
+ <% emt('Census tract unknown') %>
+
+% }
+% }
-% if ( $default ) {
-
-% }
+% 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')
-% )
-% {
+% )
+% {