X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Flocation.html;h=595d6b3b16ec31509c6177d1e43e41c6119fe2e2;hb=21802b5591a2a1c580b4c2fc6490693bc3af52f6;hp=871bfcbe76a124a5f392de645aab4105f82a6942;hpb=e91ed1c4a81c25757f812b3ec8238645b836b235;p=freeside.git diff --git a/httemplate/view/cust_main/packages/location.html b/httemplate/view/cust_main/packages/location.html index 871bfcbe7..595d6b3b1 100644 --- a/httemplate/view/cust_main/packages/location.html +++ b/httemplate/view/cust_main/packages/location.html @@ -30,16 +30,18 @@ &> % } -% if ( $loc->censustract ) { -
- - <% $loc->censustract %> (<% $loc->censusyear %> census) - -% } elsif ( $opt{'cust_main-require_censustract'} ) { -
- - <% emt('Census tract unknown') %> - +% 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 ) { @@ -74,7 +76,7 @@ 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; @@ -89,7 +91,7 @@ sub pkg_change_location_link { 'actionlabel' => emt('Change'), 'cust_pkg' => $cust_pkg, 'width' => 960, - 'height' => 490, + 'height' => 530, ); }