X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fpackage.html;h=8aa64039c5d7c846cdb5b677f89f857413ecf8d0;hb=98f6d91ec7eaa907204afbfeb90ede1e3bff656d;hp=06eb50d3435e8d9c4b4601af8378b394febab428;hpb=87a59b1bdf236765177c27ab18390ef1317cc34c;p=freeside.git diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html index 06eb50d34..8aa64039c 100644 --- a/httemplate/view/cust_main/packages/package.html +++ b/httemplate/view/cust_main/packages/package.html @@ -1,7 +1,6 @@ -
<% $opt{before_pkg_callback} @@ -10,8 +9,34 @@ %> <% $curuser->option('show_pkgnum') ? $cust_pkg->pkgnum.': ' : '' %><% $part_pkg->pkg |h %> -% my $custom_comment = $part_pkg->custom_comment('cust_pkg'=>$cust_pkg); + ><% $opt{show_pkgnum} ? $cust_pkg->pkgnum.': ' : '' %><% $part_pkg->pkg |h %> +% +% my $custom_comment; +% if ( 0 && FS::part_pkg::flat->can('price_info') eq $part_pkg->can('price_info') ) { +% #perf hack / disabled in 4.x (feature pricing / cust_pkg_usageprice incompatible, well, harder) +% +% $part_pkg->{"_$_"} = $part_pkg->option($_) || 0 +% foreach grep !defined($part_pkg->{"_$_"} ), qw(setup_fee recur_fee); +% +% my $str = ''; +% $str = $opt{money_char} . $part_pkg->{_setup_fee}. +% ($part_pkg->{_recur_fee} ? ' setup' : ' one-time') +% if $part_pkg->{_setup_fee}; +% $str .= ', ' if $part_pkg->{_setup_fee} && $part_pkg->{_recur_fee}; +% $str .= $opt{money_char}. $part_pkg->{_recur_fee}. +% '/'. $part_pkg->freq_pretty +% if $part_pkg->{_recur_fee}; +% $str; +% +% $custom_comment = +% ( $part_pkg->custom ? '(CUSTOM) ' : '' ). +% $part_pkg->comment. +% ( ($part_pkg->custom || $part_pkg->comment) ? ' - ' : '' ). +% ($str || 'No charge'); +% +% } else { +% $custom_comment = $part_pkg->custom_comment('cust_pkg'=>$cust_pkg); +% } <% $custom_comment ? ' - ' : '' %> <% $custom_comment |h %> | @@ -26,8 +51,15 @@ % # One-time charge. Nothing you can do with this, unless: % if ( $curuser->access_right('Modify one-time charge') ) { ( <%onetime_change_link($cust_pkg)%> ) -||||
<% $part->description %>: | -ALIGN="right"><% $usage->minutes %> | +ALIGN="right"><% sprintf('%.1f', $usage->minutes) %> | > / | ><% $part->minutes %> | % if ( $part->shared ) { @@ -262,6 +296,7 @@