if ( $locationnum == -1 ) {
$cust_location->$_( $cgi->param($_) ) foreach @location_fields;
} else {
- $cust_location->$_( $cust_main->get($prefix.$_) foreach @location_fields;
+ $cust_location->$_( $cust_main->get($prefix.$_) ) foreach @location_fields;
}
}
<I><FONT SIZE=-1>(default service address)</FONT><BR>
% }
- <% $loc->address1 |h %><BR>
+ <% $loc->get($prefix.'address1') |h %><BR>
-% if ( $loc->address2 !~ /^\s*$/ ) {
- <% $loc->address2 |h %><BR>
+% if ( $loc->get($prefix.'address2') !~ /^\s*$/ ) {
+ <% $loc->get($prefix.'address2') |h %><BR>
% }
- <% $loc->city |h %><% $loc->county ? ' ('.$loc->county.' county)' : '' |h %>,
- <% $loc->state |h %> <% $loc->zip |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->country ne $countrydefault ) {
- <% code2country( $loc->country ) %>
+% if ( $loc->get($prefix.'country') ne $countrydefault ) {
+ <% code2country( $loc->get($prefix.'country') ) %>
% }
</I>
|| ($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;