[freeside-commits] freeside/FS/FS/part_pkg flat.pm, 1.65.2.3, 1.65.2.4

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/part_pkg
In directory wavetail.420.am:/tmp/cvs-serv21122

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	flat.pm 
Log Message:
improve pricing descriptions

Index: flat.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat.pm,v
retrieving revision 1.65.2.3
retrieving revision 1.65.2.4
diff -u -w -d -r1.65.2.3 -r1.65.2.4
--- flat.pm	24 Oct 2011 01:15:59 -0000	1.65.2.3
+++ flat.pm	22 Dec 2011 23:38:58 -0000	1.65.2.4
@@ -93,9 +93,9 @@
     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;
 }