diff options
| author | Jeremy Davis <jeremyd@freeside.biz> | 2014-11-24 12:50:55 -0500 |
|---|---|---|
| committer | Jeremy Davis <jeremyd@freeside.biz> | 2014-11-24 12:50:55 -0500 |
| commit | 52013c89319153749cd7c485fa4a67a957abcf3f (patch) | |
| tree | 11f8470174109051382f540dba1fe3b297e6201a | |
| parent | 4a56e0d606cb6071a5830966687284b277f1fd2d (diff) | |
Ticket #32336 Unit prices not showing on quotations
| -rw-r--r-- | FS/FS/Template_Mixin.pm | 4 | ||||
| -rw-r--r-- | FS/FS/quotation_pkg.pm | 20 |
2 files changed, 24 insertions, 0 deletions
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm index 7018223b4..2fae4643d 100644 --- a/FS/FS/Template_Mixin.pm +++ b/FS/FS/Template_Mixin.pm @@ -2729,6 +2729,8 @@ sub _items_cust_bill_pkg { 'pkgnum' => $cust_bill_pkg->pkgpart, #so it displays in Ref 'description' => $description, 'amount' => sprintf("%.2f", $cust_bill_pkg->setup), + 'unit_amount' => sprintf("%.2f", $cust_bill_pkg->unitsetup), + 'quantity' => $cust_bill_pkg->quantity, 'preref_html' => ( $opt{preref_callback} ? &{ $opt{preref_callback} }( $cust_bill_pkg ) : '' @@ -2740,6 +2742,8 @@ sub _items_cust_bill_pkg { 'pkgnum' => $cust_bill_pkg->pkgpart, #so it displays in Ref 'description' => "$desc (". $cust_bill_pkg->part_pkg->freq_pretty.")", 'amount' => sprintf("%.2f", $cust_bill_pkg->recur), + 'unit_amount' => sprintf("%.2f", $cust_bill_pkg->unitrecur), + 'quantity' => $cust_bill_pkg->quantity, 'preref_html' => ( $opt{preref_callback} ? &{ $opt{preref_callback} }( $cust_bill_pkg ) : '' diff --git a/FS/FS/quotation_pkg.pm b/FS/FS/quotation_pkg.pm index 79cce80fa..33c761ef6 100644 --- a/FS/FS/quotation_pkg.pm +++ b/FS/FS/quotation_pkg.pm @@ -164,6 +164,26 @@ sub recur { sprintf('%.2f', $recur); } +sub unitsetup { + my $self = shift; + return '0.00' if $self->waive_setup eq 'Y' || $self->{'_NO_SETUP_KLUDGE'}; + my $part_pkg = $self->part_pkg; + my $setup = $part_pkg->option('setup_fee'); + + #XXX discounts + sprintf('%.2f', $setup); +} + +sub unitrecur { + my $self = shift; + return '0.00' if $self->{'_NO_RECUR_KLUDGE'}; + my $part_pkg = $self->part_pkg; + my $recur = $part_pkg->can('base_recur') ? $part_pkg->base_recur + : $part_pkg->option('recur_fee'); + #XXX discounts + sprintf('%.2f', $recur); +} + =item part_pkg_currency_option OPTIONNAME Returns a two item list consisting of the currency of this quotation's customer |