X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUI%2FWeb.pm;h=148085c4c925e579e158b8118d1ff767e8c97ab5;hb=1642d77450f5ecf931bfe94687386583ac3b367d;hp=6386f9187dd57a6593a9d28d236f9bd234096e08;hpb=7d0b690f5684cdfdcd68d25568a101f6b088ad98;p=freeside.git

diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm
index 6386f9187..148085c4c 100644
--- a/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@ -332,9 +332,13 @@ 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' );
+
+  push @fields, 'agent_custid';
 
   my @extra_fields = ();
   if (grep { $_ eq 'current_balance' } @cust_fields) {
@@ -583,7 +587,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' );
@@ -591,6 +597,7 @@ sub job_status {
     @return = ( 'error', $job ? $job->statustext : $jobnum );
   }
 
+  #to_json(\@return);  #waiting on deb 5.0 for new JSON.pm?
   objToJson(\@return);
 
 }