X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fpackage.html;h=0a5305ed5e7dd8c1ec3c079a67645ecd55fa00c6;hb=ca00b528d98dbf454bae7b497c8d83ca8851724c;hp=4b56e6fc4a9aedcd12192d1ae928d93ae5d264c9;hpb=8dd53f292ccdc62a80b6da8110a8f0cb4cffae05;p=freeside.git diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html index 4b56e6fc4..0a5305ed5 100644 --- a/httemplate/view/cust_main/packages/package.html +++ b/httemplate/view/cust_main/packages/package.html @@ -1,7 +1,6 @@ -
<% $opt{before_pkg_callback}
@@ -54,10 +53,7 @@
( <%onetime_change_link($cust_pkg)%> )
% }
% # also, you can discount it
-% if ( $curuser->access_right('Discount customer package')
-% && ! scalar($cust_pkg->cust_pkg_discount_active)
-% && ! scalar($cust_pkg->part_pkg->part_pkg_discount)
-% ) {
+% if ( $can_discount_pkg ) {
( <%pkg_discount_link($cust_pkg)%> )
% }
@@ -80,14 +76,7 @@ ( <%pkg_change_link($cust_pkg)%> ) % } % -% if ( $curuser->access_right('Discount customer package') -% && $part_pkg->can_discount -% && ! scalar( @{ $cust_pkg->{_cust_pkg_discount_active} } ) -% && ( ! $opt{'term_discounts'} -% || ! scalar($cust_pkg->part_pkg->part_pkg_discount) -% ) -% ) -% { +% if ( $can_discount_pkg ) { % $br=1; ( <%pkg_discount_link($cust_pkg)%> ) % } @@ -107,7 +96,7 @@ % ) { ( <%pkg_event_link($cust_pkg)%> ) % } -% } #!$supplemental +% } # a canceled recurring package, or else no_links is in effect |
@@ -297,6 +286,7 @@