X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Felements%2Fprocess.html;h=53419cde0eb58769c477ff51d566de5a7adb0412;hp=6f271ee29a33b8a08d8e040d67050befb6326faf;hb=74e058c8a010ef6feb539248a550d0bb169c1e94;hpb=e4fc461dd93181e8199d5cc5e2de2a11732b1bfd

diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html
index 6f271ee29..53419cde0 100644
--- a/httemplate/edit/process/elements/process.html
+++ b/httemplate/edit/process/elements/process.html
@@ -18,6 +18,7 @@ Example:
    ###
 
    'viewall_dir'  => '', #'search' or 'browse', defaults to 'search'
+   'viewall_ext'  => 'html', #'cgi' or 'html', defaults to 'html'
    OR
    'redirect'     => 'view/table.cgi?', # value of primary key is appended
                                         # (string or coderef returning a string)
@@ -33,7 +34,8 @@ Example:
 
    'clear_on_error' => [ 'form_field1', 'form_field2', ... ],
 
-                    #pass an arrayref of hashrefs for multiple m2ms or m2names
+                  #pass an arrayref of hashrefs for multiple m2ms or m2names
+                  #be certain you incorporate m2m_Common if you see error: param
 
    'process_m2m' => { 'link_table'   => 'link_table_name',
                       'target_table' => 'target_table_name',
@@ -54,13 +56,20 @@ Example:
 
 
                        },
+   'process_o2m' => { 'table' => table_name',
+                      'num_col' => 'column', #if column name is different in
+                                             #link_table than source_table 
+                    },
 
    #checks CGI params and whatever else before much else runs
    #return an error string or empty for no error
    'precheck_callback' => sub { my( $cgi ) = @_; },
 
+   #after everything's inserted
+   'noerror_callback' => sub { my( $cgi, $object ) = @_; },
+
    #supplies arguments to insert() and replace()
-   # for use with tables that are FS::option_Common
+   # for use with tables that are FS::option_Common (among other things)
    'args_callback' => sub { my( $cgi, $object ) = @_; },
 
    'debug' => 1, #turns on debugging output
@@ -176,14 +185,6 @@ my %hash =
 
 my $new = $class->new( \%hash );
 
-if ( $opt{'agent_virt'} ) {
-  die "illegal agentnum"
-    unless $curuser->agentnums_href->{$new->agentnum}
-        or $opt{'agent_null_right'}
-           && ! $new->agentnum
-           && $curuser->access_right($opt{'agent_null_right'});
-}
-
 if ($old && exists($opt{'copy_on_empty'})) {
   foreach my $field (@{$opt{'copy_on_empty'}}) {
     $new->set($field, $old->get($field))
@@ -191,6 +192,30 @@ if ($old && exists($opt{'copy_on_empty'})) {
   }
 }
 
+if ( $opt{'agent_virt'} ) {
+
+  if ( ! $new->agentnum
+       && (    ! $opt{'agent_null_right'}
+            || ! $curuser->access_right($opt{'agent_null_right'})
+          )
+     )
+  {
+
+    $error ||= 'Select an agent';
+
+  } 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'});
+
+  }
+
+}
+
 $error ||= $new->check;
 
 my @args = ();
@@ -253,14 +278,44 @@ if ( !$error && $opt{'process_m2name'} ) {
 
 }
 
+if ( !$error && $opt{'process_o2m'} ) {
+
+  my @process_o2m = ref($opt{'process_o2m'}) eq 'ARRAY'
+                         ? @{ $opt{'process_o2m'} }
+                         :  ( $opt{'process_o2m'} );
+
+
+  foreach my $process_o2m (@process_o2m) {
+
+    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),
+                                 );
+  }
+
+}
+
 
 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, '')
     }
   }
+
+} else {
+
+  if ( $opt{'noerror_callback'} ) {
+    &{ $opt{'noerror_callback'} }( $cgi, $new );
+  }
+
 }
 
 </%init>