concurrent fix for package editing also cleans this up slightly

[freeside.git] / httemplate / edit / part_pkg.cgi

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index ce3e854..98ce71a 100755 (executable)
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -89,7 +89,10 @@ Package information
       <INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="<%$part_pkg->comment%>">
     </TD>
   </TR>
-  <% include( '/elements/tr-select-pkg_class.html', $part_pkg->classnum ) %>
+  <% include( '/elements/tr-select-pkg_class.html',
+                'curr_value' => $part_pkg->classnum,
+            )
+  %>
   <TR>
     <TD ALIGN="right">Promotional code</TD>
     <TD>
@@ -159,25 +162,34 @@ Line-item revenue recognition
 
 </TD><TD VALIGN="top">
 
-Reseller information 
-<% ntable("#cccccc", 2) %>
-  <TR>
-    <TD ALIGN="right"><% 'Agent Types' %></TD>
-    <TD>
-      <% include( '/elements/select-table.html',
-                  'element_name' => 'agent_type',
-                  'table'        => 'agent_type',
-                 'name_col'     => 'atype',
-                 'value'        => \@agent_type,
-                 'empty_label'  => '(none)',
-                 'element_etc'  => 'multiple size="10"',
-                )
-      %>
-    </TD>
-  </TR>
-</TABLE>
+% if ( $cgi->param('clone') ) {
+
+    <INPUT TYPE="hidden" NAME="agent_type" VALUE="">
+
+% } else {
+
+    Reseller information 
+    <% ntable("#cccccc", 2) %>
+      <TR>
+        <TD ALIGN="right"><% 'Agent Types' %></TD>
+        <TD>
+          <% include( '/elements/select-table.html',
+                      'element_name' => 'agent_type',
+                      'table'        => 'agent_type',
+                      'name_col'     => 'atype',
+                      'value'        => \@agent_type,
+                      'empty_label'  => '(none)',
+                      'element_etc'  => 'multiple size="10"',
+                    )
+          %>
+        </TD>
+      </TR>
+    </TABLE>
+
+% }
+
 </TD></TR></TABLE>
-%
+
 %
 %my $thead =  "\n\n". ntable('#cccccc', 2).
 %             '<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH>';
@@ -290,7 +302,7 @@ Reseller information
 %  'form_action'    => 'process/part_pkg.cgi',
 %  'form_elements'  => \@form_elements,
 %  'form_text'      => [ qw(pkg comment promo_code clone pkgnum pkgpart),
-%                        qw(pay_weight credit_weight),
+%                        qw(pay_weight credit_weight), #keys(%weight),
 %                        @fixups,
 %                      ],
 %  'form_checkbox'  => [ qw(setuptax recurtax disabled) ],
@@ -323,10 +335,12 @@ Reseller information
 %
 %      $html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>';
 %
+%      my $format = sub { shift };
+%      $format = $href->{$field}{'format'} if exists($href->{$field}{'format'});
 %      if ( ! exists($href->{$field}{'type'}) ) {
 %        $html .= qq!<INPUT TYPE="text" NAME="$field" VALUE="!.
 %                 ( exists($plandata{$field})
-%                     ? $plandata{$field}
+%                     ? &$format($plandata{$field})
 %                     : $href->{$field}{'default'} ).
 %                 qq!">!;
 %      } elsif ( $href->{$field}{'type'} eq 'checkbox' ) {