[freeside-commits] branch FREESIDE_3_BRANCH updated. e73969a3243b7d6edf5dd0b2dd8f941e638af19a

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  e73969a3243b7d6edf5dd0b2dd8f941e638af19a (commit)
      from  32dfc94685512fd871f290a00a8b2807befa994e (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 e73969a3243b7d6edf5dd0b2dd8f941e638af19a
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jun 2 18:35:23 2014 -0700

    add prepaid-never_renew flag, RT#26274

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 898bb7f..7ede999 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -5708,6 +5708,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(-)