X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Felements%2Fprocess.html;h=60aaf749a3391d15551ca3597462b4c0d7e0ef33;hp=071c43a63ec3ea0e90438f5c3cb72e3ea263f7c9;hb=f413badbfe4676563d11b528838a21d9ceb8da14;hpb=033028122bf526b3d9d366bc4c72075b87918372

diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html
index 071c43a63..60aaf749a 100644
--- a/httemplate/edit/process/elements/process.html
+++ b/httemplate/edit/process/elements/process.html
@@ -59,12 +59,29 @@ Example:
    'process_o2m' => { 'table' => table_name',
                       'num_col' => 'column', #if column name is different in
                                              #link_table than source_table 
+                      'fields' => [qw( fieldname fieldname2 )],
                     },
 
+   'process_locale' => 'fieldname', # update entries in the _msgcat table
+
+   'process_upload' => {
+                         'process'  => 'misc/mytable-import.html',
+                          # fields to pass to the back end job, besides the 
+                          # primary key of the object
+                         'fields'   => [qw( fieldname fieldname2 )],
+                       },
+
+   'skip_process' => 0, #boolean, if set true, will skip the main table
+                        #add/edit processing and only run any linked table
+                        #process_ items
+
    #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 the new object is created
+   'post_new_object_callback' => sub { my( $cgi, $object ) = @_; },
+
    #after everything's inserted
    'noerror_callback' => sub { my( $cgi, $object ) = @_; },
 
@@ -86,9 +103,6 @@ Example:
 </%doc>
 %if ( $error ) {
 %
-%  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
@@ -106,17 +120,70 @@ Example:
 %          " attempting to set redirect$session to ". $cgi->query_string."\n";
 %    }
 %
-<% $cgi->redirect("$url?redirect=$session") %>
+<% $cgi->redirect("$error_redirect?redirect=$session") %>
 %
 %  } else {
 %
-<% $cgi->redirect("$url?". $cgi->query_string ) %>
+<% $cgi->redirect("$error_redirect?". $cgi->query_string ) %>
 %
-%  } 
+%  }
 %
 % #different ways of handling success
 %
-%} elsif ( $opt{'popup_reload'} ) {
+%} elsif ( $opt{'process_upload'} and @uploaded_files ) {
+%
+% # construct a form to pass all the requested fields, the 
+%
+<& /elements/header.html &>
+<form name="UploadForm">
+%   my $job_fields = $opt{'process_upload'}{'fields'};
+%   foreach my $field ( @$job_fields ) {
+  <input type="hidden" name="<% $field %>" value="<% $cgi->param($field) |h %>">
+%   }
+%   push @$job_fields, 'uploaded_files', $pkey;
+%
+  <input type="hidden" name="uploaded_files" value="<% join(',', @uploaded_files) %>">
+  <input type="hidden" name="<% $pkey %>" value="<% $new->get($pkey) %>">
+<& /elements/progress-init.html,
+  'UploadForm',
+  $job_fields,
+  $fsurl . $opt{'process_upload'}{'process'},
+  {
+    url => $redirect,
+    error_url => "$error_redirect?$new_pkey"
+  },
+&>
+<input type="submit" style="display:none">
+</form>
+<script>
+<&| /elements/onload.js &>
+process();
+</&>
+</script>
+<& /elements/footer.html &>
+
+% } elsif ( $opt{'progress_init'} ) {
+%   # some false laziness with the above
+%   my ($form_name, $job_fields) = @{ $opt{'progress_init'} };
+<form name="<% $form_name %>">
+  <input type="hidden" name="<% $pkey %>" value="<% $new->get($pkey) %>">
+%   foreach my $field (@$job_fields) {
+%     next if $field eq $pkey;
+  <input type="hidden" name="<% $field %>" value="<% $cgi->param($field) |h %>">
+%   }
+<& /elements/progress-init.html,
+  @{ $opt{'progress_init'} }
+&>
+<input type="submit" style="display:none">
+</form>
+<script>
+<&| /elements/onload.js &>
+process();
+</&>
+</script>
+<& /elements/footer.html &>
+
+% } elsif ( $opt{'popup_reload'} ) {
 
   <% include('/elements/header-popup.html', $opt{'popup_reload'} ) %>
 
@@ -128,26 +195,8 @@ Example:
   </HTML>
 
 %} else {
-%  
-%  $opt{'redirect'} = &{$opt{'redirect'}}($cgi, $new)
-%    if ref($opt{'redirect'}) eq 'CODE';
-%
-%  if ( $opt{'redirect'} ) {
-%
-<% $cgi->redirect( $opt{'redirect'}. $new_pkey) %>
-%
-%  } else { 
-%
-%    my $ext = $opt{'viewall_ext'} || 'html';
-%    my $viewall_dir = $opt{'viewall_dir'} || 'search';
-%    my $viewall_url = $opt{'viewall_url'} || ($viewall_dir . "/$table.$ext");
-%
-%#<% $cgi->redirect( popurl(3). ($opt{viewall_dir}||'search'). "/$table.$ext" ) %>
-<% $cgi->redirect( popurl(3) . $viewall_url ) %>
-%  }
-%
+<% $cgi->redirect($redirect) %>
 %}
-%
 <%init>
 
 my $me = 'process.html:';
@@ -196,69 +245,85 @@ my %hash =
 my @values = ( 1 );
 if ( $bfield ) {
   @values = $cgi->param($bfield);
-  warn join(',', @values);
+  #warn join(',', @values);
 }
 
+my @uploaded_files;
+
 my $new;
 my $new_pkey = '';
 foreach my $value ( @values ) {
 
-  $new = $class->new( \%hash );
+  if ($opt{'skip_process'}) {
+
+    $new = $old;
+    $new_pkey = $old_pkey;
+
+  } else {
 
-  $new->$bfield($value) if $bfield;
+    $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{'post_new_object_callback'} ) {
+      &{ $opt{'post_new_object_callback'} }( $cgi, $new );
+    }
 
-    if ( ! $new->agentnum
-         && (    ! $opt{'agent_null_right'}
-              || ! $curuser->access_right($opt{'agent_null_right'})
-            )
-       )
-    {
+    if ( $opt{'agent_virt'} ) {
+
+      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'});
+
+      }
 
     }
 
-  }
+    my @args = ();
+    if ( !$error && $opt{'args_callback'} ) {
+      @args = &{ $opt{'args_callback'} }( $cgi, $new );
+    }
 
-  $error ||= $new->check;
+    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;
+    }
 
-  my @args = ();
-  if ( !$error && $opt{'args_callback'} ) {
-    @args = &{ $opt{'args_callback'} }( $cgi, $new );
-  }
+    if ( !$error ) {
+      if ( $old_pkey ) {
 
-  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;
-  }
+        &{ $opt{'edit_callback'} }( $new, $old ) if $opt{'edit_callback'};
 
-  if ( !$error ) {
-    if ( $old_pkey ) {
-      $error = $new->replace($old, @args);
-    } else {
-      $error = $new->insert(@args);
+        $error = $new->replace($old, @args);
+      } else {
+        $error = $new->insert(@args);
+      }
+      $new_pkey = $new->getfield($pkey);
     }
-    $new_pkey = $new->getfield($pkey);
-  }
+
+  } #unless $opt{'skip_process'}
 
   if ( !$error && $opt{'process_m2m'} ) {
 
@@ -273,7 +338,7 @@ foreach my $value ( @values ) {
       warn "$me processing m2m:\n". Dumper( %$process_m2m )
         if $opt{'debug'};
 
-      $error = $new->process_m2m( %$process_m2m );
+      $error ||= $new->process_m2m( %$process_m2m );
     }
 
   }
@@ -300,12 +365,21 @@ foreach my $value ( @values ) {
 
   }
 
-  if ( !$error && $opt{'process_o2m'} ) {
-
-    my @process_o2m = ref($opt{'process_o2m'}) eq 'ARRAY'
-                           ? @{ $opt{'process_o2m'} }
-                           :  ( $opt{'process_o2m'} );
+  my @process_o2m;
+  if ( $opt{'process_o2m'} ) {
+    @process_o2m = ref($opt{'process_o2m'}) eq 'ARRAY'
+                        ? @{ $opt{'process_o2m'} }
+                        :  ( $opt{'process_o2m'} );
+  }
+  if ( $opt{'process_locale'} ) {
+    push @process_o2m,
+    {
+      'table'  => $table . '_msgcat',
+      'fields' => [ 'locale', $opt{'process_locale'} ],
+    };
+  }
 
+  if ( !$error ) {
 
     foreach my $process_o2m (@process_o2m) {
 
@@ -315,7 +389,7 @@ foreach my $value ( @values ) {
                                                );
       }
 
-      $error = $new->process_o2m( %{ $process_o2m },
+      $error ||= $new->process_o2m( %{ $process_o2m },
                                      'params' => scalar($cgi->Vars),
                                    );
     }
@@ -323,6 +397,47 @@ foreach my $value ( @values ) {
   }
 
 
+  if ( !$error and $opt{'process_upload'} ) {
+    # mostly duplicates misc/file-upload.html
+    $cgi->param('upload_fields') =~ /^([,\w]+)$/
+      or $error = "invalid upload_fields";
+    my $fields = $1;
+
+    my $dir = $FS::UID::cache_dir. "/cache.". $FS::UID::datasrc;
+
+    foreach my $field (split /,/, $fields) {
+      next if $error;
+      my $source_name = $cgi->param($field);
+
+      if ( $opt{'debug'} ) {
+        warn "$me processing upload: $source_name\n";
+      }
+      my $fh = $cgi->upload( $field ); # if no file provided, that's fine
+      next if !$fh;
+
+      my $suffix = '';
+      if ( $source_name =~ /(\.\w+)$/ ) {
+        $suffix = lc($1);
+      }
+
+      my $sh = File::Temp->new( TEMPLATE => 'upload.XXXXXXXX',
+                                SUFFIX   => $suffix,
+                                DIR      => $dir,
+                                UNLINK   => 0,
+                              )
+        or $error ||= "can't open temporary file to store upload: $!\n";
+      next if $error;
+      while(<$fh>) {
+        print $sh $_;
+      }
+      $sh->filename =~ m!.*/([.\w]+)$!;
+      push @uploaded_files, "$field:$1";
+      if ( $opt{'debug'} ) {
+        warn "uploaded as $1\n";
+      }
+    }
+  }
+
   if ( $error ) {
 
     $cgi->param('error', $error);
@@ -344,4 +459,29 @@ foreach my $value ( @values ) {
 
 }
 
+# set up redirect URLs
+
+my $redirect;
+if ( !$error ) {
+  $opt{'redirect'} = &{$opt{'redirect'}}($cgi, $new)
+    if ref($opt{'redirect'}) eq 'CODE';
+
+  if ( $opt{'redirect'} ) {
+
+    $redirect = $opt{'redirect'} . $new_pkey;
+
+  } else { 
+
+    my $ext = $opt{'viewall_ext'} || 'html';
+    my $viewall_dir = $opt{'viewall_dir'} || 'search';
+    my $viewall_url = $opt{'viewall_url'} || ($viewall_dir . "/$table.$ext");
+
+    $redirect = popurl(3) . $viewall_url;
+  
+  }
+}
+
+my $edit_ext = $opt{'edit_ext'} || 'html';
+my $error_redirect = $opt{'error_redirect'}
+                     || popurl(2)."$table.$edit_ext";
 </%init>