X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fflat.pm;h=04d761b16ca5b348bc6c08610da64e7cd6276778;hp=8844991cd396fd12fb662d6cfae3ee0010117ce0;hb=156e74067cc8723e187dfd9c5aa7ff956306fe01;hpb=99670c0a0b72b05d09f948027b50cd8e9850ad37

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index 8844991cd..04d761b16 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -5,7 +5,10 @@ use base qw( FS::part_pkg::prorate_Mixin
            );
 
 use strict;
-use vars qw( %info %usage_recharge_fields @usage_recharge_fieldorder );
+use vars qw( $conf $money_char %info
+             %usage_recharge_fields @usage_recharge_fieldorder
+           );
+use FS::UID;
 use FS::Record qw( qsearch );
 use FS::cust_credit_source_bill_pkg;
 use Tie::IxHash;
@@ -13,6 +16,12 @@ use List::Util qw( min );
 use FS::UI::bytecount;
 use FS::Conf;
 
+#ask FS::UID to run this stuff for us later
+FS::UID->install_callback( sub {
+  $conf = new FS::Conf;
+  $money_char = $conf->config('money_char') || '$';
+});
+
 tie my %temporalities, 'Tie::IxHash',
   'upcoming'  => "Upcoming (future)",
   'preceding' => "Preceding (past)",
@@ -86,20 +95,20 @@ tie my %contract_years, 'Tie::IxHash', (
 );
 
 sub price_info {
-    my $self = shift;
-    my %opt = @_;
-    my $conf = new FS::Conf;
-    my $money_char = $conf->config('money_char') || '$';
-    my $setup = $opt{cust_pkg} ? $self->base_setup( $opt{cust_pkg} )
-                               : ($self->option('setup_fee') || 0);
-    my $recur = $opt{cust_pkg} ? $self->base_recur( $opt{cust_pkg} )
-                               : ($self->option('recur_fee', 1) || 0);
-    $recur += $self->usageprice_recur( $opt{cust_pkg} ) if $opt{cust_pkg};
-    my $str = '';
-    $str = $money_char . $setup . ($recur ? ' setup' : ' one-time') if $setup;
-    $str .= ', ' if ($setup && $recur);
-    $str .= $money_char. $recur. '/'. $self->freq_pretty if $recur;
-    $str;
+  my $self = shift;
+  my %opt = @_;
+
+  my $setup = $opt{cust_pkg} ? $self->base_setup( $opt{cust_pkg} )
+                             : ($self->option('setup_fee') || 0);
+  my $recur = $opt{cust_pkg} ? $self->base_recur( $opt{cust_pkg} )
+                             : ($self->option('recur_fee', 1) || 0);
+  $recur += $self->usageprice_recur( $opt{cust_pkg} ) if $opt{cust_pkg};
+
+  my $str = '';
+  $str = $money_char . $setup . ($recur ? ' setup' : ' one-time') if $setup;
+  $str .= ', ' if ($setup && $recur);
+  $str .= $money_char. $recur. '/'. $self->freq_pretty if $recur;
+  $str;
 }
 
 sub calc_setup {
@@ -210,7 +219,6 @@ sub usageprice_recur {
 
 sub calc_cancel {
   my $self = shift;
-  my $conf = new FS::Conf;
   if ( $self->recur_temporality eq 'preceding'
        and $self->option('bill_recur_on_cancel', 1) ) {
     # run another recurring cycle