diff options
Diffstat (limited to 'FS/FS/UI/Web.pm')
| -rw-r--r-- | FS/FS/UI/Web.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm index 3c52ca5..148085c 100644 --- a/FS/FS/UI/Web.pm +++ b/FS/FS/UI/Web.pm @@ -338,6 +338,8 @@ sub cust_sql_fields { grep { my $field = $_; grep { $_ eq $field } @cust_fields } ( @add_fields, ( map "ship_$_", @add_fields ), 'payby' ); + push @fields, 'agent_custid'; + my @extra_fields = (); if (grep { $_ eq 'current_balance' } @cust_fields) { push @extra_fields, FS::cust_main->balance_sql . " AS current_balance"; @@ -585,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' ); @@ -593,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); } |