- added agent/taxclass/card type-specific gateway overrides for people with
multiple payment gateways for different resellers, taxclasses and/or card
types
-- re-did billing section of customer edit and added switch/solo support
+- re-did billing section of customer edit and added maestro/switch/solo support
- add cpanel export
- added prepaid packages that set the RADIUS "Expiration" attribute and
auto-suspend on their next bill date
- redo account view and edit pages, add ability to edit uid/gid if conf options
for it are turned on
- redo quick payment entry page with ajax magic
+- explicit payment types for cash and (optionally) western union
+- bulk svcpart change
package FS::UI::Web::JSRPC;
use strict;
-use vars qw(@ISA $DEBUG);
+use vars qw($DEBUG);
use Storable qw(nfreeze);
use MIME::Base64;
-#use JavaScript::RPC::Server::CGI;
+use JSON;
use FS::UID;
use FS::Record qw(qsearchs);
use FS::queue;
-#@ISA = qw( JavaScript::RPC::Server::CGI );
-$DEBUG = 0;
+$DEBUG = 1;
sub new {
my $class = shift;
bless $self, $class;
+ die "CGI object required as second argument" unless $self->{'cgi'};
+
return $self;
}
@return = ( 'error', $job ? $job->statustext : $jobnum );
}
- #join("\n",@return);
-
- #XXX should use JSON!
- @return = map {
- s/\\/\\\\/g;
- s/\n/\\n/g;
- s/"/\"/g;
- $_
- } @return;
-
- '[ '. join(', ', map { qq("$_") } @return). " ]\n";
+ objToJson(\@return);
}
-#sub get_new_query {
-# FS::UID::cgi();
-#}
-
1;
@ISA = qw(FS::Record);
-$DEBUG = 0;
+$DEBUG = 1;
=head1 NAME
grep $_->can('usage_sessions'), $self->part_export;
}
-=item cust_svc
+=item cust_svc [ PKGPART ]
-Returns a list of associated FS::cust_svc records.
+Returns a list of associated customer services (FS::cust_svc records).
+
+If a PKGPART is specified, returns the customer services which are contained
+within packages of that type (see L<FS::part_pkg>). If PKGPARTis specified as
+B<0>, returns unlinked customer services.
=cut
sub cust_svc {
my $self = shift;
- qsearch('cust_svc', { 'svcpart' => $self->svcpart } );
+
+ my $hashref = { 'svcpart' => $self->svcpart };
+
+ my( $addl_from, $extra_sql ) = ( '', '' );
+ if ( @_ ) {
+ my $pkgpart = shift;
+ if ( $pkgpart =~ /^(\d+)$/ ) {
+ $addl_from = 'LEFT JOIN cust_pkg USING ( pkgnum )';
+ $extra_sql = "AND pkgpart = $1";
+ } elsif ( $pkgpart eq '0' ) {
+ $hashref->{'pkgnum'} = '';
+ }
+ }
+
+ qsearch({
+ 'table' => 'cust_svc',
+ 'addl_from' => $addl_from,
+ 'hashref' => $hashref,
+ 'extra_sql' => $extra_sql,
+ });
+}
+
+=item num_cust_svc [ PKGPART ]
+
+Returns the number of associated customer services (FS::cust_svc records).
+
+If a PKGPART is specified, returns the number of customer services which are
+contained within packages of that type (see L<FS::part_pkg>). If PKGPART
+is specified as B<0>, returns the number of unlinked customer services.
+
+=cut
+
+sub num_cust_svc {
+ my $self = shift;
+
+ my @param = ( $self->svcpart );
+
+ my( $join, $and ) = ( '', '' );
+ if ( @_ ) {
+ my $pkgpart = shift;
+ if ( $pkgpart ) {
+ $join = 'LEFT JOIN cust_pkg USING ( pkgnum )';
+ $and = 'AND pkgpart = ?';
+ push @param, $pkgpart;
+ } elsif ( $pkgpart eq '0' ) {
+ $and = 'AND pkgnum IS NULL';
+ }
+ }
+
+ my $sth = dbh->prepare(
+ "SELECT COUNT(*) FROM cust_svc $join WHERE svcpart = ? $and"
+ ) or die dbh->errstr;
+ $sth->execute(@param)
+ or die $sth->errstr;
+ $sth->fetchrow_arrayref->[0];
}
=item svc_x
map { $_->svc_x } $self->cust_svc;
}
+
=back
=head1 SUBROUTINES
=item process
-Experimental job-queue processor for web interface adds/edits
+Job-queue processor for web interface adds/edits
=cut
die $error if $error;
}
+=item process_bulk_cust_svc
+
+Job-queue processor for web interface bulk customer service changes
+
+=cut
+
+use Storable qw(thaw);
+use Data::Dumper;
+use MIME::Base64;
+sub process_bulk_cust_svc {
+ my $job = shift;
+
+ my $param = thaw(decode_base64(shift));
+ warn Dumper($param) if $DEBUG;
+
+ my $old_part_svc =
+ qsearchs('part_svc', { 'svcpart' => $param->{'old_svcpart'} } );
+
+ die "Must select a new service definition\n" unless $param->{'new_svcpart'};
+
+ #the rest should be abstracted out to to its own subroutine?
+
+ local $SIG{HUP} = 'IGNORE';
+ local $SIG{INT} = 'IGNORE';
+ local $SIG{QUIT} = 'IGNORE';
+ local $SIG{TERM} = 'IGNORE';
+ local $SIG{TSTP} = 'IGNORE';
+ local $SIG{PIPE} = 'IGNORE';
+
+ my $oldAutoCommit = $FS::UID::AutoCommit;
+ local $FS::UID::AutoCommit = 0;
+ my $dbh = dbh;
+
+ local( $FS::cust_svc::ignore_quantity ) = 1;
+
+ my $total = $old_part_svc->num_cust_svc( $param->{'pkgpart'} );
+
+ my $n = 0;
+ foreach my $old_cust_svc ( $old_part_svc->cust_svc( $param->{'pkgpart'} ) ) {
+
+ my $new_cust_svc = new FS::cust_svc { $old_cust_svc->hash };
+
+ $new_cust_svc->svcpart( $param->{'new_svcpart'} );
+ my $error = $new_cust_svc->replace($old_cust_svc);
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ die "$error\n" if $error;
+ }
+
+ $error = $job->update_statustext( int( 100 * ++$n / $total ) );
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ die $error if $error;
+ }
+
+ }
+
+ $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+ '';
+
+}
+
=head1 BUGS
Delete is unimplemented.
The list of svc_* tables is hardcoded. When svc_acct_pop is renamed, this
should be fixed.
-all_part_svc_column method should be documented
+all_part_svc_column methods should be documented
=head1 SEE ALSO
-<!-- mason kludge -->
<%
+my %flag = (
+ 'D' => 'Default',
+ 'F' => 'Fixed',
+ '' => '',
+);
+
my %search;
if ( $cgi->param('showdisabled') ) {
%search = ();
qsearch('part_svc', \%search );
my $total = scalar(@part_svc);
-my %num_active_cust_svc = ();
-if ( $cgi->param('active') ) {
- my $active_sth = dbh->prepare(
- 'SELECT COUNT(*) FROM cust_svc WHERE svcpart = ?'
- ) or die dbh->errstr;
- foreach my $part_svc ( @part_svc ) {
- $active_sth->execute($part_svc->svcpart) or die $active_sth->errstr;
- $num_active_cust_svc{$part_svc->svcpart} =
- $active_sth->fetchrow_arrayref->[0];
- }
+my %num_active_cust_svc = map { $_->svcpart => $_->num_cust_svc } @part_svc;
+
+if ( $cgi->param('orderby') eq 'active' ) {
@part_svc = sort { $num_active_cust_svc{$b->svcpart} <=>
$num_active_cust_svc{$a->svcpart} } @part_svc;
+} elsif ( $cgi->param('orderby') eq 'svc' ) {
+ @part_svc = sort { lc($a->svc) cmp lc($b->svc) } @part_svc;
}
%>
: do { $cgi->param('showdisabled', 1);
'( <a href="'. $cgi->self_url. '">show disabled services</a> )'; }
%>
+<% $cgi->param('showdisabled', ( 1 ^ $cgi->param('showdisabled') ) ); %>
<%= table() %>
<TR>
- <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Service</TH>
+ <TH><A HREF="<%= do { $cgi->param('orderby', 'svcpart'); $cgi->self_url } %>">#</A></TH>
+ <% if ( $cgi->param('showdisabled') ) { %>
+ <TH>Status</TH>
+ <% } %>
+ <TH><A HREF="<%= do { $cgi->param('orderby', 'svc'); $cgi->self_url; } %>">Service</A></TH>
<TH>Table</TH>
-<% if ( $cgi->param('active') ) { %>
- <TH><FONT SIZE=-1>Customer<BR>Services</FONT></TH>
-<% } %>
+ <TH><A HREF="<%= do { $cgi->param('orderby', 'active'); $cgi->self_url; } %>"><FONT SIZE=-1>Customer<BR>Services</FONT></A></TH>
<TH>Export</TH>
<TH>Field</TH>
<TH COLSPAN=2>Modifier</TH>
</TR>
<% foreach my $part_svc ( @part_svc ) {
- my $hashref = $part_svc->hashref;
- my $svcdb = $hashref->{svcdb};
+ my $svcdb = $part_svc->svcdb;
my $svc_x = "FS::$svcdb"->new( { svcpart => $part_svc->svcpart } );
my @dfields = $svc_x->fields;
push @dfields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
or $_ ne 'svcnum' && $part_svc->part_svc_column($_)->columnflag }
@dfields ;
my $rowspan = scalar(@fields) || 1;
- my $url = "${p}edit/part_svc.cgi?$hashref->{svcpart}";
+ my $url = "${p}edit/part_svc.cgi?". $part_svc->svcpart;
%>
<TR>
<TD ROWSPAN=<%= $rowspan %>><A HREF="<%= $url %>">
- <%= $hashref->{svcpart} %></A></TD>
-<% unless ( $cgi->param('showdisabled') ) { %>
+ <%= $part_svc->svcpart %></A></TD>
+<% if ( $cgi->param('showdisabled') ) { %>
<TD ROWSPAN=<%= $rowspan %>>
- <%= $hashref->{disabled} ? 'DISABLED' : '' %></TD>
+ <%= $part_svc->disabled
+ ? '<FONT COLOR="#FF0000"><B>Disabled</B></FONT>'
+ : '<FONT COLOR="#00CC00"><B>Enabled</B></FONT>'
+ %>
+ </TD>
<% } %>
<TD ROWSPAN=<%= $rowspan %>><A HREF="<%= $url %>">
- <%= $hashref->{svc} %></A></TD>
+ <%= $part_svc->svc %></A></TD>
<TD ROWSPAN=<%= $rowspan %>>
- <%= $hashref->{svcdb} %></TD>
-<% if ( $cgi->param('active') ) { %>
+ <%= $svcdb %></TD>
<TD ROWSPAN=<%= $rowspan %>>
- <FONT COLOR="#00CC00"><B><%= $num_active_cust_svc{$hashref->{svcpart}} %></B></FONT> <A HREF="<%=$p%>search/<%= $hashref->{svcdb} %>.cgi?svcpart=<%= $hashref->{svcpart} %>">active</A>
+ <FONT COLOR="#00CC00"><B><%= $num_active_cust_svc{$part_svc->svcpart} %></B></FONT> <A HREF="<%=$p%>search/<%= $svcdb %>.cgi?svcpart=<%= $part_svc->svcpart %>">active</A>
+ <% if ( $num_active_cust_svc{$part_svc->svcpart} ) { %>
+ <BR><FONT SIZE="-1">[ <A HREF="<%=$p%>edit/bulk-cust_svc.html?svcpart=<%= $part_svc->svcpart %>">change</A> ]</FONT>
+ <% } %>
</TD>
-<% } %>
<TD ROWSPAN=<%= $rowspan %>><%= itable() %>
<%
# my @part_export =
foreach my $field ( @fields ) {
my $flag = $part_svc->part_svc_column($field)->columnflag;
%>
- <%= $n1 %><TD><%= $field %></TD><TD>
+ <%= $n1 %>
+ <TD><%= $field %></TD>
+ <TD><%= $flag{$flag} %></TD>
+ <TD><%= $part_svc->part_svc_column($field)->columnvalue%></TD>
-<% if ( $flag eq "D" ) { print "Default"; }
- elsif ( $flag eq "F" ) { print "Fixed"; }
- elsif ( not $flag ) { }
- else { print "(Unknown!)"; }
-%>
- </TD><TD><%= $part_svc->part_svc_column($field)->columnvalue%></TD>
<% $n1="</TR><TR>";
}
%>
--- /dev/null
+<%= header( 'Bulk customer service change',
+ menubar(
+ 'Main Menu' => $p,
+ ),
+ )
+%>
+
+<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
+
+<%= include('/elements/progress-init.html',
+ 'OneTrueForm',
+ [qw( old_svcpart new_svcpart pkgpart )],
+ 'process/bulk-cust_svc.cgi',
+ $p.'browse/part_svc.cgi',
+ )
+%>
+
+<FORM NAME="OneTrueForm">
+
+<%
+ $cgi->param('svcpart') =~ /^(\d+)$/
+ or die "illegal svcpart: ". $cgi->param('svcpart');
+
+ my $old_svcpart = $1;
+ my $src_part_svc = qsearchs('part_svc', { 'svcpart' => $old_svcpart } )
+ or die "unknown svcpart: $old_svcpart";
+%>
+
+<INPUT NAME="old_svcpart" TYPE="hidden" VALUE="<%= $old_svcpart %>">
+Change <!-- customer
+<B><%= $src_part_svc->svcpart %>: <%= $src_part_svc->svc %></B> services
+<BR>
+-->
+
+<SELECT NAME="pkgpart">
+
+<% my $num_cust_svc = $src_part_svc->num_cust_svc; %>
+<% if ( $num_cust_svc > 1 ) { %>
+ <OPTION VALUE="">all <%= $num_cust_svc %> <%= $src_part_svc->svc %> services
+<% } else { %>
+ <OPTION VALUE="">the <%= $num_cust_svc %> <%= $src_part_svc->svc %> service
+<% } %>
+
+<%
+ my $num_unlinked = $src_part_svc->num_cust_svc(0);
+ if ( $num_unlinked ) {
+%>
+ <OPTION VALUE="0">the <%= $num_unlinked %> unlinked <%= $src_part_svc->svc %> services
+
+<% } %>
+
+<% foreach my $schwartz (
+ grep { $_->[1] }
+ map { [ $_, $src_part_svc->num_cust_svc($_->pkgpart) ] }
+ qsearch('part_pkg', {} )
+ ) {
+ my( $part_pkg, $num_cust_svc ) = @$schwartz;
+%>
+ <OPTION VALUE="<%= $part_pkg->pkgpart %>">the <%= $num_cust_svc %>
+ <%= $src_part_svc->svc %> service<%= $num_cust_svc > 1 ? 's in' : ' in a' %>
+ <%= $part_pkg->pkg %> package<%= $num_cust_svc > 1 ? 's' : '' %>
+<% } %>
+</SELECT>
+<BR>
+
+to new service definition
+<SELECT NAME="new_svcpart">
+<% foreach my $dest_part_svc (
+ grep { $_->svcpart != $old_svcpart
+ && $_->svcdb eq $src_part_svc->svcdb
+ }
+ qsearch('part_svc', { 'disabled' => '' } )
+ ) {
+%>
+ <OPTION VALUE="<%= $dest_part_svc->svcpart %>"><%= $dest_part_svc->svcpart %>: <%= $dest_part_svc->svc %>
+
+<% } %>
+</SELECT>
+<BR>
+
+<BR>
+
+<SCRIPT TYPE="text/javascript">
+var confirm_change = '<P ALIGN="center"><B>Bulk customer service change - Are you sure?</B><BR><P ALIGN="CENTER" <INPUT TYPE="button" VALUE="Yes, make changes" onClick="process();"> <INPUT TYPE="BUTTON" VALUE="Cancel" onClick="cClick()">';
+</SCRIPT>
+
+<INPUT TYPE="button" VALUE="Bulk change customer services" onClick="overlib(confirm_change, CAPTION, 'Confirm bulk customer service change', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, 128, TEXTSIZE, 3, BGCOLOR, '#ff0000', CGCOLOR, '#ff0000' );">
+
+</FORM>
+
+</BODY>
+</HTML>
+
+
+
--- /dev/null
+<%
+ my $server = new FS::UI::Web::JSRPC 'FS::part_svc::process_bulk_cust_svc', $cgi;
+%><%= $server->process %>
<LI><A HREF="search/cust_pkg_report.cgi">packages (by next bill date range)</A>
</UL>
<A HREF="browse/part_pkg.cgi?active=1">Package definitions (by number of active packages)</A><BR><BR>
- <A HREF="browse/part_svc.cgi?active=1">Service definitions (by number of active services)</A><BR><BR>
+ <A HREF="browse/part_svc.cgi?orderby=active">Service definitions (by number of active services)</A><BR><BR>
Customers
<UL>
<LI><A HREF="search/cust_main-otaker.cgi">Search customers by ordering employee</A>
projects / freeside.git / commitdiff