From 60e30ddf08caa2d2c1dac05139348c9b16ce1fff Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 22 May 2017 08:53:28 -0700
Subject: [PATCH] cancel one-time packages that have not yet billed with v4
 package actions menu, RT#76057

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

diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html
index 3b39c86eb..61143413c 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     => '-',
                  },
 
-- 
2.11.0