[freeside-commits] freeside/httemplate/browse part_pkg.cgi, 1.59.2.1, 1.59.2.2

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	part_pkg.cgi 
Log Message:
fix UI for package editing w/recur_show_zero, add setup_show_zero, RT#9777

Index: part_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/part_pkg.cgi,v
retrieving revision 1.59.2.1
retrieving revision 1.59.2.2
diff -u -w -d -r1.59.2.1 -r1.59.2.2
--- part_pkg.cgi	10 Jun 2011 03:33:57 -0000	1.59.2.1
+++ part_pkg.cgi	12 Jul 2011 22:58:48 -0000	1.59.2.2
@@ -219,12 +219,19 @@
                sprintf('%.2f', $part_pkg->option('setup_fee') ),
         align=>'right'
       },
-      { data => ( $is_recur ? ' setup' : ' one-time' ),
+      { data => ( ( $is_recur ? ' setup' : ' one-time' ).
+                  ( $part_pkg->option('recur_fee') == 0
+                      && $part_pkg->setup_show_zero
+                    ? ' (printed on invoices)'
+                    : ''
+                  )
+                ),
         align=>'left',
       },
     ],
     [
-      { data=>( $is_recur
+      { data=>(
+          $is_recur
                   ? $money_char.sprintf('%.2f ', $part_pkg->option('recur_fee'))
                   : $part_pkg->freq_pretty
               ),
@@ -232,20 +239,19 @@
         colspan=> ( $is_recur ? 1 : 2 ),
       },
       ( $is_recur
-        ?  { data => ( $is_recur ? $part_pkg->freq_pretty : '' ),
+        ?  { data => ( $is_recur
+               ? $part_pkg->freq_pretty.
+                 ( $part_pkg->option('recur_fee') == 0
+                     && $part_pkg->recur_show_zero
+                   ? ' (printed on invoices)'
+                   : ''
+                 )
+               : '' ),
              align=>'left',
            }
         : ()
       ),
     ],
-    [ { data    =>
-          ( $part_pkg->option('recur_fee') == 0 && $part_pkg->recur_show_zero )
-            ? ' (printed on invoices)'
-            : '',
-        align   => 'center', #?
-        colspan => 2,
-      },
-    ],
     ( map { 
             my $dst_pkg = $_->dst_pkg;
             [