X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fpackage.html;h=1b397d851246058ef3c2a3420e839c2e2198089f;hb=4dc075fc38008d1c6cbe9b88b2bdb32bdc92adbf;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..1b397d851 100644
--- a/httemplate/view/cust_main/packages/package.html
+++ b/httemplate/view/cust_main/packages/package.html
@@ -1,7 +1,6 @@
-
>
+ |
+ <% join('', @marker ) %>
-
-
<% $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
|
@@ -276,7 +265,7 @@
% if ( @cust_pkg_usage ) {
- <% mt('Included usage') %> |
+ <% emt('Included usage') %> |
% foreach my $usage (@cust_pkg_usage) {
% my $part = $usage->part_pkg_usage;
% my $ratio = 255 * ($usage->minutes / $part->minutes);
@@ -297,6 +286,7 @@
% }
+ <% join('', map '', @marker ) %>
<%init>
@@ -317,16 +307,12 @@ my $statedefault = $opt{'statedefault'}
# if this package is somehow special
my $supplemental = $opt{'supplemental'} || 0;
my $change_from = $opt{'change_from'} || 0;
-my $style = '';
-if ( $supplemental or $change_from ) {
- $style = 'border-left-width: '.($supplemental + $change_from)*30 . 'px; '.
- 'border-color: ';
- if ( $supplemental ) {
- $style .= '#bbbbff';
- } elsif ( $change_from ) {
- $style .= '#bbffbb';
- }
- $style = qq!STYLE="$style"!;
+my @marker;
+if ( $supplemental ) {
+ push @marker, '';
+}
+if ( $change_from ) {
+ push @marker, ' ';
}
$cust_pkg->pkgnum =~ /^(\d+)$/;
@@ -364,14 +350,8 @@ sub pkg_change_link {
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,
- );
+ ' ' . emt('Modify one-time charge') . ''
}
sub pkg_change_location_link {
@@ -385,7 +365,7 @@ sub pkg_change_location_link {
'actionlabel' => emt('Change'),
'cust_pkg' => $cust_pkg,
'width' => 960,
- 'height' => 490,
+ 'height' => 530,
);
}
@@ -441,4 +421,27 @@ sub pkg_event_link {
'';
}
+# figure out if this user will be able to edit either the setup or recurring
+# discounts for this package
+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>
|