fix discounts not appearing for one-time charge packages, RT#13654

[freeside.git] / FS / FS / part_pkg / flat.pm

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index e7220f6..d59c694 100644 (file)
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -1,14 +1,13 @@
 package FS::part_pkg::flat;
 package FS::part_pkg::flat;

-
-use strict;
-use base qw( FS::part_pkg 
-             FS::part_pkg::prorate_Mixin
+use base qw( FS::part_pkg::prorate_Mixin

              FS::part_pkg::discount_Mixin
              FS::part_pkg::discount_Mixin

+             FS::part_pkg

            );
            );

+
+use strict;

 use vars qw( %info %usage_recharge_fields @usage_recharge_fieldorder );
 use Tie::IxHash;
 use vars qw( %info %usage_recharge_fields @usage_recharge_fieldorder );
 use Tie::IxHash;

-use List::Util qw(min); # max);
-#use FS::Record qw(qsearch);
+use List::Util qw( min );

 use FS::UI::bytecount;
 use FS::Conf;
 
 use FS::UI::bytecount;
 use FS::Conf;
 


@@ -25,7 +24,7 @@ tie my %contract_years, 'Tie::IxHash', (
 %info = (
   'name' => 'Flat rate (anniversary billing)',
   'shortname' => 'Anniversary',
 %info = (
   'name' => 'Flat rate (anniversary billing)',
   'shortname' => 'Anniversary',

-  'inherit_fields' => [ 'usage_Mixin', 'global_Mixin' ],
+  'inherit_fields' => [ 'prorate_Mixin', 'usage_Mixin', 'global_Mixin' ],

   'fields' => {
     #false laziness w/voip_cdr.pm
     'recur_temporality' => { 'name' => 'Charge recurring fee for period',
   'fields' => {
     #false laziness w/voip_cdr.pm
     'recur_temporality' => { 'name' => 'Charge recurring fee for period',


@@ -56,6 +55,13 @@ tie my %contract_years, 'Tie::IxHash', (
                                     'the customer\'s next bill date',
                           'type' => 'checkbox',
                         },
                                     'the customer\'s next bill date',
                           'type' => 'checkbox',
                         },

+    'prorate_round_day' => {
+                          'name' => 'When synchronizing, round the prorated '.
+                                    'period to the nearest full day',
+                          'type' => 'checkbox',
+                        },
+    'add_full_period' => { 'disabled' => 1 }, # doesn't make sense with sync?
+

     'suspend_bill' => { 'name' => 'Continue recurring billing while suspended',
                         'type' => 'checkbox',
                       },
     'suspend_bill' => { 'name' => 'Continue recurring billing while suspended',
                         'type' => 'checkbox',
                       },


@@ -72,7 +78,8 @@ tie my %contract_years, 'Tie::IxHash', (
   'fieldorder' => [ qw( recur_temporality 
                         expire_months adjourn_months
                         contract_end_months
   'fieldorder' => [ qw( recur_temporality 
                         expire_months adjourn_months
                         contract_end_months

-                        start_1st sync_bill_date prorate_defer_bill
+                        start_1st
+                        sync_bill_date prorate_defer_bill prorate_round_day

                         suspend_bill unsuspend_adjust_bill
                         externalid ),
                   ],
                         suspend_bill unsuspend_adjust_bill
                         externalid ),
                   ],


@@ -211,11 +218,9 @@ sub is_free_options {
 
 sub is_prepaid { 0; } #no, we're postpaid
 
 
 sub is_prepaid { 0; } #no, we're postpaid
 

-#XXX discounts only on recurring fees for now (no setup/one-time or usage)
-sub can_discount {
-  my $self = shift;
-  $self->freq =~ /^\d+$/ && $self->freq > 0;
-}
+sub can_start_date { ! shift->option('start_1st', 1) }
+
+sub can_discount { 1; }

 
 sub recur_temporality {
   my $self = shift;
 
 sub recur_temporality {
   my $self = shift;