From: ivan <ivan>
Date: Thu, 22 Dec 2011 23:38:58 +0000 (+0000)
Subject: improve pricing descriptions
X-Git-Tag: freeside_2_3_1~58
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=b8baeb2b7fb88b2b17740bedb379ec41d04de358;hp=01b97fadef6e2beb3b4bdbfd3674c8eb31794e98

improve pricing descriptions
---

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index d59c694b1..0463b10bd 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -93,9 +93,9 @@ sub price_info {
     my $setup = $self->option('setup_fee') || 0;
     my $recur = $self->option('recur_fee', 1) || 0;
     my $str = '';
-    $str = $money_char . $setup . ' one-time' if $setup;
+    $str = $money_char . $setup . ($recur ? ' setup ' : ' one-time') if $setup;
     $str .= ', ' if ($setup && $recur);
-    $str .= $money_char . $recur . ' recurring ' if $recur;
+    $str .= $money_char. $recur. '/'. $self->freq_pretty if $recur;
     $str;
 }