projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
possibly fix intermittent "could not receive data from server: Bad file
[freeside.git]
/
FS
/
FS
/
discount.pm
diff --git
a/FS/FS/discount.pm
b/FS/FS/discount.pm
index
6fc3391
..
88cbdd4
100644
(file)
--- a/
FS/FS/discount.pm
+++ b/
FS/FS/discount.pm
@@
-172,7
+172,10
@@
sub description_short {
my $desc = $self->name ? $self->name.': ' : '';
$desc .= $money_char. sprintf('%.2f/month ', $self->amount)
if $self->amount > 0;
my $desc = $self->name ? $self->name.': ' : '';
$desc .= $money_char. sprintf('%.2f/month ', $self->amount)
if $self->amount > 0;
- $desc .= $self->percent. '% '
+
+ ( my $percent = $self->percent ) =~ s/\.0+$//;
+ $percent =~ s/(\.\d*[1-9])0+$/$1/;
+ $desc .= $percent. '% '
if $self->percent > 0;
$desc;
if $self->percent > 0;
$desc;
@@
-181,8
+184,13
@@
sub description_short {
sub description {
my $self = shift;
my $desc = $self->description_short;
sub description {
my $self = shift;
my $desc = $self->description_short;
- $desc .= ' for '. $self->months. ' months' if $self->months;
+
+ ( my $months = $self->months ) =~ s/\.0+$//;
+ $months =~ s/(\.\d*[1-9])0+$/$1/;
+ $desc .= " for $months months" if $months;
+
$desc .= ', applies to setup' if $self->setup;
$desc .= ', applies to setup' if $self->setup;
+
$desc;
}
$desc;
}