projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
884585f
)
cancel one-time packages that have not yet billed with v4 package actions menu, RT...
author
Ivan Kohler
<ivan@freeside.biz>
Mon, 22 May 2017 15:53:28 +0000
(08:53 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Mon, 22 May 2017 15:53:28 +0000
(08:53 -0700)
httemplate/view/cust_main/packages/package.html
patch
|
blob
|
history
diff --git
a/httemplate/view/cust_main/packages/package.html
b/httemplate/view/cust_main/packages/package.html
index
3b39c86
..
6114341
100644
(file)
--- a/
httemplate/view/cust_main/packages/package.html
+++ b/
httemplate/view/cust_main/packages/package.html
@@
-349,7
+349,7
@@
},
{ label => '-',
},
{ label => '-',
- condition => sub { $part_pkg->freq ne '0' },
+
#
condition => sub { $part_pkg->freq ne '0' },
content => '-',
},
content => '-',
},
@@
-522,12
+522,13
@@
{ label => 'Cancel now',
acl => 'Cancel customer package immediately',
{ 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',
popup => "misc/cancel_pkg.html?method=cancel;$plink",
actionlabel => emt('Cancel now'),
color => '#FF0000',
@@
-563,10
+564,11
@@
},
{ label => '-',
},
{ 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 => '-',
},
content => '-',
},