summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2011-12-23 00:04:07 +0000
committerivan <ivan>2011-12-23 00:04:07 +0000
commitf1439110b2012fff10b54a88b54e25e57365ff50 (patch)
treee84787db851345c32fc59146625c7d5c4db786c3
parent53e3b0bafcb5dee58c0f7e9505766e7e5034cdd9 (diff)
fix discount display after mysql schema change fix
-rw-r--r--FS/FS/discount.pm12
1 files changed, 10 insertions, 2 deletions
diff --git a/FS/FS/discount.pm b/FS/FS/discount.pm
index 6fc3391ca..88cbdd41c 100644
--- 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;
- $desc .= $self->percent. '% '
+
+ ( my $percent = $self->percent ) =~ s/\.0+$//;
+ $percent =~ s/(\.\d*[1-9])0+$/$1/;
+ $desc .= $percent. '% '
if $self->percent > 0;
$desc;
@@ -181,8 +184,13 @@ sub 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;
}