X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg.pm;h=3bd559aac107b765517da3e22a0dfc58b8f5c551;hb=dd0aa1d874b7ae0571bab00b2b0fc73999990d53;hp=aa39d890b2809df722edd9c81af0b4d81777ecc0;hpb=c0e8da2f1e89729efa1032241e4239765a296514;p=freeside.git

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index aa39d890b..3bd559aac 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -14,7 +14,7 @@ use FS::type_pkgs;
 use FS::part_pkg_option;
 use FS::pkg_class;
 
-@ISA = qw( FS::Record ); # FS::option_Common ); # this can use option_Common
+@ISA = qw( FS::m2m_Common FS::Record ); # FS::option_Common ); # this can use option_Common
                                                 # when all the plandata bs is
                                                 # gone
 
@@ -81,6 +81,10 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item disabled - Disabled flag, empty or `Y'
 
+=item pay_weight - Weight (relative to credit_weight and other package definitions) that controls payment application to specific line items.
+
+=item credit_weight - Weight (relative to other package definitions) that controls credit application to specific line items.
+
 =back
 
 =head1 METHODS
@@ -307,6 +311,12 @@ FS::pkg_svc record will be updated.
 sub replace {
   my( $new, $old ) = ( shift, shift );
   my %options = @_;
+
+  # We absolutely have to have an old vs. new record to make this work.
+  if (!defined($old)) {
+    $old = qsearchs( 'part_pkg', { 'pkgpart' => $new->pkgpart } );
+  }
+
   warn "FS::part_pkg::replace called on $new to replace $old ".
        "with options %options"
     if $DEBUG;
@@ -437,6 +447,8 @@ sub check {
     || $self->ut_enum('recurtax', [ '', 'Y' ] )
     || $self->ut_textn('taxclass')
     || $self->ut_enum('disabled', [ '', 'Y' ] )
+    || $self->ut_floatn('pay_weight')
+    || $self->ut_floatn('credit_weight')
     || $self->SUPER::check
   ;
   return $error if $error;
@@ -576,20 +588,23 @@ sub freqs_href {
   #method, class method or sub? #my $self = shift;
 
   tie my %freq, 'Tie::IxHash', 
-    '0'  => '(no recurring fee)',
-    '1h' => 'hourly',
-    '1d' => 'daily',
-    '1w' => 'weekly',
-    '2w' => 'biweekly (every 2 weeks)',
-    '1'  => 'monthly',
-    '2'  => 'bimonthly (every 2 months)',
-    '3'  => 'quarterly (every 3 months)',
-    '6'  => 'semiannually (every 6 months)',
-    '12' => 'annually',
-    '24' => 'biannually (every 2 years)',
-    '36' => 'triannually (every 3 years)',
-    '48' => '(every 4 years)',
-    '60' => '(every 5 years)',
+    '0'   => '(no recurring fee)',
+    '1h'  => 'hourly',
+    '1d'  => 'daily',
+    '2d'  => 'every two days',
+    '1w'  => 'weekly',
+    '2w'  => 'biweekly (every 2 weeks)',
+    '1'   => 'monthly',
+    '45d' => 'every 45 days',
+    '2'   => 'bimonthly (every 2 months)',
+    '3'   => 'quarterly (every 3 months)',
+    '6'   => 'semiannually (every 6 months)',
+    '12'  => 'annually',
+    '13'  => 'every 13 months (annually +1 month)',
+    '24'  => 'biannually (every 2 years)',
+    '36'  => 'triannually (every 3 years)',
+    '48'  => '(every 4 years)',
+    '60'  => '(every 5 years)',
     '120' => '(every 10 years)',
   ;
 
@@ -687,7 +702,8 @@ sub option {
   my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
                      split("\n", $self->get('plandata') );
   return $plandata{$opt} if exists $plandata{$opt};
-  cluck "Package definition option $opt not found in options or plandata!\n"
+  cluck "WARNING: (pkgpart ". $self->pkgpart. ") Package def option $opt ".
+        "not found in options or plandata!\n"
     unless $ornull;
   '';
 }
@@ -801,6 +817,39 @@ sub plan_info {
   \%plans;
 }
 
+=item format OPTION DATA
+
+Returns data formatted according to the function 'format' described
+in the plan info.  Returns DATA if no such function exists.
+
+=cut
+
+sub format {
+  my ($self, $option, $data) = (shift, shift, shift);
+  if (exists($plans{$self->plan}->{fields}->{$option}{format})) {
+    &{$plans{$self->plan}->{fields}->{$option}{format}}($data);
+  }else{
+    $data;
+  }
+}
+
+=item parse OPTION DATA
+
+Returns data parsed according to the function 'parse' described
+in the plan info.  Returns DATA if no such function exists.
+
+=cut
+
+sub parse {
+  my ($self, $option, $data) = (shift, shift, shift);
+  if (exists($plans{$self->plan}->{fields}->{$option}{parse})) {
+    &{$plans{$self->plan}->{fields}->{$option}{parse}}($data);
+  }else{
+    $data;
+  }
+}
+
+
 =back
 
 =head1 NEW PLAN CLASSES