use strict;
use vars qw($DEBUG @ISA @EXPORT_OK $me);
use Exporter;
+use Carp qw( confess );;
use FS::Conf;
use FS::Misc::DateTime qw( parse_datetime );
use FS::Record qw(dbdef);
sub svc_label_link {
my($m, $part_svc, $cust_svc) = @_ or return '';
- svc_X_link( ($cust_svc->label)[1], @_ );
+ my($svc, $label, $svcdb) = $cust_svc->label;
+ svc_X_link( $label, @_ );
}
sub svc_X_link {
return $x
unless $FS::CurrentUser::CurrentUser->access_right('View customer services');
+ confess "svc_X_link called without a service ($x, $m, $part_svc, $cust_svc)\n"
+ unless $cust_svc;
+
my $ahref = svc_url(
'ahref' => 1,
'm' => $m,
use FS::UID qw(getotaker);
use FS::Record qw(qsearchs);
use FS::queue;
+use FS::CGI qw(rooturl);
$DEBUG = 0;
}
}
$param{CurrentUser} = getotaker();
+ $param{RootURL} = rooturl($self->{cgi}->self_url);
warn "FS::UI::Web::start_job\n".
join('', map {
if ( ref($param{$_}) ) {
}
my @return;
- if ( $job && $job->status ne 'failed' ) {
+ if ( $job && $job->status ne 'failed' && $job->status ne 'done' ) {
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->status eq 'done' ) {
+ @return = ( 'done', $job->statustext, '' );
} else {
@return = ( 'error', $job ? $job->statustext : $jobnum );
}