summaryrefslogtreecommitdiff
path: root/httemplate/edit
diff options
context:
space:
mode:
authorivan <ivan>2011-08-10 05:22:32 +0000
committerivan <ivan>2011-08-10 05:22:32 +0000
commit424ae31847c4fd44e6ed55ec275c8e668c7d2b51 (patch)
tree96455a553e39b85eda278a78f29d0042da26e7c5 /httemplate/edit
parent9694a17150af02e8fa3e61f732b776c5f7389874 (diff)
multiple DID provisioning, RT#13721
Diffstat (limited to 'httemplate/edit')
-rw-r--r--httemplate/edit/process/elements/process.html206
-rw-r--r--httemplate/edit/process/svc_phone.html31
-rw-r--r--httemplate/edit/svc_phone.cgi87
3 files changed, 195 insertions, 129 deletions
diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html
index f7558e8ff..24064f942 100644
--- a/httemplate/edit/process/elements/process.html
+++ b/httemplate/edit/process/elements/process.html
@@ -78,6 +78,9 @@ Example:
'agent_virt' => 1,
'agent_null_right' => 'Access Right Name',
+ #special bulk insert mode
+ 'bulk' => 'field',
+
&>
</%doc>
@@ -85,6 +88,9 @@ Example:
%
% my $edit_ext = $opt{'edit_ext'} || 'html';
% my $url = $opt{'error_redirect'} || popurl(2)."$table.$edit_ext";
+
+% #my $query = $m->scomp('/elements/create_uri_query');
+% #$cgi->redirect("$url?$query");
% if ( length($cgi->query_string) > 1920 ) { #stupid IE 2083 URL limit
%
% my $session = int(rand(4294967296)); #XXX
@@ -128,7 +134,7 @@ Example:
%
% if ( $opt{'redirect'} ) {
%
-<% $cgi->redirect( $opt{'redirect'}. $pkeyvalue ) %>
+<% $cgi->redirect( $opt{'redirect'}. $new_pkey) %>
%
% } else {
%
@@ -163,13 +169,13 @@ my $fields = $opt{'fields'}
#|| [ grep { $_ ne $pkey } dbdef->table($table)->columns ];
|| [ fields($table) ];
-my $pkeyvalue = $cgi->param($pkey);
+my $old_pkey = $cgi->param($pkey);
my $old = '';
-if ( $pkeyvalue ) {
+if ( $old_pkey ) {
$old = qsearchs({
'table' => $table,
- 'hashref' => { $pkey => $pkeyvalue },
+ 'hashref' => { $pkey => $old_pkey },
'extra_sql' => ( $opt{'agent_virt'}
? ' AND '. $curuser->agentnums_sql(
'null_right' => $opt{'agent_null_right'}
@@ -179,145 +185,163 @@ if ( $pkeyvalue ) {
});
}
+my $bfield = $opt{'bulk'};
+
my %hash =
map { my @entry = ( $_ => scalar($cgi->param($_)) );
$opt{'value_callback'} ? ( $_ => &{ $opt{'value_callback'} }( @entry ))
: ( @entry )
- } @$fields;
+ } grep { $_ ne $bfield } @$fields;
+
+my @values = ( 1 );
+if ( $bfield ) {
+ @values = $cgi->param($bfield);
+ warn join(',', @values);
+}
+
+my $new;
+my $new_pkey = '';
+foreach my $value ( @values ) {
-my $new = $class->new( \%hash );
+ $new = $class->new( \%hash );
-if ($old && exists($opt{'copy_on_empty'})) {
- foreach my $field (@{$opt{'copy_on_empty'}}) {
- $new->set($field, $old->get($field))
- unless scalar($cgi->param($field));
+ $new->$bfield($value) if $bfield;
+
+ if ($old && exists($opt{'copy_on_empty'})) {
+ foreach my $field (@{$opt{'copy_on_empty'}}) {
+ $new->set($field, $old->get($field))
+ unless scalar($cgi->param($field));
+ }
}
-}
-if ( $opt{'agent_virt'} ) {
+ if ( $opt{'agent_virt'} ) {
- if ( ! $new->agentnum
- && ( ! $opt{'agent_null_right'}
- || ! $curuser->access_right($opt{'agent_null_right'})
- )
- )
- {
+ if ( ! $new->agentnum
+ && ( ! $opt{'agent_null_right'}
+ || ! $curuser->access_right($opt{'agent_null_right'})
+ )
+ )
+ {
- $error ||= 'Select an agent';
+ $error ||= 'Select an agent';
- } else {
+ } else {
- die "illegal agentnum"
- unless $curuser->agentnums_href->{$new->agentnum}
- or $curuser->access_right('View customers of all agents')
- or $opt{'agent_null_right'}
- && ! $new->agentnum
- && $curuser->access_right($opt{'agent_null_right'});
+ die "illegal agentnum"
+ unless $curuser->agentnums_href->{$new->agentnum}
+ or $curuser->access_right('View customers of all agents')
+ or $opt{'agent_null_right'}
+ && ! $new->agentnum
+ && $curuser->access_right($opt{'agent_null_right'});
- }
+ }
-}
+ }
-$error ||= $new->check;
+ $error ||= $new->check;
-my @args = ();
-if ( !$error && $opt{'args_callback'} ) {
- @args = &{ $opt{'args_callback'} }( $cgi, $new );
-}
+ my @args = ();
+ if ( !$error && $opt{'args_callback'} ) {
+ @args = &{ $opt{'args_callback'} }( $cgi, $new );
+ }
-if ( !$error && $opt{'debug'} ) {
- warn "$me updating record in $table table using $class class\n";
- warn Dumper(\%hash);
- warn "with args: \n". Dumper(\@args) if @args;
-}
+ if ( !$error && $opt{'debug'} ) {
+ warn "$me updating record in $table table using $class class\n";
+ warn Dumper(\%hash);
+ warn "with args: \n". Dumper(\@args) if @args;
+ }
-if ( !$error ) {
- if ( $pkeyvalue ) {
- $error = $new->replace($old, @args);
- } else {
- $error = $new->insert(@args);
- $pkeyvalue = $new->getfield($pkey);
+ if ( !$error ) {
+ if ( $old_pkey ) {
+ $error = $new->replace($old, @args);
+ } else {
+ $error = $new->insert(@args);
+ $new_pkey = $new->getfield($pkey);
+ }
}
-}
-if ( !$error && $opt{'process_m2m'} ) {
+ if ( !$error && $opt{'process_m2m'} ) {
+
+ my @process_m2m = ref($opt{'process_m2m'}) eq 'ARRAY'
+ ? @{ $opt{'process_m2m'} }
+ : ( $opt{'process_m2m'} );
- my @process_m2m = ref($opt{'process_m2m'}) eq 'ARRAY'
- ? @{ $opt{'process_m2m'} }
- : ( $opt{'process_m2m'} );
+ foreach my $process_m2m (@process_m2m) {
- foreach my $process_m2m (@process_m2m) {
+ $process_m2m->{'params'} ||= scalar($cgi->Vars);
- $process_m2m->{'params'} ||= scalar($cgi->Vars);
+ warn "$me processing m2m:\n". Dumper( %$process_m2m )
+ if $opt{'debug'};
- warn "$me processing m2m:\n". Dumper( %$process_m2m )
- if $opt{'debug'};
+ $error = $new->process_m2m( %$process_m2m );
+ }
- $error = $new->process_m2m( %$process_m2m );
}
-}
+ if ( !$error && $opt{'process_m2name'} ) {
-if ( !$error && $opt{'process_m2name'} ) {
+ my @process_m2name = ref($opt{'process_m2name'}) eq 'ARRAY'
+ ? @{ $opt{'process_m2name'} }
+ : ( $opt{'process_m2name'} );
- my @process_m2name = ref($opt{'process_m2name'}) eq 'ARRAY'
- ? @{ $opt{'process_m2name'} }
- : ( $opt{'process_m2name'} );
+ foreach my $process_m2name (@process_m2name) {
- foreach my $process_m2name (@process_m2name) {
+ if ( $opt{'debug'} ) {
+ warn "$me processing m2name:\n". Dumper( %{ $process_m2name },
+ 'params' => scalar($cgi->Vars),
+ );
+ }
- if ( $opt{'debug'} ) {
- warn "$me processing m2name:\n". Dumper( %{ $process_m2name },
- 'params' => scalar($cgi->Vars),
- );
+ $error = $new->process_m2name( %{ $process_m2name },
+ 'params' => scalar($cgi->Vars),
+ );
}
- $error = $new->process_m2name( %{ $process_m2name },
- 'params' => scalar($cgi->Vars),
- );
}
-}
+ if ( !$error && $opt{'process_o2m'} ) {
-if ( !$error && $opt{'process_o2m'} ) {
+ my @process_o2m = ref($opt{'process_o2m'}) eq 'ARRAY'
+ ? @{ $opt{'process_o2m'} }
+ : ( $opt{'process_o2m'} );
- my @process_o2m = ref($opt{'process_o2m'}) eq 'ARRAY'
- ? @{ $opt{'process_o2m'} }
- : ( $opt{'process_o2m'} );
+ foreach my $process_o2m (@process_o2m) {
- foreach my $process_o2m (@process_o2m) {
+ if ( $opt{'debug'} ) {
+ warn "$me processing o2m:\n". Dumper( %{ $process_o2m },
+ 'params' => scalar($cgi->Vars),
+ );
+ }
- if ( $opt{'debug'} ) {
- warn "$me processing o2m:\n". Dumper( %{ $process_o2m },
- 'params' => scalar($cgi->Vars),
- );
+ $error = $new->process_o2m( %{ $process_o2m },
+ 'params' => scalar($cgi->Vars),
+ );
}
- $error = $new->process_o2m( %{ $process_o2m },
- 'params' => scalar($cgi->Vars),
- );
}
-}
-
-if ( $error ) {
+ if ( $error ) {
- $cgi->param('error', $error);
- if ( $opt{'clear_on_error'} && scalar(@{$opt{'clear_on_error'}}) ) {
- foreach my $field (@{$opt{'clear_on_error'}}) {
- $cgi->param($field, '')
+ $cgi->param('error', $error);
+ if ( $opt{'clear_on_error'} && scalar(@{$opt{'clear_on_error'}}) ) {
+ foreach my $field (@{$opt{'clear_on_error'}}) {
+ $cgi->param($field, '')
+ }
}
- }
-} else {
+ } else {
+
+ if ( $opt{'noerror_callback'} ) {
+ &{ $opt{'noerror_callback'} }( $cgi, $new );
+ }
- if ( $opt{'noerror_callback'} ) {
- &{ $opt{'noerror_callback'} }( $cgi, $new );
}
+ last if $error;
+
}
</%init>
diff --git a/httemplate/edit/process/svc_phone.html b/httemplate/edit/process/svc_phone.html
index 9dd1226cc..7a3b43d32 100644
--- a/httemplate/edit/process/svc_phone.html
+++ b/httemplate/edit/process/svc_phone.html
@@ -1,13 +1,32 @@
-<% include( 'elements/svc_Common.html',
- 'table' => 'svc_phone',
- 'args_callback' => $args_callback,
+<& elements/svc_Common.html,
+ 'table' => 'svc_phone',
+ 'args_callback' => $args_callback,
'value_callback' => $value_callback,
- )
-%>
+ %opt,
+&>
<%init>
+my %opt = ();
+if ( $cgi->param('bulk') ) {
+ $opt{'bulk'} = 'phonenum';
+
+ my $cust_pkg = qsearchs('cust_pkg', { pkgnum=>scalar($cgi->param('pkgnum')) })
+ or die "unknown pkgnum";
+ my $custnum = $cust_pkg->custnum;
+
+ my $show =
+ $FS::CurrentUser::CurrentUser->default_customer_view =~ /^(jumbo|packages)$/
+ ? ''
+ : ';show=packages';
+ #my $frag = "cust_pkg$pkgnum"; #hack for IE ignoring real #fragment
+ $opt{'redirect'}= popurl(3)."view/cust_main.cgi?custnum=$custnum$show;dummy=";
+}
+
+my $right = $opt{'bulk'} ? 'Bulk provision customer service'
+ : 'Provision customer service';
+
die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('Provision customer service'); #something else more specific?
+ unless $FS::CurrentUser::CurrentUser->access_right($right);
my $tollfreephonenum = $cgi->param('tollfreephonenum');
$cgi->param('phonenum',$tollfreephonenum) if $tollfreephonenum =~ /^\d+$/;
diff --git a/httemplate/edit/svc_phone.cgi b/httemplate/edit/svc_phone.cgi
index 2c19d2cd9..9647b6887 100644
--- a/httemplate/edit/svc_phone.cgi
+++ b/httemplate/edit/svc_phone.cgi
@@ -1,36 +1,56 @@
-<% include( 'elements/svc_Common.html',
- 'table' => 'svc_phone',
- 'fields' => \@fields,
- 'svc_new_callback' => sub {
- my( $cgi, $svc_x, $part_svc, $cust_pkg, $fields, $opt ) = @_;
- $svc_x->locationnum($cust_pkg->locationnum) if $cust_pkg;
- },
- )
-%>
+<& elements/svc_Common.html,
+ 'table' => 'svc_phone',
+ 'fields' => [],
+ 'begin_callback' => $begin_callback,
+ 'svc_new_callback' => sub {
+ my( $cgi, $svc_x, $part_svc, $cust_pkg, $fields, $opt ) = @_;
+ $svc_x->locationnum($cust_pkg->locationnum) if $cust_pkg;
+ },
+&>
<%init>
-die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('Provision customer service'); #something else more specific?
+my $begin_callback = sub {
+ my( $cgi, $fields, $opt ) = @_;
-my $conf = new FS::Conf;
+ my $bulk = $cgi->param('bulk') ? 1 : 0;
-my @fields = ( 'countrycode',
- { field => 'phonenum',
- type => 'select-did',
- label => 'Phone number',
- },
- );
+ my $right = $bulk ? 'Bulk provision customer service'
+ : 'Provision customer service';
-push @fields, { field => 'domsvc',
- type => 'select-svc-domain',
- label => 'Domain',
- }
- if $conf->exists('svc_phone-domain');
+ die "access denied"
+ unless $FS::CurrentUser::CurrentUser->access_right($right);
-push @fields, { field => 'pbxsvc',
- type => 'select-svc_pbx',
- label => 'PBX',
- },
+ my $conf = new FS::Conf;
+
+ push @$fields,
+ 'countrycode',
+ { field => 'phonenum',
+ type => 'select-did',
+ label => 'Phone number',
+ multiple => $bulk,
+ };
+
+ push @$fields, { field => 'domsvc',
+ type => 'select-svc-domain',
+ label => 'Domain',
+ }
+ if $conf->exists('svc_phone-domain');
+
+ push @$fields, { field => 'pbxsvc',
+ type => 'select-svc_pbx',
+ label => 'PBX',
+ };
+
+ if ( $bulk ) {
+
+ push @$fields, { field => 'bulk',
+ type => 'hidden',
+ value => '1',
+ };
+
+ } else {
+
+ push @$fields,
'sip_password',
'pin',
{ field => 'phone_name',
@@ -62,10 +82,11 @@ push @fields, { field => 'pbxsvc',
},
},
{ field => 'custnum', type=> 'hidden' }, #for new cust_locations
-;
+ ;
+ }
-if ( $conf->exists('svc_phone-lnp') ) {
- push @fields,
+ if ( $conf->exists('svc_phone-lnp') && !$bulk ) {
+ push @$fields,
{ value => 'Number Portability',
type => 'tablebreak-tr-title',
colspan => 8,
@@ -87,7 +108,9 @@ if ( $conf->exists('svc_phone-lnp') ) {
},
'lnp_other_provider',
'lnp_other_provider_account',
-;
-}
+ ;
+ }
+
+};
</%init>