or die "no agentnum for custnum $custnum";
#} elsif ( $context eq 'agent' ) {
- } elsif ( $p->{'agentnum'} =~ /^(\d+)$/ ) {
+ } elsif ( defined($p->{'agentnum'}) and $p->{'agentnum'} =~ /^(\d+)$/ ) {
$agentnum = $1;
}
$skin_info_cache_agent = {
'agentnum' => $agentnum,
( map { $_ => scalar( $conf->config($_, $agentnum) ) }
- qw( company_name ) ),
+ qw( company_name date_format ) ),
( map { $_ => scalar( $conf->config("selfservice-$_", $agentnum ) ) }
qw( body_bgcolor box_bgcolor
text_color link_color vlink_color hlink_color alink_color
$info->{'self_suspend_reason'} =
$conf->config('selfservice-self_suspend_reason', $cust_main->agentnum);
+ $info->{'edit_ticket_subject'} =
+ $conf->exists('ticket_system-selfservice_edit_subject') &&
+ $cust_main->edit_subject;
+
return { %$info,
'custnum' => $custnum,
'access_pkgnum' => $session->{'pkgnum'},
}else{
$return{'require_address2'} = '';
}
-
+
+ if ( $FS::TicketSystem::system ) {
+ warn "$me customer_info: initializing ticket system\n" if $DEBUG;
+ FS::TicketSystem->init();
+ }
+
if ( $custnum ) { #customer record
my $search = { 'custnum' => $custnum };
if $context eq 'agent'
&& $conf->exists('agent-showpasswords')
&& $_->part_svc->svcdb eq 'svc_acct';
+ $ref->{svchash} = { $_->svc_x->hash } if
+ $_->part_svc->svcdb eq 'svc_phone';
+ $ref->{svchash}->{svcpart} = $_->part_svc->svcpart
+ if $_->part_svc->svcdb eq 'svc_phone'; # hack
$ref;
} $_->cust_svc
],
'svcnum' => $session->{'svcnum'},
'custnum' => $custnum,
'date_format' => $conf->config('date_format') || '%m/%d/%Y',
+ 'view_usage_nodomain' => $conf->exists('selfservice-view_usage_nodomain'),
'svcs' => [
map {
my $svc_x = $_->svc_x;
sub _list_cdr_usage {
my($svc_phone, $begin, $end) = @_;
- map [ $_->downstream_csv('format' => 'default') ], #XXX config for format
- $svc_phone->get_cdrs( 'begin'=>$begin, 'end'=>$end, );
+ map [ $_->downstream_csv('format' => 'default', 'keeparray' => 1) ], #XXX config for format
+ $svc_phone->get_cdrs( 'begin'=>$begin, 'end'=>$end, );
}
sub list_cdr_usage {
my @bulkdid;
@bulkdid = @{$p->{'bulkdid'}} if $p->{'bulkdid'};
+ if($p->{'svcnum'} && $p->{'svcnum'} =~ /^\d+$/){
+ my($context, $session, $custnum) = _custoragent_session_custnum($p);
+ return { 'error' => $session } if $context eq 'error';
+
+ my $svc_phone = qsearchs('svc_phone', { svcnum => $p->{'svcnum'} });
+ return { 'error' => 'service not found' } unless $svc_phone;
+ return { 'error' => 'invalid svcnum' }
+ if $svc_phone && $svc_phone->cust_svc->cust_pkg->custnum != $custnum;
+
+ $svc_phone->email($p->{'email'})
+ if $svc_phone->email ne $p->{'email'} && $p->{'email'} =~ /^([\w\.\d@]+|)$/;
+ $svc_phone->forwarddst($p->{'forwarddst'})
+ if $svc_phone->forwarddst ne $p->{'forwarddst'}
+ && $p->{'forwarddst'} =~ /^(\d+|)$/;
+ return { 'error' => $svc_phone->replace };
+ }
+
# single DID LNP
unless($p->{'lnp'}) {
$p->{'lnp_desired_due_date'} = parse_datetime($p->{'lnp_desired_due_date'});
my $conf = new FS::Conf;
- return {
+ my $ret = {
'svc' => $part_svc->svc,
'svcdb' => $part_svc->svcdb,
'pkgnum' => $pkgnum,
};
+ if ($p->{'svcnum'} && $p->{'svcnum'} =~ /^\d+$/
+ && $ret->{'svcdb'} eq 'svc_phone') {
+ $ret->{'svcnum'} = $p->{'svcnum'};
+ my $svc_phone = qsearchs('svc_phone', { svcnum => $p->{'svcnum'} });
+ if ( $svc_phone && $svc_phone->cust_svc->cust_pkg->custnum == $custnum ) {
+ $ret->{'email'} = $svc_phone->email;
+ $ret->{'forwarddst'} = $svc_phone->forwarddst;
+ }
+ }
+
+ $ret;
}
sub unprovision_svc {
);
if ( ref($err_or_ticket) ) {
- warn "$me create_ticket: sucessful: ". $err_or_ticket->id. "\n"
+ warn "$me create_ticket: successful: ". $err_or_ticket->id. "\n"
if $DEBUG;
return { 'error' => '',
'ticket_id' => $err_or_ticket->id,
};
} else {
- warn "$me create_ticket: unsucessful: $err_or_ticket\n"
+ warn "$me create_ticket: unsuccessful: $err_or_ticket\n"
if $DEBUG;
return { 'error' => $err_or_ticket };
}
warn "$me get_ticket: initializing ticket system\n" if $DEBUG;
FS::TicketSystem->init();
+ return { 'error' => 'get_ticket configuration error' }
+ if $FS::TicketSystem::system ne 'RT_Internal';
+
+ # check existence and ownership as part of this
+ warn "$me get_ticket: fetching ticket\n" if $DEBUG;
+ my $rt_session = FS::TicketSystem->session('');
+ my $Ticket = FS::TicketSystem->get_ticket_object(
+ $rt_session,
+ ticket_id => $p->{'ticket_id'},
+ custnum => $custnum
+ );
+ return { 'error' => 'ticket not found' } if !$Ticket;
+
+ if ( length( $p->{'subject'} || '' ) ) {
+ # subject change
+ if ( $p->{'subject'} ne $Ticket->Subject ) {
+ my ($val, $msg) = $Ticket->SetSubject($p->{'subject'});
+ return { 'error' => "unable to set subject: $msg" } if !$val;
+ }
+ }
if(length($p->{'reply'})) {
-# currently this allows anyone to correspond on any ticket as fs_selfservice
-# probably bad...
- my @err_or_res = FS::TicketSystem->correspond_ticket(
- '', #create RT session based on FS CurrentUser (fs_selfservice)
- 'ticket_id' => $p->{'ticket_id'},
- 'content' => $p->{'reply'},
- );
-
+ my @err_or_res = FS::TicketSystem->correspond_ticket(
+ $rt_session,
+ 'ticket_id' => $p->{'ticket_id'},
+ 'content' => $p->{'reply'},
+ );
+
return { 'error' => 'unable to reply to ticket' }
- unless ( $err_or_res[0] != 0 && defined $err_or_res[2] );
+ unless ( $err_or_res[0] != 0 && defined $err_or_res[2] );
}
- warn "$me get_ticket: getting ticket\n" if $DEBUG;
+ warn "$me get_ticket: getting ticket history\n" if $DEBUG;
my $err_or_ticket = FS::TicketSystem->get_ticket(
- '', #create RT session based on FS CurrentUser (fs_selfservice)
+ $rt_session,
'ticket_id' => $p->{'ticket_id'},
);
- if ( ref($err_or_ticket) ) {
+ if ( !ref($err_or_ticket) ) { # there is no way this should ever happen
+ warn "$me get_ticket: unsuccessful: $err_or_ticket\n"
+ if $DEBUG;
+ return { 'error' => $err_or_ticket };
+ }
+
+ my @custs = @{$err_or_ticket->{'custs'}};
+ my @txns = @{$err_or_ticket->{'txns'}};
+ my @filtered_txns;
+
+ # superseded by check in get_ticket_object
+ #return { 'error' => 'invalid ticket requested' }
+ #unless grep($_ eq $custnum, @custs);
-# since we're bypassing the RT security/permissions model by always using
-# fs_selfservice as the RT user (as opposed to a requestor, which we
-# can't do since we want all tickets linked to a cust), we check below whether
-# the requested ticket was actually linked to this customer
- my @custs = @{$err_or_ticket->{'custs'}};
- my @txns = @{$err_or_ticket->{'txns'}};
- my @filtered_txns;
+ foreach my $txn ( @txns ) {
+ push @filtered_txns, $txn
+ if ($txn->{'type'} eq 'EmailRecord'
+ || $txn->{'type'} eq 'Correspond'
+ || $txn->{'type'} eq 'Create');
+ }
- return { 'error' => 'no customer' } unless ( $custnum && scalar(@custs) );
+ warn "$me get_ticket: successful: \n"
+ if $DEBUG;
+ return { 'error' => '',
+ 'transactions' => \@filtered_txns,
+ 'ticket_fields' => $err_or_ticket->{'fields'},
+ 'ticket_id' => $p->{'ticket_id'},
+ };
+}
- return { 'error' => 'invalid ticket requested' }
- unless grep($_ eq $custnum, @custs);
+sub adjust_ticket_priority {
+ my $p = shift;
+ my($context, $session, $custnum) = _custoragent_session_custnum($p);
+ return { 'error' => $session } if $context eq 'error';
+
+ warn "$me adjust_ticket_priority: initializing ticket system\n" if $DEBUG;
+ FS::TicketSystem->init;
+ my $ss_priority = FS::TicketSystem->selfservice_priority;
+
+ return { 'error' => 'adjust_ticket_priority configuration error' }
+ if $FS::TicketSystem::system ne 'RT_Internal'
+ or !$ss_priority;
- foreach my $txn ( @txns ) {
- push @filtered_txns, $txn
- if ($txn->{'type'} eq 'EmailRecord'
- || $txn->{'type'} eq 'Correspond'
- || $txn->{'type'} eq 'Create');
+ my $values = $p->{'values'}; #hashref, id => priority value
+ my %ticket_error;
+
+ foreach my $id (keys %$values) {
+ warn "$me adjust_ticket_priority: fetching ticket $id\n" if $DEBUG;
+ my $Ticket = FS::TicketSystem->get_ticket_object('',
+ 'ticket_id' => $id,
+ 'custnum' => $custnum,
+ );
+ if ( !$Ticket ) {
+ $ticket_error{$id} = 'ticket not found';
+ next;
+ }
+
+ # RT API stuff--would we gain anything by wrapping this in FS::TicketSystem?
+ # We're not going to implement it for RT_External.
+ my $old_value = $Ticket->FirstCustomFieldValue($ss_priority);
+ my $new_value = $values->{$id};
+ next if $old_value eq $new_value;
+
+ warn "$me adjust_ticket_priority: updating ticket $id\n" if $DEBUG;
+
+ # AddCustomFieldValue works fine (replacing any existing value) if it's
+ # a single-valued custom field, which it should be. If it's not, you're
+ # doing something wrong.
+ my ($val, $msg);
+ if ( length($new_value) ) {
+ ($val, $msg) = $Ticket->AddCustomFieldValue(
+ Field => $ss_priority,
+ Value => $new_value,
+ );
+ }
+ else {
+ ($val, $msg) = $Ticket->DeleteCustomFieldValue(
+ Field => $ss_priority,
+ Value => $old_value,
+ );
}
- warn "$me get_ticket: sucessful: \n"
- if $DEBUG;
- return { 'error' => '',
- 'transactions' => \@filtered_txns,
- 'ticket_id' => $p->{'ticket_id'},
- };
- } else {
- warn "$me create_ticket: unsucessful: $err_or_ticket\n"
- if $DEBUG;
- return { 'error' => $err_or_ticket };
+ $ticket_error{$id} = $msg if !$val;
+ warn "$me adjust_ticket_priority: $id: $msg\n" if $DEBUG and !$val;
}
+ return { 'error' => '',
+ 'ticket_error' => \%ticket_error,
+ %{ customer_info($p) } # send updated customer info back
+ }
}
-
#--
sub _custoragent_session_custnum {
projects / freeside.git / blobdiff