X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Fpart_pkg.cgi;h=d0c14da4c6ac471426fe891d274326ba13c73ac7;hb=6b28d0bd4b422d0fff32b559d0785665b1c46b27;hp=bb5bc52150f436dedd647be38c6ebe94a8f0d88f;hpb=f3e0ac2b009c4edd5692cb587ff709dac2223ebe;p=freeside.git

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index bb5bc5215..d0c14da4c 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -128,9 +128,16 @@ $select = "
   ( $count_cust_pkg
       AND ( cancel IS NULL OR cancel = 0 )
       AND susp IS NOT NULL AND susp != 0
+      AND setup IS NOT NULL AND setup != 0
   ) AS num_suspended,
 
   ( $count_cust_pkg
+      AND ( cancel IS NULL OR cancel = 0 )
+      AND susp IS NOT NULL AND susp != 0
+      AND ( setup IS NULL OR setup = 0 )
+  ) AS num_on_hold,
+
+  ( $count_cust_pkg
       AND cancel IS NOT NULL AND cancel != 0
   ) AS num_cancelled
 
@@ -241,10 +248,10 @@ push @fields, sub {
     ],
     [
       { data =>$money_char.
-               sprintf('%.2f', $part_pkg->option('setup_fee') ),
+               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)'
@@ -257,7 +264,7 @@ push @fields, sub {
     [
       { data=>(
           $is_recur
-            ? $money_char. sprintf('%.2f ', $part_pkg->option('recur_fee'))
+            ? $money_char. sprintf('%.2f', $part_pkg->option('recur_fee'))
             : $part_pkg->freq_pretty
         ),
         align=> ( $is_recur ? 'right' : 'center' ),
@@ -265,7 +272,7 @@ push @fields, sub {
       },
       ( $is_recur
         ?  { data => ( $is_recur
-               ? $part_pkg->freq_pretty.
+               ? '   '. $part_pkg->freq_pretty.
                  ( $part_pkg->option('recur_fee') == 0
                      && $part_pkg->recur_show_zero
                    ? ' (printed on invoices)'
@@ -277,6 +284,20 @@ push @fields, sub {
         : ()
       ),
     ],
+    (
+      map { my $amount = $_->amount / ($_->target_info->{multiplier} || 1);
+            my $label = $_->target_info->{label};
+            [
+              { data    => "Plus $money_char". $_->price. ' '.
+                           ( $_->action eq 'increment' ? 'per' : 'for' ).
+                           " $amount $label",
+                align   => 'center', #left?
+                colspan => 2,
+              },
+            ];
+          }
+        $part_pkg->part_pkg_usageprice
+    ),
     ( map { my $dst_pkg = $_->dst_pkg;
             [
               { data => 'Supplemental:  '.
@@ -368,6 +389,7 @@ if ( $acl_edit_global ) {
 #if ( $cgi->param('active') ) {
   push @header, 'Customer<BR>packages';
   my %col = (
+    'on hold'         => '7E0079', #purple!
     'not yet billed'  => '009999', #teal? cyan?
     'active'          => '00CC00',
     'suspended'       => 'FF9900',
@@ -383,10 +405,11 @@ if ( $acl_edit_global ) {
                               my $label = $_;
                               if ( $magic eq 'active' && $part_pkg->freq == 0 ) {
                                 $magic = 'inactive';
-                                #$label = 'one-time charge',
-                                $label = 'charge',
+                                #$label = 'one-time charge';
+                                $label = 'charge';
                               }
                               $label= 'not yet billed' if $magic eq 'not_yet_billed';
+                              $label= 'on hold' if $magic eq 'on_hold';
                           
                               [
                                 {
@@ -411,7 +434,7 @@ if ( $acl_edit_global ) {
                                             ),
                                 },
                               ],
-                            } (qw( not_yet_billed active suspended cancelled ))
+                            } (qw( on_hold not_yet_billed active suspended cancelled ))
                           ),
                       ($acl_config ? 
                         [ {},