X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fpackage.html;h=d6431331cf5663bc14b903863ff57d906336ae09;hp=860cd47c684eaa653218913dc8328eb6e4dd8c5b;hb=b0fd49b9efe2a4340fafa80aacf424ed81de8a66;hpb=d916a044ea5f23d8aea57da5be483d357e7f7a47

diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html
index 860cd47c6..d6431331c 100644
--- a/httemplate/view/cust_main/packages/package.html
+++ b/httemplate/view/cust_main/packages/package.html
@@ -258,12 +258,11 @@
                    actionlabel => emt('Change package'),
                    #width       => 768,
                    width       => 960,
-                   height      => 538,
+                   height      => 640,
                  },
 
                  { label       => 'Discount package',
-                   condition   => sub { $part_pkg->freq ne '0'
-                                         && ! $change_from
+                   condition   => sub {     ! $change_from
                                          && ! $supplemental
                                          && ! $cust_pkg->get('cancel')
                                          && $can_discount_pkg
@@ -350,7 +349,7 @@
                  },
 
                  { label       => '-',
-                   condition   => sub { $part_pkg->freq ne '0' },
+                   #condition   => sub { $part_pkg->freq ne '0' },
                    content     => '-',
                  },
 
@@ -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'),
@@ -524,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',
@@ -565,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     => '-',
                  },
 
@@ -589,13 +589,13 @@
                       "zip=;country=$countrydefault",
                    actionlabel => emt('Change location'),
                    width       => 960,
-                   height      => 530,
+                   height      => 640,
                  },
 
                  { label       => 'Edit location',
                    acl         => 'Change customer package',
                    condition   => sub { ! $change_from && $cust_pkg->locationnum != $cust_pkg->cust_main->ship_locationnum  },
-                   popup       => 'misc/cust_location.cgi?locationnum='.
+                   popup       => 'edit/cust_location.cgi?locationnum='.
                                     $cust_pkg->locationnum,
                    actionlabel => emt('Edit location'),
                    width       => 700,