X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Fpart_pkg.cgi;h=478d4a6d4a8c95e3525f203df6c49a5248e7011c;hb=54e557ff60c8c11f3666c4f6acc33ebe8aa4b8ff;hp=7021cb136f7af8fd44becf26c824ef4ea30fd4d4;hpb=0ae5bb70803aceb4378c7862782343f155c28590;p=freeside.git

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 7021cb136..478d4a6d4 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,13 +1,12 @@
 <% include( 'elements/browse.html',
                  'title'              => 'Package Definitions',
-                 'menubar'            => [ 'Main Menu' => $p ],
                  'html_init'          => $html_init,
                  'name'               => 'package definitions',
                  'disableable'        => 1,
                  'disabled_statuspos' => 3,
                  'agent_virt'         => 1,
                  'agent_null_right'   => 'Edit global package definitions',
-                 'agent_pos'          => 4,
+                 'agent_pos'          => 5,
                  'query'              => { 'select'   => $select,
                                            'table'    => 'part_pkg',
                                            'hashref'  => {},
@@ -56,6 +55,7 @@ if ( $cgi->param('active') ) {
 
 my $conf = new FS::Conf;
 my $taxclasses = $conf->exists('enable_taxclasses');
+my $money_char = $conf->config('money_char') || '$';
 
 my $html_init;
 #unless ( $cgi->param('active') ) {
@@ -83,6 +83,72 @@ unless ( 0 ) { #already showing only one class or something?
   $align .= 'l';
 }
 
+tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() };
+
+tie my %plan_labels, 'Tie::IxHash',
+  map {  $_ => ( $plans{$_}->{'shortname'} || $plans{$_}->{'name'} ) }
+      keys %plans;
+
+push @header, 'Pricing';
+$align .= 'r'; #?
+push @fields, sub {
+  my $part_pkg = shift;
+  (my $plan = $plan_labels{$part_pkg->plan} ) =~ s/ /&nbsp;/g;
+  my $is_recur = ( $part_pkg->freq ne '0' );
+
+  [
+    [
+      { data =>$plan,
+        align=>'center',
+        colspan=>2,
+      },
+    ],
+    [
+      { data =>$money_char.
+               sprintf('%.2f', $part_pkg->option('setup_fee') ),
+        align=>'right'
+      },
+      { data => ( $is_recur ? ' setup' : ' one-time' ),
+        align=>'left',
+      },
+    ],
+    [
+      { data=>( $is_recur
+                  ? $money_char.sprintf('%.2f ', $part_pkg->option('recur_fee') )
+                  : $part_pkg->freq_pretty
+              ),
+        align=> ( $is_recur ? 'right' : 'center' ),
+        colspan=> ( $is_recur ? 1 : 2 ),
+      },
+      ( $is_recur
+        ?  { data => ( $is_recur ? $part_pkg->freq_pretty : '' ),
+             align=>'left',
+           }
+        : ()
+      ),
+    ],
+    ( map { 
+            my $dst_pkg = $_->dst_pkg;
+            [ 
+              { data => 'Add-on:&nbsp;'.$dst_pkg->pkg_comment,
+                align=>'center', #?
+                colspan=>2,
+              }
+            ]
+          }
+      $part_pkg->bill_part_pkg_link
+    ),
+  ];
+
+#  $plan_labels{$part_pkg->plan}.'<BR>'.
+#    $money_char.sprintf('%.2f setup<BR>', $part_pkg->option('setup_fee') ).
+#    ( $part_pkg->freq ne '0'
+#      ? $money_char.sprintf('%.2f ', $part_pkg->option('recur_fee') )
+#      : ''
+#    ).
+#    $part_pkg->freq_pretty; #.'<BR>'
+};
+
 #if ( $cgi->param('active') ) {
   push @header, 'Customer<BR>packages';
   my %col = (
@@ -132,39 +198,36 @@ unless ( 0 ) { #already showing only one class or something?
   $align .= 'r';
 #}
 
-push @header, 'Frequency';
-push @fields, sub { shift->freq_pretty; };
-$align .= 'l';
-
 if ( $taxclasses ) {
   push @header, 'Taxclass';
   push @fields, sub { shift->taxclass() || '&nbsp;'; };
   $align .= 'l';
 }
 
-push @header, 'Plan',
-              'Data',
+push @header, 'Plan options',
               'Services';
               #'Service', 'Quan', 'Primary';
 
-push @fields, sub { shift->plan || '(legacy)' }, 
-
+push @fields, 
               sub {
                     my $part_pkg = shift;
                     if ( $part_pkg->plan ) {
 
+                      my %options = $part_pkg->options;
+
                       [ map { 
-                              /^(\w+)=(.*)$/; #or something;
                               [
-                                { 'data'  => $1,
+                                { 'data'  => $_,
                                   'align' => 'right',
                                 },
-                                { 'data'  => $part_pkg->format($1,$2),
+                                { 'data'  => $part_pkg->format($_,$options{$_}),
                                   'align' => 'left',
                                 },
                               ];
                             }
-                        split(/\n/, $part_pkg->plandata)
+                        grep { $options{$_} =~ /\S/ } 
+                        grep { $_ !~ /^(setup|recur)_fee$/ }
+                        keys %options
                       ];
 
                     } else {
@@ -189,7 +252,8 @@ push @fields, sub { shift->plan || '(legacy)' },
               sub {
                     my $part_pkg = shift;
 
-                    [ map  {
+                    [ 
+                      (map {
                              my $pkg_svc = $_;
                              my $part_svc = $pkg_svc->part_svc;
                              my $svc = $part_svc->svc;
@@ -214,8 +278,19 @@ push @fields, sub { shift->plan || '(legacy)' },
                       sort {     $b->primary_svc =~ /^Y/i
                              <=> $a->primary_svc =~ /^Y/i
                            }
-                           $part_pkg->pkg_svc
-
+                           $part_pkg->pkg_svc('disable_linked'=>1)
+                      ),
+                      ( map { 
+                              my $dst_pkg = $_->dst_pkg;
+                              [
+                                { data => 'Add-on:&nbsp;'.$dst_pkg->pkg_comment,
+                                  align=>'center', #?
+                                  colspan=>2,
+                                }
+                              ]
+                            }
+                        $part_pkg->svc_part_pkg_link
+                      )
                     ];
 
                   };