X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fquotation_pkg.pm;h=79cce80fa959ed7112c7a60667722259aaa99f9e;hb=0692ff47a2eac65616bf24104a51e558506f1b8f;hp=b5823f450e8125aea7c164275bf455608bd48ec0;hpb=53a1130923c4905b267239c369949aadde657c7c;p=freeside.git

diff --git a/FS/FS/quotation_pkg.pm b/FS/FS/quotation_pkg.pm
index b5823f450..79cce80fa 100644
--- a/FS/FS/quotation_pkg.pm
+++ b/FS/FS/quotation_pkg.pm
@@ -1,11 +1,9 @@
 package FS::quotation_pkg;
+use base qw( FS::TemplateItem_Mixin FS::Record );
 
 use strict;
-use base qw( FS::TemplateItem_Mixin FS::Record );
 use FS::Record qw( qsearchs ); #qsearch
 use FS::part_pkg;
-use FS::cust_location;
-use FS::quotation;
 use FS::quotation_pkg_discount; #so its loaded when TemplateItem_Mixin needs it
 
 =head1 NAME
@@ -130,6 +128,8 @@ sub check {
   $self->SUPER::check;
 }
 
+#it looks redundant with a v4.x+ auto-generated method, but need to override
+# FS::TemplateItem_Mixin's version
 sub part_pkg {
   my $self = shift;
   qsearchs('part_pkg', { 'pkgpart' => $self->pkgpart } );
@@ -157,13 +157,37 @@ sub recur {
   my $self = shift;
   return '0.00' if $self->{'_NO_RECUR_KLUDGE'};
   my $part_pkg = $self->part_pkg;
-  my $recur = $part_pkg->can('base_recur') ? $part_pkg->base_recur
+  my $recur = $part_pkg->can('base_recur') ? $part_pkg->base_recur($self)
                                            : $part_pkg->option('recur_fee');
   #XXX discounts
   $recur *= $self->quantity if $self->quantity;
   sprintf('%.2f', $recur);
 }
 
+=item part_pkg_currency_option OPTIONNAME
+
+Returns a two item list consisting of the currency of this quotation's customer
+or prospect, if any, and a value for the provided option.  If the customer or
+prospect has a currency, the value is the option value the given name and the
+currency (see L<FS::part_pkg_currency>).  Otherwise, if the customer or
+prospect has no currency, is the regular option value for the given name (see
+L<FS::part_pkg_option>).
+
+=cut
+
+#false laziness w/cust_pkg->part_pkg_currency_option
+sub part_pkg_currency_option {
+  my( $self, $optionname ) = @_;
+  my $part_pkg = $self->part_pkg;
+  my $prospect_or_customer = $self->cust_main || $self->prospect_main;
+  if ( my $currency = $prospect_or_customer->currency ) {
+    ($currency, $part_pkg->part_pkg_currency_option($currency, $optionname) );
+  } else {
+    ('', $part_pkg->option($optionname) );
+  }
+}
+
+
 =item cust_bill_pkg_display [ type => TYPE ]
 
 =cut
@@ -193,13 +217,38 @@ sub cust_bill_pkg_display {
     } elsif ( $type eq 'R' ) {
       return ($recur);
     } else {
-      return ($setup, $recur);
+      #return ($setup, $recur);
+      return ($self);
     }
 
   }
 
 }
 
+=item cust_main
+
+Returns the customer (L<FS::cust_main> object).
+
+=cut
+
+sub cust_main {
+  my $self = shift;
+  my $quotation = FS::quotation->by_key($self->quotationnum) or return '';
+  $quotation->cust_main;
+}
+
+=item prospect_main
+
+Returns the prospect (L<FS::prospect_main> object).
+
+=cut
+
+sub prospect_main {
+  my $self = shift;
+  my $quotation = FS::quotation->by_key($self->quotationnum) or return '';
+  $quotation->prospect_main;
+}
+
 =back
 
 =head1 BUGS