X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUI%2FWeb.pm;h=14af6a467aa622a57b1c8c718f784d6956f7012a;hb=8f548b7139b1bd093c2e23eafcd1e29e64f8e8b7;hp=2e9261bc0100ed12e44cdb8b0dec5fb46551cb7a;hpb=2c90d42ca355e77804fbd0d4fe158dcdc38392c6;p=freeside.git

diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm
index 2e9261bc0..14af6a467 100644
--- a/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@ -214,6 +214,8 @@ sub cust_header {
   warn "FS::UI:Web::cust_header called"
     if $DEBUG;
 
+  my $conf = new FS::Conf;
+
   my %header2method = (
     'Customer'                 => 'name',
     'Cust. Status'             => 'ucfirst_cust_status',
@@ -235,10 +237,30 @@ sub cust_header {
     'Day phone'                => 'daytime', # XXX should use msgcat, but how?
     'Night phone'              => 'night',   # XXX should use msgcat, but how?
     'Fax number'               => 'fax',
+    '(bill) Address 1'         => 'address1',
+    '(bill) Address 2'         => 'address2',
+    '(bill) City'              => 'city',
+    '(bill) State'             => 'state',
+    '(bill) Zip'               => 'zip',
+    '(bill) Country'           => 'country_full',
+    '(bill) Day phone'         => 'daytime', # XXX should use msgcat, but how?
+    '(bill) Night phone'       => 'night',   # XXX should use msgcat, but how?
+    '(bill) Fax number'        => 'fax',
+    '(service) Address 1'      => 'ship_address1',
+    '(service) Address 2'      => 'ship_address2',
+    '(service) City'           => 'ship_city',
+    '(service) State'          => 'ship_state',
+    '(service) Zip'            => 'ship_zip',
+    '(service) Country'        => 'ship_country_full',
+    '(service) Day phone'      => 'ship_daytime', # XXX should use msgcat, how?
+    '(service) Night phone'    => 'ship_night',   # XXX should use msgcat, how?
+    '(service) Fax number'     => 'ship_fax',
     'Invoicing email(s)'       => 'invoicing_list_emailonly_scalar',
     'Payment Type'             => 'payby',
     'Current Balance'          => 'current_balance',
   );
+  $header2method{'Cust#'} = 'display_custnum'
+    if $conf->exists('cust_main-default_agent_custid');
 
   my %header2colormethod = (
     'Cust. Status' => 'cust_statuscolor',
@@ -261,7 +283,6 @@ sub cust_header {
 
   } else {
 
-    my $conf = new FS::Conf;
     if (    $conf->exists('cust-fields')
          && $conf->config('cust-fields') =~ /^([\w\. \|\#\(\)]+):?/
        )
@@ -278,7 +299,7 @@ sub cust_header {
   }
 
   @cust_header = split(/ \| /, $cust_fields);
-  @cust_fields = map { $header2method{$_} } @cust_header;
+  @cust_fields = map { $header2method{$_} || $_ } @cust_header;
   @cust_colors = map { exists $header2colormethod{$_}
                          ? $header2colormethod{$_}
                          : ''
@@ -311,9 +332,11 @@ sub cust_sql_fields {
 
   cust_header(@_);
   #inefficientish, but tiny lists and only run once per page
+
+  my @add_fields = qw( address1 address2 city state zip daytime night fax );
   push @fields,
     grep { my $field = $_; grep { $_ eq $field } @cust_fields }
-         qw( address1 address2 city state zip daytime night fax payby );
+         ( @add_fields, ( map "ship_$_", @add_fields ), 'payby' );
 
   my @extra_fields = ();
   if (grep { $_ eq 'current_balance' } @cust_fields) {
@@ -562,7 +585,9 @@ sub job_status {
 
   my @return;
   if ( $job && $job->status ne 'failed' ) {
-    @return = ( 'progress', $job->statustext );
+    my ($progress, $action) = split ',', $job->statustext, 2; 
+    $action ||= 'Server processing job';
+    @return = ( 'progress', $progress, $action );
   } elsif ( !$job ) { #handle job gone case : job successful
                       # so close popup, redirect parent window...
     @return = ( 'complete' );