X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=7e794487156030feed247922c67a26dbe8b0c223;hb=12f5c0d0824f8eefaa107ed3ea5e6503950968a6;hp=98ce71a28ea603fe314060fff3a0d8ce9fa16740;hpb=56641843fc92d3d7ed61166d1e3d12ff691f0cde;p=freeside.git

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 98ce71a28..7e7944871 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,68 +1,9 @@
-%
-%
-%if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
-%  $cgi->param('clone', $1);
-%} else {
-%  $cgi->param('clone', '');
-%}
-%if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
-%  $cgi->param('pkgnum', $1);
-%} else {
-%  $cgi->param('pkgnum', '');
-%}
-%
-%my ($query) = $cgi->keywords;
-%
-%my $part_pkg = '';
-%my @agent_type = ();
-%if ( $cgi->param('error') ) {
-%  $part_pkg = new FS::part_pkg ( {
-%    map { $_, scalar($cgi->param($_)) } fields('part_pkg')
-%  } );
-%  (@agent_type) = $cgi->param('agent_type');
-%}
-%
-%my $action = '';
-%my $clone_part_pkg = '';
-%my $pkgpart = '';
-%if ( $cgi->param('clone') ) {
-%  $pkgpart = $cgi->param('clone');
-%  $action = 'Custom Pricing';
-%  $clone_part_pkg= qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
-%  $part_pkg ||= $clone_part_pkg->clone;
-%  $part_pkg->disabled('Y'); #isn't sticky on errors
-%} elsif ( $query && $query =~ /^(\d+)$/ ) {
-%  (@agent_type) = map {$_->typenum} qsearch('type_pkgs',{'pkgpart'=>$1})
-%    unless $part_pkg;
-%  $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
-%  $pkgpart = $part_pkg->pkgpart;
-%} else {
-%  unless ( $part_pkg ) {
-%    $part_pkg = new FS::part_pkg {};
-%    $part_pkg->plan('flat');
-%  }
-%}
-%unless ( $part_pkg->plan ) { #backwards-compat
-%  $part_pkg->plan('flat');
-%  $part_pkg->plandata("setup_fee=". $part_pkg->setup. "\n".
-%                      "recur_fee=". $part_pkg->recur. "\n");
-%}
-%$action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
-%my $hashref = $part_pkg->hashref;
-%
-%
-
-
-<% include("/elements/header.html","$action Package Definition", menubar(
-  'Main Menu' => popurl(2),
+<% include('/elements/header.html', "$action Package Definition", menubar(
   'View all packages' => popurl(2). 'browse/part_pkg.cgi',
 )) %>
 % #), ' onLoad="visualize()"'); 
-% if ( $cgi->param('error') ) { 
-
-  <FONT SIZE="+1" COLOR="#ff0000">Error: <% $cgi->param('error') %></FONT>
-% } 
 
+<% include('/elements/error.html') %>
 
 <FORM NAME="dummy">
 
@@ -125,7 +66,6 @@ Tax information
     </TD>
   </TR>
 
-% my $conf = new FS::Conf; 
 % if ( $conf->exists('enable_taxclasses') ) { 
 
   <TR>
@@ -166,9 +106,13 @@ Line-item revenue recognition
 
     <INPUT TYPE="hidden" NAME="agent_type" VALUE="">
 
+% } elsif ( scalar(@all_agent_types) == 1) {
+
+    <INPUT TYPE="hidden" NAME="agent_type" VALUE="<% $all_agent_types[0] %>">
+
 % } else {
 
-    Reseller information 
+    Reseller information
     <% ntable("#cccccc", 2) %>
       <TR>
         <TD ALIGN="right"><% 'Agent Types' %></TD>
@@ -178,8 +122,8 @@ Line-item revenue recognition
                       'table'        => 'agent_type',
                       'name_col'     => 'atype',
                       'value'        => \@agent_type,
-                      'empty_label'  => '(none)',
-                      'element_etc'  => 'multiple size="10"',
+                      'multiple'     =>  '1',
+                      'element_etc'  => 'size="10"',
                     )
           %>
         </TD>
@@ -190,15 +134,10 @@ Line-item revenue recognition
 
 </TD></TR></TABLE>
 
-%
 %my $thead =  "\n\n". ntable('#cccccc', 2).
-%             '<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH>';
-%$thead .=  '<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Primary</FONT></TH>'
-%  if dbdef->table('pkg_svc')->column('primary_svc');
-%$thead .= '<TH BGCOLOR="#dcdcdc">Service</TH></TR>';
-%
-%
-
+%             '<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH>'.
+%             '<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Primary</FONT></TH>'.
+%             '<TH BGCOLOR="#dcdcdc">Service</TH></TR>';
 
 <BR><BR>Services included
 <% itable('', 4, 1) %><TR><TD VALIGN="top">
@@ -228,15 +167,28 @@ Line-item revenue recognition
 %                                   'quantity'    => 0,
 %                                   'primary_svc' => '',
 %                                } );
+%  if ( $cgi->param('error') ) {
+%    my $primary_svc = ( $pkg_svc->primary_svc =~ /^Y/i );
+%    my $pkg_svc_primary = scalar($cgi->param('pkg_svc_primary'));
+%    $pkg_svc->primary_svc('')
+%      if $primary_svc && $pkg_svc_primary != $svcpart;
+%    $pkg_svc->primary_svc('Y')
+%      if ! $primary_svc && $pkg_svc_primary == $svcpart;
+%  }
 %
 %  push @fixups, "pkg_svc$svcpart";
 %
-%
+%  my $quan = 0;
+%  if ( $cgi->param("pkg_svc$svcpart") =~ /^\s*(\d+)\s*$/ ) {
+%    $quan = $1;
+%  } elsif ( $pkg_svc->quantity ) {
+%    $quan = $pkg_svc->quantity;
+%  }
 
 
   <TR>
     <TD>
-      <INPUT TYPE="text" NAME="pkg_svc<% $svcpart %>" SIZE=4 MAXLENGTH=3 VALUE="<% $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0 %>">
+      <INPUT TYPE="text" NAME="pkg_svc<% $svcpart %>" SIZE=4 MAXLENGTH=3 VALUE="<% $quan %>">
     </TD>
    
     <TD>
@@ -260,10 +212,9 @@ Line-item revenue recognition
 
 
 </TR></TABLE></TD></TR></TABLE>
-% foreach my $f ( qw( clone pkgnum ) ) { 
-
-  <INPUT TYPE="hidden" NAME="<% $f %>" VALUE="<% $cgi->param($f) %>">
-% } 
+% foreach my $f ( qw( clone pkgnum ) ) { #safe, these were untained in %init 
+    <INPUT TYPE="hidden" NAME="<% $f %>" VALUE="<% $cgi->param($f) %>">
+% }
 
 <INPUT TYPE="hidden" NAME="pkgpart" VALUE="<% $part_pkg->pkgpart %>">
 %
@@ -285,10 +236,7 @@ Line-item revenue recognition
 %#}
 %my @form_elements = ( 'classnum', 'taxclass', 'agent_type' );
 %
-%my @form_radio = ();
-%if ( dbdef->table('pkg_svc')->column('primary_svc') ) {
-%  push @form_radio, 'pkg_svc_primary';
-%}
+%my @form_radio = ( 'pkg_svc_primary' );
 %
 %tie my %freq, 'Tie::IxHash', %{FS::part_pkg->freqs_href()};
 %if ( $part_pkg->dbdef_table->column('freq')->type =~ /(int)/i ) {
@@ -342,7 +290,7 @@ Line-item revenue recognition
 %                 ( exists($plandata{$field})
 %                     ? &$format($plandata{$field})
 %                     : $href->{$field}{'default'} ).
-%                 qq!">!;
+%                 qq!" onChange="fchanged(this)">!;
 %      } elsif ( $href->{$field}{'type'} eq 'checkbox' ) {
 %        $html .= qq!<INPUT TYPE="checkbox" NAME="$field" VALUE=1 !.
 %                 ( exists($plandata{$field}) && $plandata{$field}
@@ -353,7 +301,7 @@ Line-item revenue recognition
 %        $html .= '<SELECT';
 %        $html .= ' MULTIPLE'
 %          if $href->{$field}{'type'} eq 'select_multiple';
-%        $html .= qq! NAME="$field">!;
+%        $html .= qq! NAME="$field" onChange="fchanged(this)">!;
 %
 %        if ( $href->{$field}{'select_table'} ) {
 %          foreach my $record (
@@ -396,8 +344,11 @@ Line-item revenue recognition
 %             '<BR><BR>';
 %             
 %    $html .= '<INPUT TYPE="submit" VALUE="'.
-%             ( $hashref->{pkgpart} ? "Apply changes" : "Add package" ).
-%             '">';
+%               ( $action eq 'Custom'
+%                   ? 'Customize package'
+%                   : ( $hashref->{pkgpart} ? "Apply changes" : "Add package" )
+%               ).
+%             '" onClick="fchanged(this)">';
 %
 %    $html;
 %
@@ -408,5 +359,67 @@ Line-item revenue recognition
 
 
 <BR><BR>Price plan <% $widget->html %>
-  </BODY>
-</HTML>
+
+<% include('/elements/footer.html') %>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Edit package definitions')
+      || $FS::CurrentUser::CurrentUser->access_right('Edit global package definitions');
+
+if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
+  $cgi->param('clone', $1);
+} else {
+  $cgi->param('clone', '');
+}
+if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
+  $cgi->param('pkgnum', $1);
+} else {
+  $cgi->param('pkgnum', '');
+}
+
+my ($query) = $cgi->keywords;
+
+my $conf = new FS::Conf; 
+my $part_pkg = '';
+my @agent_type = ();
+my @all_agent_types = map {$_->typenum} qsearch('agent_type',{});
+if ( $cgi->param('error') ) {
+  $part_pkg = new FS::part_pkg ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_pkg')
+  } );
+  (@agent_type) = $cgi->param('agent_type');
+}
+
+my $action = '';
+my $clone_part_pkg = '';
+my $pkgpart = '';
+if ( $cgi->param('clone') ) {
+  $pkgpart = $cgi->param('clone');
+  #$action = 'Custom Pricing';
+  $action = 'Custom';
+  $clone_part_pkg= qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
+  $part_pkg ||= $clone_part_pkg->clone;
+  $part_pkg->disabled('Y') unless $cgi->param('error');
+} elsif ( $query && $query =~ /^(\d+)$/ ) {
+  (@agent_type) = map {$_->typenum} qsearch('type_pkgs',{'pkgpart'=>$1})
+    unless $part_pkg;
+  $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
+  $pkgpart = $part_pkg->pkgpart;
+} else {
+  unless ( $part_pkg ) {
+    $part_pkg = new FS::part_pkg {};
+    $part_pkg->plan('flat');
+    @agent_type = @all_agent_types if $conf->exists('agent_defaultpkg');
+      
+  }
+}
+unless ( $part_pkg->plan ) { #backwards-compat
+  $part_pkg->plan('flat');
+  $part_pkg->plandata("setup_fee=". $part_pkg->setup. "\n".
+                      "recur_fee=". $part_pkg->recur. "\n");
+}
+$action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
+my $hashref = $part_pkg->hashref;
+
+</%init>