X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Ftr-select-cust_location.html;h=bc3915441ac74a1295f01e2eb12de3bbb5546acd;hb=41f561eb60f8a69d1ce3685e04cfd1e1a8efefad;hp=b62c65c03d431ec694dfcdd7fd8b16b15307d167;hpb=a661ced3f9f678a645780eaa0b183d2de5f100fa;p=freeside.git

diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index b62c65c03..bc3915441 100644
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -42,16 +42,16 @@ Example:
     } else {
 
       if ( locationnum == 0 ) {
-        what.form.address1.value = <% $cust_main->address1 |js_string %>;
-        what.form.address2.value = <% $cust_main->address2 |js_string %>;
-        what.form.city.value = <% $cust_main->city |js_string %>;
-        what.form.zip.value = <% $cust_main->zip |js_string %>;
+        what.form.address1.value = <% $cust_main->get($prefix.'address1') |js_string %>;
+        what.form.address2.value = <% $cust_main->get($prefix.'address2') |js_string %>;
+        what.form.city.value = <% $cust_main->get($prefix.'city') |js_string %>;
+        what.form.zip.value = <% $cust_main->get($prefix.'zip') |js_string %>;
 
-        changeSelect(what.form.country, <% $cust_main->country | js_string %> );
+        changeSelect(what.form.country, <% $cust_main->get($prefix.'country') | js_string %> );
 
         country_changed( what.form.country,
-                         fix_state_factory( <% $cust_main->state | js_string %>,
-                                            <% $cust_main->county | js_string %>
+                         fix_state_factory( <% $cust_main->get($prefix.'state') | js_string %>,
+                                            <% $cust_main->get($prefix.'county') | js_string %>
                                           )
                        );
 
@@ -118,7 +118,7 @@ Example:
 </SCRIPT>
 
 <TR>
-  <TH ALIGN="right">Service location</TH>
+  <<%$th%> ALIGN="right"><% $opt{'label'} || 'Service&nbsp;location' %></<%$th%>>
   <TD COLSPAN=7>
     <SELECT NAME="locationnum" onChange="locationnum_changed(this);">
       <OPTION VALUE="">(default service address)
@@ -139,6 +139,7 @@ Example:
              #'onchange' ?  probably not
              'disabled'     => ( $locationnum == -1 ? '' : 'DISABLED' ),
              'no_asterisks' => 1,
+             'no_bold'      => $opt{'no_bold'},
           )
 %>
 
@@ -156,8 +157,11 @@ my $statedefault = $conf->config('statedefault')
 
 my %opt = @_;
 my $cgi       = $opt{'cgi'};
+my $cust_pkg  = $opt{'cust_pkg'};
 my $cust_main = $opt{'cust_main'};
 
+my $prefix = length($cust_main->ship_last) ? 'ship_' : '';
+
 $cgi->param('locationnum') =~ /^(\-?\d*)$/ or die "illegal locationnum";
 my $locationnum = $1;
 my $cust_location;
@@ -166,11 +170,17 @@ if ( $locationnum && $locationnum != -1 ) {
     or die "unknown locationnum";
 } else {
   $cust_location = new FS::cust_location;
-  if ( $cgi->param('error') && $locationnum == -1 ) {
+  if ( $locationnum == -1 ) {
     $cust_location->$_( $cgi->param($_) ) foreach @location_fields;
+  } elsif ( $cust_pkg && $cust_pkg->locationnum ) {
+    my $pkg_location = $cust_pkg->cust_location;
+    $cust_location->$_( $pkg_location->$_ ) foreach @location_fields;
+    $opt{'empty_label'} ||= 'package address: '.$pkg_location->line;
   } else {
-    $cust_location->$_( $cust_main->$_() ) foreach @location_fields;
+    $cust_location->$_( $cust_main->get($prefix.$_) ) foreach @location_fields;
   }
 }
 
+my $th = $opt{'no_bold'} ? 'TD' : 'TH';
+
 </%init>