X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fpart_pkg.cgi;h=631a26b0adb65e4b95f6e31839c563d3eab053c0;hb=0141b002ab937b2b3a21a92c3728bc3101f4668a;hp=72488019010ab7e5ece0f1b267381e2e25c6fc02;hpb=ff92fba056c2b61753d464c84ecede6ec2f57258;p=freeside.git

diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 724880190..631a26b0a 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -9,6 +9,7 @@
               'edit_ext'          => 'cgi',
               'precheck_callback' => $precheck_callback,
               'args_callback'     => $args_callback,
+              'process_locale'    => 'pkg',
               'process_m2m'       => \@process_m2m,
           )
 %>
@@ -49,8 +50,7 @@ my $precheck_callback = sub {
   }
   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') )
+           #wtf? || ( $cgi->param('clone') && $cgi->param('clone') =~ /^\d+$/ )
            || $cgi->param('disabled')
            || $cgi->param('agentnum');
 
@@ -109,19 +109,30 @@ my $args_callback = sub {
   }
 
   $options{$_} = scalar( $cgi->param($_) )
-    for (qw( setup_fee recur_fee ));
+    for (qw( setup_fee recur_fee disable_line_item_date_ranges ));
   
   push @args, 'options' => \%options;
 
   ###
+  # fcc options
+  ###
+  my $fcc_options_string = $cgi->param('fcc_options_string');
+  if ($fcc_options_string) {
+    push @args, 'fcc_options' => decode_json($fcc_options_string);
+  }
+
+  ###
   #pkg_svc
   ###
 
   my @svcparts = map { $_->svcpart } qsearch('part_svc', {});
   my %pkg_svc = map { $_ => scalar($cgi->param("pkg_svc$_")) } @svcparts;
   my %hidden_svc = map { $_ => scalar($cgi->param("hidden$_")) } @svcparts;
+  my %provision_hold = map { $_ => scalar($cgi->param("provision_hold$_"   )) } @svcparts;
 
-  push @args, 'pkg_svc' => \%pkg_svc, 'hidden_svc' => \%hidden_svc;
+  push @args, 'pkg_svc'    => \%pkg_svc,
+              'hidden_svc' => \%hidden_svc,
+              'provision_hold' => \%provision_hold;
 
   ###
   # cust_pkg and custnum_ref (inserts only)
@@ -131,6 +142,16 @@ my $args_callback = sub {
                 'custnum_ref' => \$custnum;
   }
 
+  my %part_pkg_vendor;
+  foreach my $param ( $cgi->param ) {
+    if ( $param =~ /^export(\d+)$/ && length($cgi->param($param)) > 0 ) {
+	$part_pkg_vendor{$1} = $cgi->param($param);
+    }
+  }
+  if ( keys %part_pkg_vendor > 0 ) {
+    push @args, 'part_pkg_vendor' => \%part_pkg_vendor;
+  }
+
   #warn "args: ".join('/', @args). "\n";
 
   @args;
@@ -175,6 +196,15 @@ my @process_m2m = (
                         grep /^svc_dst_pkgpart/, $cgi->param
                       ],
   },
+  { 'link_table'   => 'part_pkg_link',
+    'target_table' => 'part_pkg',
+    'base_field'   => 'src_pkgpart',
+    'target_field' => 'dst_pkgpart',
+    'hashref'      => { 'link_type' => 'supp', 'hidden' => '' },
+    'params'       => [ map $cgi->param($_),
+                        grep /^supp_dst_pkgpart/, $cgi->param
+                      ],
+  },
   map { 
     my $hidden = $_;
     { 'link_table'   => 'part_pkg_link',
@@ -212,17 +242,15 @@ foreach my $override_class ($cgi->param) {
 
 my $conf = new FS::Conf;
 
-if ( $cgi->param('pkgpart') || ! $conf->exists('agent_defaultpkg') ) {
-  my @agents = ();
-  foreach ($cgi->param('agent_type')) {
-    /^(\d+)$/;
-    push @agents, $1 if $1;
-  }
-  push @process_m2m, {
-    'link_table'   => 'type_pkgs',
-    'target_table' => 'agent_type',
-    'params'       => \@agents,
-  };
+my @agents = ();
+foreach ($cgi->param('agent_type')) {
+  /^(\d+)$/;
+  push @agents, $1 if $1;
 }
+push @process_m2m, {
+  'link_table'   => 'type_pkgs',
+  'target_table' => 'agent_type',
+  'params'       => \@agents,
+};
 
 </%init>