[freeside-commits] branch master updated. 8a21d677b660e24677f6c4796f0f07a696ab8332

Ivan ivan at 420.am
Mon Jun 2 18:35:23 PDT 2014


The branch, master has been updated
       via  8a21d677b660e24677f6c4796f0f07a696ab8332 (commit)
      from  3eca5f238e3bd9c316766fd0726fae13a0bf26a3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8a21d677b660e24677f6c4796f0f07a696ab8332
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jun 2 18:35:22 2014 -0700

    add prepaid-never_renew flag, RT#26274

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 36bfa43..b198598 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -5722,6 +5722,13 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'prepaid-never_renew',
+    'section'     => 'billing',
+    'description' => 'Prepaid packages never renew.',
+    'type'        => 'checkbox',
+  },
+
   { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
diff --git a/FS/bin/freeside-prepaidd b/FS/bin/freeside-prepaidd
index c095cee..fe5b545 100644
--- a/FS/bin/freeside-prepaidd
+++ b/FS/bin/freeside-prepaidd
@@ -49,8 +49,10 @@ while (1) {
       next;
     }
 
-    if (    $cust_main->total_unapplied_payments > 0
-         || $cust_main->total_unapplied_credits > 0
+    if ( (    $cust_main->total_unapplied_payments > 0
+           || $cust_main->total_unapplied_credits > 0
+         )
+         && ! FS::Conf->new->exists('prepaid-never_renew')
        )
     {
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm            |    7 +++++++
 FS/bin/freeside-prepaidd |    6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)




More information about the freeside-commits mailing list