% if ( @cust_pkg_usage ) {
<TABLE CLASS="usage inv">
- <TR><TH COLSPAN=4><% mt('Included usage') %></TH></TR>
+ <TR><TH COLSPAN=4><% emt('Included usage') %></TH></TR>
% foreach my $usage (@cust_pkg_usage) {
% my $part = $usage->part_pkg_usage;
% my $ratio = 255 * ($usage->minutes / $part->minutes);
sub onetime_change_link {
my $cust_pkg = shift;
my $pkgnum = $cust_pkg->pkgnum;
- include( '/elements/popup_link-cust_pkg.html',
- 'action' => $p. "edit/quick-charge.html?change_pkgnum=$pkgnum",
- 'label' => emt('Modify one-time charge'),
- 'actionlabel' => emt('Modify'),
- 'cust_pkg' => $cust_pkg,
- 'width' => 690,
- 'height' => 440,
- );
+ '<A HREF="' . $fsurl . "edit/quick-charge.html?change_pkgnum=$pkgnum" .
+ '">' . emt('Modify one-time charge') . '</A>'
}
sub pkg_change_location_link {
'actionlabel' => emt('Change'),
'cust_pkg' => $cust_pkg,
'width' => 960,
- 'height' => 490,
+ 'height' => 530,
);
}
# figure out if this user will be able to edit either the setup or recurring
# discounts for this package
-my $can_discount_pkg = (
- $part_pkg->can_discount
- and
- ( ( $curuser->access_right(['Discount customer package', 'Waive setup fee'])
- and $cust_pkg->base_setup > 0
- and !$cust_pkg->setup
- )
- or
- ( $curuser->access_right('Discount customer package')
- and $cust_pkg->base_recur > 0
- and $cust_pkg->freq ne '0'
- )
- )
-);
+my $can_discount_pkg = 0;
+
+if ( $part_pkg->can_discount ) {
+ #looking these up individually uses the ACL cache and is a big win for lots
+ # of packages
+ my $discount = $curuser->access_right('Discount customer package');
+ my $waive = $curuser->access_right('Waive setup fee');
+
+ $can_discount_pkg =
+ ( ($discount || $waive)
+ && $cust_pkg->base_setup > 0
+ && !$cust_pkg->setup
+ or
+ ( $discount
+ && $cust_pkg->base_recur > 0
+ && $cust_pkg->freq ne '0'
+ )
+ );
+
+}
</%init>