actionlabel => emt('Change package'),
#width => 768,
width => 960,
- height => 538,
+ height => 650,
},
{ label => 'Discount package',
- condition => sub { $part_pkg->freq ne '0'
- && ! $change_from
+ condition => sub { ! $change_from
&& ! $supplemental
&& ! $cust_pkg->get('cancel')
&& $can_discount_pkg
},
{ label => '-',
- condition => sub { $part_pkg->freq ne '0' },
+ #condition => sub { $part_pkg->freq ne '0' },
content => '-',
},
{ 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'),
{ 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',
},
{ 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 => '-',
},
"zip=;country=$countrydefault",
actionlabel => emt('Change location'),
width => 960,
- height => 530,
+ height => 650,
},
{ 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,