[freeside-commits] freeside/httemplate/search cust_pkg.cgi, 1.52, 1.53

[Ivan,,,]

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

Modified Files:
	cust_pkg.cgi 
Log Message:
this should add the info s1 was looking for, RT#5539

Index: cust_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pkg.cgi,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- cust_pkg.cgi	1 Jul 2008 05:03:42 -0000	1.52
+++ cust_pkg.cgi	10 Jun 2009 07:58:21 -0000	1.53
@@ -10,6 +10,8 @@
                                      'Package',
                                      'Class',
                                      'Status',
+                                     'Setup',
+                                     'Base Recur',
                                      'Freq.',
                                      'Setup',
                                      'Last bill',
@@ -33,6 +35,14 @@
                         },
                     'classname',
                     sub { ucfirst(shift->status); },
+                    sub { sprintf( $money_char.'%.2f',
+                                   shift->part_pkg->option('setup_fee'),
+                                 );
+                        },
+                    sub { sprintf( $money_char.'%.2f',
+                                   shift->part_pkg->base_recur
+                                 );
+                        },
                     sub { #shift->part_pkg->freq_pretty;
 
                           #my $part_pkg = $part_pkg{shift->pkgpart};
@@ -99,13 +109,15 @@
                     '',
                     '',
                     '',
+                    '',
+                    '',
                     FS::UI::Web::cust_colors(),
                     '',
                   ],
-                  'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '',
+                  'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', '', '',
                                FS::UI::Web::cust_styles() ],
                   'size'  => [ '', '', '', '', '-1' ],
-                  'align' => 'rrlcclrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
+                  'align' => 'rrlccrrlrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
                   'links' => [
                     $link,
                     $link,
@@ -121,6 +133,8 @@
                     '',
                     '',
                     '',
+                    '',
+                    '',
                     ( map { $_ ne 'Cust. Status' ? $clink : '' }
                           FS::UI::Web::cust_header(
                                                     $cgi->param('cust_fields')
@@ -136,6 +150,9 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('List packages');
 
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
+
 # my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
 
   my %search_hash = ();