[freeside-commits] freeside/httemplate/config config.cgi, 1.32, 1.33 config-view.cgi, 1.34, 1.35 config-process.cgi, 1.19, 1.20

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/config
In directory wavetail.420.am:/tmp/cvs-serv20352/httemplate/config

Modified Files:
	config.cgi config-view.cgi config-process.cgi 
Log Message:
processing fee on credit card recharges, RT#5889

Index: config-process.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/config/config-process.cgi,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- config-process.cgi	25 Sep 2009 10:14:30 -0000	1.19
+++ config-process.cgi	25 Sep 2009 12:29:16 -0000	1.20
@@ -41,16 +41,16 @@
     } else {
       push @delete, $i->key;
     }
-  } elsif ( $type =~ /^(editlist|selectmultiple)$/
-            or ( $type =~ /^select(-(sub|part_svc))?$/ || $i->multiple )
-          )
-  {
+  } elsif (
+    $type =~ /^(editlist|selectmultiple)$/
+    or ( $type =~ /^select(-(sub|part_svc|part_pkg))?$/ || $i->multiple )
+  ) {
     if ( scalar(@{[ $cgi->param($i->key.$n) ]}) ) {
       $conf->set($i->key, join("\n", @{[ $cgi->param($i->key.$n) ]} ), $agentnum);
     } else {
       $conf->delete($i->key, $agentnum);
     }
-  } elsif ( $type =~ /^(text|select(-(sub|part_svc))?)$/ ) {
+  } elsif ( $type =~ /^(text|select(-(sub|part_svc|part_pkg))?)$/ ) {
     if ( $cgi->param($i->key.$n) ne '' ) {
       $conf->set($i->key, $cgi->param($i->key.$n), $agentnum);
     } else {
@@ -104,7 +104,7 @@
 
 %     } elsif ( $type eq 'text' || $type eq 'select' ) {
         configCell.innerHTML = <% $conf->exists($i->key, $agentnum) ? $conf->config($i->key, $agentnum) : '' |js_string %>;
-%     } elsif ( $type eq 'select-part_svc' && ! $i->multiple ) {
+%     } elsif ( $type =~ /^select-(part_svc|part_pkg)$/ && ! $i->multiple ) {
         configCell.innerHTML =
           <% $conf->config($i->key, $agentnum) |js_string %>
 %# + ': ' +

Index: config-view.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/config/config-view.cgi,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- config-view.cgi	25 Sep 2009 10:14:30 -0000	1.34
+++ config-view.cgi	25 Sep 2009 12:29:15 -0000	1.35
@@ -48,7 +48,8 @@
   </tr>
 % foreach my $i (@{ $section_items{$section} }) { 
 %   my @types = ref($i->type) ? @{$i->type} : ($i->type);
-%   my( $width, $height ) = ( 522, 336 );
+%#  my( $width, $height ) = ( 522, 336 );
+%   my( $width, $height ) = ( 600, 336 );
 %   if ( grep $_ eq 'textarea', @types ) {
 %     #800x600
 %     $width = 763;
@@ -208,14 +209,14 @@
               </td>
             </tr>
 
-%   } elsif ( $type eq 'select-part_svc' ) {
-%     my @svcparts = $conf->config($i->key, $agentnum);
+%   } elsif ( $type =~ /^select-(part_svc|part_pkg)$/ ) {
+%     my @keys = $conf->config($i->key, $agentnum);
 
             <tr>
               <td id="<% $agentnum.$i->key.$n %>" bgcolor="#ffffff">
-                <% join('<BR>', map { $_ # ': '. $svc
+                <% join('<BR>', map { $_ # ': '. $svc, $pkg, whatever
                                     }
-                                    @svcparts
+                                    @keys
                        )
                 %>
               </td>

Index: config.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/config/config.cgi,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- config.cgi	25 Sep 2009 10:14:30 -0000	1.32
+++ config.cgi	25 Sep 2009 12:29:15 -0000	1.33
@@ -308,7 +308,7 @@
 my %confitems = map { $_->key => $_ } @config_items;
 
 my %element_types = map { $_ => 1 } qw(
-  select-part_svc
+  select-part_svc select-part_pkg
 );
 
 </%once>