projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was generated by cvs2svn to compensate for changes in r8593,
[freeside.git]
/
FS
/
FS
/
UI
/
Web.pm
diff --git
a/FS/FS/UI/Web.pm
b/FS/FS/UI/Web.pm
index
6386f91
..
148085c
100644
(file)
--- 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
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 }
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) {
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' ) {
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' );
} 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 );
}
@return = ( 'error', $job ? $job->statustext : $jobnum );
}
+ #to_json(\@return); #waiting on deb 5.0 for new JSON.pm?
objToJson(\@return);
}
objToJson(\@return);
}