new package editor

2 files changed, 163 insertions, 119 deletions

diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html
index d29ffcfe5..7964dfa82 100644
--- a/httemplate/edit/process/elements/process.html
+++ b/httemplate/edit/process/elements/process.html
@@ -32,8 +32,13 @@ Example:
 
    'clear_on_error' => [ 'form_field1', 'form_field2', ... ],
 
+                    #pass an arrayref of hashrefs for multiple m2ms or m2names
+
    'process_m2m' => { 'link_table'   => 'link_table_name',
                       'target_table' => 'target_table_name',
+                      #optional (see m2m_Common::process_m2m), if not specified
+                      # all CGI params will be passed)
+                      'params'       => 
                     },
    'process_m2name' => { 'link_table'   => 'link_table_name',
                          'link_static' => { 'column' => 'value' },
@@ -49,6 +54,10 @@ Example:
 
                        },
 
+   #checks CGI params and whatever else before much else runs
+   #return an error string or empty for no error
+   'precheck_callback' => sub { my( $cgi ) = @_; },
+
    #supplies arguments to insert() and replace()
    # for use with tables that are FS::option_Common
    'args_callback' => sub { my( $cgi, $object ) = @_; },
@@ -107,8 +116,8 @@ Example:
 <% $cgi->redirect( $opt{'redirect'}. $pkeyvalue ) %>
 %
 %} else { 
-%
-<% $cgi->redirect( popurl(3). ($opt{viewall_dir}||'search'). "/$table.html" ) %>
+%  my $ext = $opt{'viewall_ext'} || 'html';
+<% $cgi->redirect( popurl(3). ($opt{viewall_dir}||'search'). "/$table.$ext" ) %>
 %}
 <%once>
 
@@ -121,6 +130,11 @@ my(%opt) = @_;
 
 my $curuser = $FS::CurrentUser::CurrentUser;
 
+my $error = '';
+if ( $opt{'precheck_callback'} ) {
+  $error = &{ $opt{'precheck_callback'} }( $cgi );
+}
+
 #false laziness w/edit.html
 my $table = $opt{'table'};
 my $class = "FS::$table";
@@ -146,7 +160,7 @@ if ( $pkeyvalue ) {
 }
 
 my %hash =
-  map { my @entry = ( $_ => $cgi->param($_) );
+  map { my @entry = ( $_ => scalar($cgi->param($_)) );
         $opt{'value_callback'} ? ( $_ => &{ $opt{'value_callback'} }( @entry ))
                                : ( @entry )
       } @$fields;
@@ -168,7 +182,7 @@ if ($old && exists($opt{'copy_on_empty'})) {
   }
 }
 
-my $error = $new->check;
+$error ||= $new->check;
 
 my @args = ();
 if ( !$error && $opt{'args_callback'} ) {
@@ -192,28 +206,42 @@ if ( !$error ) {
 
 if ( !$error && $opt{'process_m2m'} ) {
 
-  if ( $opt{'debug'} ) {
-    warn "$me processing m2m:\n". Dumper( %{ $opt{'process_m2m'} },
-                                          'params' => scalar($cgi->Vars),
-                                        );
+  my @process_m2m = ref($opt{'process_m2m'}) eq 'ARRAY'
+                      ? @{ $opt{'process_m2m'} }
+                      :  ( $opt{'process_m2m'} );
+
+  foreach my $process_m2m (@process_m2m) {
+
+    $process_m2m->{'params'} ||= scalar($cgi->Vars);
+
+    warn "$me processing m2m:\n". Dumper( %$process_m2m )
+      if $opt{'debug'};
+
+    $error = $new->process_m2m( %$process_m2m );
   }
 
-  $error = $new->process_m2m( %{ $opt{'process_m2m'} },
-                              'params' => scalar($cgi->Vars),
-                            );
 }
 
 if ( !$error && $opt{'process_m2name'} ) {
 
-  if ( $opt{'debug'} ) {
-    warn "$me processing m2name:\n". Dumper( %{ $opt{'process_m2name'} },
-                                             'params' => scalar($cgi->Vars),
-                                           );
+  my @process_m2name = ref($opt{'process_m2name'}) eq 'ARRAY'
+                         ? @{ $opt{'process_m2name'} }
+                         :  ( $opt{'process_m2name'} );
+
+
+  foreach my $process_m2name (@process_m2name) {
+
+    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( %{ $opt{'process_m2name'} },
-                                 'params' => scalar($cgi->Vars),
-                               );
 }
 
 
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 94bff0fbb..be6e2f85b 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,124 +1,140 @@
-%if ( $error ) {
-%  $dbh->rollback if $oldAutoCommit;
-%  $cgi->param('error', $error );
-<% $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string ) %>
-%} elsif ( $custnum )  {
-%  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-<% $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum") %>
-%} else {
-%  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-<% $cgi->redirect(popurl(3). "browse/part_pkg.cgi") %>
-%}
+<% include( 'elements/process.html',
+              #'debug'             => 1,
+              'table'             => 'part_pkg',
+              'viewall_dir'       => 'browse',
+              'viewall_ext'       => 'cgi',
+              'edit_ext'          => 'cgi',
+              #XXX usable with cloning? #'agent_null_right'  => 'Edit global package definitions',
+              'precheck_callback' => $precheck_callback,
+              'args_callback'     => $args_callback,
+              'process_m2m'       => \@process_m2m,
+              'debug' => 1,
+          )
+%>
 <%init>
 
-my $dbh = dbh;
-my $conf = new FS::Conf;
+my $curuser = $FS::CurrentUser::CurrentUser;
 
-my $pkgpart = $cgi->param('pkgpart');
-
-my $old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
-
-tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() };
-my $href = $plans{$cgi->param('plan')}->{'fields'};
-
-#fixup plandata
-my $error;
-my $plandata = $cgi->param('plandata');
-my @plandata = split(',', $plandata);
-$cgi->param('plandata', 
-  join('', map { my $parser = sub { shift };
-                 $parser = $href->{$_}{parse} if exists($href->{$_}{parse});
-                 my $value = join(', ', &$parser($cgi->param($_)));
-                 my $check = $href->{$_}{check};
-                 if ( $check && ! &$check($value) ) {
-                   $value = join(', ', $cgi->param($_));
-                   $error ||= "Illegal ". ($href->{$_}{name}||$_). ": $value";
-                 }
-                 "$_=$value\n";
-               } @plandata )
-);
+die "access denied"
+  unless $curuser->access_right('Edit package definitions')
+      || $curuser->access_right('Edit global package definitions')
+      || ( ! $cgi->param('pkgpart') && $cgi->param('pkgnum') && $curuser->access_right('Customize customer package') );
 
-foreach (qw( setuptax recurtax disabled )) {
-  $cgi->param($_, '') unless defined $cgi->param($_);
-}
+my $precheck_callback = sub {
+  my( $cgi ) = @_;
 
-my @agents;
-foreach ($cgi->param('agent_type')) {
-  /^(\d+)$/;
-  push @agents, $1 if $1;
-}
-$error = "At least one agent type must be specified."
-  unless( scalar(@agents) ||
-          $cgi->param('clone') && $cgi->param('clone') =~ /^\d+$/ ||
-          !$pkgpart && $conf->exists('agent-defaultpkg')
-        );
+  my $conf = new FS::Conf;
 
-$cgi->param('tax_override') =~ /^([\d,]+)$/;
-my (@tax_overrides) = (grep "$_", split (",", $1));
+  foreach (qw( setuptax recurtax disabled )) {
+    $cgi->param($_, '') unless defined $cgi->param($_);
+  }
 
-my $new = new FS::part_pkg ( {
-  map {
-    $_ => scalar($cgi->param($_));
-  } fields('part_pkg')
-} );
+  return 'Must select a tax class'
+    if $cgi->param('taxclass') eq '(select)';
 
-my $oldAutoCommit = $FS::UID::AutoCommit;
-local $FS::UID::AutoCommit = 0;
+  my @agents = ();
+  foreach ($cgi->param('agent_type')) {
+    /^(\d+)$/;
+    push @agents, $1 if $1;
+  }
+  return "At least one agent type must be specified."
+    unless( scalar(@agents) ||
+            $cgi->param('clone') && $cgi->param('clone') =~ /^\d+$/ ||
+            !$cgi->param('pkgpart') && $conf->exists('agent-defaultpkg')
+          );
 
-my %pkg_svc = map { $_ => scalar($cgi->param("pkg_svc$_")) }
-              map { $_->svcpart }
-              qsearch('part_svc', {} );
+  return '';
 
-my $curuser = $FS::CurrentUser::CurrentUser;
+};
 
 my $custnum = '';
-if ( $error ) {
-
- # fall through
-
-} elsif ( $cgi->param('taxclass') eq '(select)' ) {
 
-  $error = 'Must select a tax class';
+my $args_callback = sub {
+  my( $cgi, $new ) = @_;
+  
+  my @args = ( 'primary_svc' => scalar($cgi->param('pkg_svc_primary')) );
+
+  ##
+  #options
+  ##
+  
+  $cgi->param('plan') =~ /^(\w+)$/ or die 'unparsable plan';
+  my $plan = $1;
+  
+  tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() };
+  my $href = $plans{$plan}->{'fields'};
+  
+  my $error = '';
+  my $options = $cgi->param($plan."__OPTIONS");
+  my @options = split(',', $options);
+  my %options =
+    map { my $optionname = $_;
+          my $param = $plan."__$optionname";
+          my $parser = exists($href->{$optionname}{parse})
+                         ? $href->{$optionname}{parse}
+                         : sub { shift };
+          my $value = join(', ', &$parser($cgi->param($param)));
+          my $check = $href->{$optionname}{check};
+          if ( $check && ! &$check($value) ) {
+            $value = join(', ', $cgi->param($param));
+            $error ||= "Illegal ".
+                         ($href->{$optionname}{name}||$optionname). ": $value";
+          }
+          ( $optionname => $value );
+        }
+        @options;
+
+  $options{$_} = scalar($cgi->param($_)) for (qw( setup_fee recur_fee ));
+  
+  push @args, 'options' => \%options;
+
+  ###
+  #pkg_svc
+  ###
+
+  my %pkg_svc = map { $_ => scalar($cgi->param("pkg_svc$_")) }
+                map { $_->svcpart }
+                qsearch('part_svc', {} );
+
+  push @args, 'pkg_svc' => \%pkg_svc;
+
+  ###
+  # cust_pkg and custnum_ref (inserts only)
+  ###
+  unless ( $cgi->param('pkgpart') ) {
+    push @args, 'cust_pkg'    => scalar($cgi->param('pkgnum')),
+                'custnum_ref' => \$custnum;
+  }
+
+  @args;
+
+};
 
-} elsif ( $pkgpart ) {
-
-  die "access denied"
-    unless $curuser->access_right('Edit package definitions')
-        || $curuser->access_right('Edit global package definitions');
-
-  $error = $new->replace( $old,
-                          pkg_svc     => \%pkg_svc,
-                          primary_svc => scalar($cgi->param('pkg_svc_primary')),
-                        );
-} else {
+$cgi->param('tax_override') =~ /^([\d,]+)$/;
+my (@tax_overrides) = (grep "$_", split (",", $1));
 
-  die "access denied"
-    unless $curuser->access_right('Edit package definitions')
-        || $curuser->access_right('Edit global package definitions')
-        || ( $cgi->param('pkgnum') && $curuser->access_right('Customize customer package') );
+my @process_m2m = (
+  {
+    'link_table'   => 'part_pkg_taxoverride',
+    'target_table' => 'tax_class',
+    'params'       => \@tax_overrides,
+  }
+);
 
-  $error = $new->insert(  pkg_svc     => \%pkg_svc,
-                          primary_svc => scalar($cgi->param('pkg_svc_primary')),
-                          cust_pkg    => $cgi->param('pkgnum'),
-                          custnum_ref => \$custnum,
-                       );
-  $pkgpart = $new->pkgpart;
-}
+my $conf = new FS::Conf;
 
-unless ( $error || $conf->exists('agent_defaultpkg') ) {
-  $error = $new->process_m2m(
+if ( $cgi->param('pkgpart') || ! $conf->exists('agent_defaultpkg') ) {
+  my @agents = ();
+  foreach ($cgi->param('agent_type')) {
+    /^(\d+)$/;
+    push @agents, $1 if $1;
+  }
+  warn "AGENTS: @agents";
+  push @process_m2m, {
     'link_table'   => 'type_pkgs',
     'target_table' => 'agent_type',
     'params'       => \@agents,
-  );
-}
-
-unless ( $error  ) {
-  $error = $new->process_m2m(
-    'link_table'   => 'part_pkg_taxoverride',
-    'target_table' => 'tax_class',
-    'params'       => \@tax_overrides,
-  );
+  };
 }
 
 </%init>