[freeside-commits] branch master updated. 60e30ddf08caa2d2c1dac05139348c9b16ce1fff

[Ivan]

The branch, master has been updated
       via  60e30ddf08caa2d2c1dac05139348c9b16ce1fff (commit)
      from  884585f495215f3728f19b6cd87796ef07ae7467 (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 60e30ddf08caa2d2c1dac05139348c9b16ce1fff
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon May 22 08:53:28 2017 -0700

    cancel one-time packages that have not yet billed with v4 package actions menu, RT#76057

diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html
index 3b39c86..6114341 100644
--- a/httemplate/view/cust_main/packages/package.html
+++ b/httemplate/view/cust_main/packages/package.html
@@ -349,7 +349,7 @@
                  },
 
                  { label       => '-',
-                   condition   => sub { $part_pkg->freq ne '0' },
+                   #condition   => sub { $part_pkg->freq ne '0' },
                    content     => '-',
                  },
 
@@ -522,12 +522,13 @@
 
                  { label       => 'Cancel now',
                    acl         => 'Cancel customer package immediately',
-                   condition   => sub { $part_pkg->freq ne '0'
-                                          && ! $change_from
-                                          && ! $supplemental
-                                          && ! $cust_pkg->change_to_pkgnum
-                                          && ! $cust_pkg->get('cancel')
-                                      },
+                   condition   => sub {
+                     ( $part_pkg->freq ne '0' || ! $cust_pkg->get('setup') )
+                       && ! $change_from
+                       && ! $supplemental
+                       && ! $cust_pkg->change_to_pkgnum
+                       && ! $cust_pkg->get('cancel')
+                   },
                    popup       => "misc/cancel_pkg.html?method=cancel;$plink",
                    actionlabel => emt('Cancel now'),
                    color       => '#FF0000',
@@ -563,10 +564,11 @@
                  },
 
                  { label       => '-',
-                   condition   => sub { $part_pkg->freq ne '0'
-                                          && ! $change_from
-                                          && ! $cust_pkg->get('cancel')
-                                      },
+                   condition   => sub {
+                     ( $part_pkg->freq ne '0' || ! $cust_pkg->get('setup') )
+                       && ! $change_from
+                       && ! $cust_pkg->get('cancel')
+                   },
                    content     => '-',
                  },
 

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

Summary of changes:
 httemplate/view/cust_main/packages/package.html |   24 ++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)