X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fsubscription.pm;h=a5e02622472979ebf39b85c1602c210e01dc7d22;hb=2946a850409f34e56fc484e940a2f938101fb60e;hp=3e5a41669e5b35bc3328a1916d2f2fd4c9171763;hpb=093fbb43eb8cfa3f94c8416ac9d2b7b078d8ee18;p=freeside.git

diff --git a/FS/FS/part_pkg/subscription.pm b/FS/FS/part_pkg/subscription.pm
index 3e5a41669..a5e026224 100644
--- a/FS/FS/part_pkg/subscription.pm
+++ b/FS/FS/part_pkg/subscription.pm
@@ -10,6 +10,7 @@ use FS::part_pkg::flat;
 
 %info = (
   'name' => 'First partial month full charge, then flat-rate (selectable billing day)',
+  'shortname' => 'Subscription (Nth of month, full charge for first)',
   'fields' => {
     'setup_fee' => { 'name' => 'Setup fee for this package',
                      'default' => 0,
@@ -70,6 +71,11 @@ use FS::part_pkg::flat;
 			            'over into current period',
 			  'type' => 'checkbox',
                         },
+    'recharge_reset' => { 'name' => 'Reset usage to these values on manual '.
+                                    'package recharge',
+                          'type' => 'checkbox',
+                        },
+
     #it would be better if this had to be turned on, its confusing
     'externalid' => { 'name'   => 'Optional External ID',
                       'default' => '',
@@ -79,19 +85,13 @@ use FS::part_pkg::flat;
                     'upbytes', 'downbytes', 'totalbytes',
                     'recharge_amount', 'recharge_seconds', 'recharge_upbytes',
                     'recharge_downbytes', 'recharge_totalbytes',
-                    'externalid' ],
-  'fieldorder' => [ 'setup_fee', 'recur_fee','cutoff_day', 'seconds',
-                    'upbytes', 'downbytes', 'totalbytes',
-                    'recharge_amount', 'recharge_seconds', 'recharge_upbytes',
-                    'recharge_downbytes', 'recharge_totalbytes',
-                    'usage_rollover',
-                   ],
+                    'usage_rollover', 'recharge_reset', 'externalid' ],
   'freq' => 'm',
   'weight' => 30,
 );
 
 sub calc_recur {
-  my($self, $cust_pkg, $sdate ) = @_;
+  my($self, $cust_pkg, $sdate, $details, $param ) = @_;
   my $cutoff_day = $self->option('cutoff_day', 1) || 1;
   my $mnow = $$sdate;
   my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
@@ -103,7 +103,11 @@ sub calc_recur {
 
   $$sdate = timelocal(0,0,0,$cutoff_day,$mon,$year);
 
-  $self->option('recur_fee');
+  my $br = $self->base_recur($cust_pkg);
+
+  my $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param);
+
+  sprintf('%.2f', $br - $discount);
 }
 
 1;