[freeside-commits] branch FREESIDE_4_BRANCH updated. 043632428db588448f0b070fba6a1d9acaaa7918

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  043632428db588448f0b070fba6a1d9acaaa7918 (commit)
      from  c2bb052b1d8bdb731ee52713c2088752ce9c1d2e (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 043632428db588448f0b070fba6a1d9acaaa7918
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon May 15 15:36:41 2017 -0700

    start billing link for one-time charge packages ordered on hold, RT#75813

diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html
index 860cd47..3b39c86 100644
--- a/httemplate/view/cust_main/packages/package.html
+++ b/httemplate/view/cust_main/packages/package.html
@@ -262,8 +262,7 @@
                  },
 
                  { label       => 'Discount package',
-                   condition   => sub { $part_pkg->freq ne '0'
-                                         && ! $change_from
+                   condition   => sub {     ! $change_from
                                          && ! $supplemental
                                          && ! $cust_pkg->get('cancel')
                                          && $can_discount_pkg
@@ -471,12 +470,11 @@
 
                  { label       => 'Start billing',
                    acl         => 'Unsuspend customer package',
-                   condition   => sub { $part_pkg->freq ne '0'
-                                          && ! $change_from
-                                          && ! $supplemental
-                                          && ! $cust_pkg->get('cancel')
-                                          && $cust_pkg->get('susp')
-                                          && $cust_pkg->order_date == $cust_pkg->get('susp')
+                   condition   => sub {    ! $change_from
+                                        && ! $supplemental
+                                        && ! $cust_pkg->get('cancel')
+                                        && $cust_pkg->get('susp')
+                                        && $cust_pkg->order_date == $cust_pkg->get('susp')
                                       },
                    popup        => "misc/unhold_pkg.html?$plink",
                    actionlabel  => emt('Start billing'),

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

Summary of changes:
 httemplate/view/cust_main/packages/package.html |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)