X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fpackage.html;h=d0fc182cbc76dc6c54a6a4ea675c3dc2018ec0f7;hb=c6782ab85ea83e0c78d85b8975985aac9d467f9d;hp=8cae5fdba0dbbd6933eb80b7cf54ced9e60eab94;hpb=b5c4237a34aef94976bc343c8d9e138664fc3984;p=freeside.git diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html index 8cae5fdba..d0fc182cb 100644 --- a/httemplate/view/cust_main/packages/package.html +++ b/httemplate/view/cust_main/packages/package.html @@ -1,5 +1,6 @@ - - + @@ -196,6 +229,18 @@ my $countrydefault = $opt{'countrydefault'} || 'US'; my $statedefault = $opt{'statedefault'} || ($countrydefault eq 'US' ? 'CA' : ''); +my $supplemental = $opt{'supplemental'} || 0; + +$cust_pkg->pkgnum =~ /^(\d+)$/; +my $pkgnum = $1; +my @cust_pkg_usage = qsearch({ + 'select' => 'cust_pkg_usage.*', + 'table' => 'cust_pkg_usage', + 'addl_from' => ' JOIN part_pkg_usage USING (pkgusagepart)', + 'extra_sql' => " WHERE pkgnum = $1", + 'order_by' => ' ORDER BY priority ASC, description ASC', +}); + #subroutines #false laziness w/status.html @@ -210,8 +255,8 @@ sub pkg_change_link { my $locationnum = $cust_pkg->locationnum; include( '/elements/popup_link-cust_pkg.html', 'action' => $p. "misc/change_pkg.cgi?locationnum=$locationnum", - 'label' => 'Change package', - 'actionlabel' => 'Change', + 'label' => emt('Change package'), + 'actionlabel' => emt('Change'), 'cust_pkg' => $cust_pkg, ); } @@ -223,22 +268,20 @@ sub pkg_change_location_link { 'action' => $p. "misc/change_pkg.cgi?locationnum=-1;pkgpart=$pkgpart;". "address1=;address2=;city=;county=;state=$statedefault;". "zip=;country=$countrydefault", - 'label' => 'Change location', - 'actionlabel' => 'Change', + 'label' => emt('Change location'), + 'actionlabel' => emt('Change'), 'cust_pkg' => $cust_pkg, ); } -sub pkg_dates_link { pkg_link('edit/REAL_cust_pkg', 'Edit dates', @_ ); } +sub pkg_dates_link { pkg_link('edit/REAL_cust_pkg', emt('Edit dates'), @_ ); } sub pkg_discount_link { my $cust_pkg = shift or return ''; - #my $part_pkg = shift; - #my $custnum = $cust_pkg->custnum; include( '/elements/popup_link-cust_pkg.html', 'action' => $p.'edit/cust_pkg_discount.html', - 'label' => 'Discount', - 'actionlabel' => 'Discount', + 'label' => emt('Discount'), + 'actionlabel' => emt('Discount'), 'cust_pkg' => $cust_pkg, 'width' => 616, ); @@ -251,13 +294,13 @@ sub pkg_customize_link { qq!Customize!; + qq!">!.emt('Customize').''; } sub pkg_event_link { my($cust_pkg) = @_; qq!!. - 'View package events'. + emt('View package events'). ''; }
+ -% } +% } @@ -74,27 +84,27 @@ % % if ( scalar(@invoice_detail) || scalar(@comments) || $editi || $editc ) { % -% my $editlink = $p. 'edit/cust_pkg_detail?pkgnum='. $cust_pkg->pkgnum. +% my $editlink = $p. 'edit/cust_pkg_detail.html?pkgnum='. $cust_pkg->pkgnum. % ';detailtype='; % if ( @invoice_detail ) { @@ -112,8 +122,8 @@ ( <% include('/elements/popup_link.html', { 'action' => $editlink. 'I', - 'label' => 'Add invoice details', - 'actionlabel' => 'Add invoice details', + 'label' => emt('Add invoice details'), + 'actionlabel' => emt('Add invoice details'), 'color' => '#333399', 'width' => 763, }) @@ -125,20 +135,20 @@ % if ( @comments ) { @@ -154,14 +164,14 @@ @@ -170,6 +180,7 @@ % if ( $curuser->access_right('Change customer package') and % !$cust_pkg->get('cancel') and +% !$supplemental and % !$opt{'show_location'}) {
quantity > 1 ) {
-       Quantity: +       <% mt('Quantity:') |h %> <% $cust_pkg->quantity %>
@@ -25,42 +26,51 @@ % unless ( $cust_pkg->get('cancel') ) { % -% my $br = 0; -% if ( $curuser->access_right('Change customer package') ) { -% $br=1; - ( <%pkg_change_link($cust_pkg)%> ) -% } +% if ( $supplemental ) { +% # then only show "Edit dates", "Add invoice details", and "Add +% # comments". +% if ( $curuser->access_right('Edit customer package dates') ) { + ( <%pkg_dates_link($cust_pkg)%> ) +% } +% } else { +% # the usual case +% my $br = 0; +% if ( $curuser->access_right('Change customer package') ) { +% $br=1; + ( <%pkg_change_link($cust_pkg)%> ) +% } % -% if ( $curuser->access_right('Edit customer package dates') ) { -% $br=1; - ( <%pkg_dates_link($cust_pkg)%> ) -% } +% if ( $curuser->access_right('Edit customer package dates') ) { +% $br=1; + ( <%pkg_dates_link($cust_pkg)%> ) +% } % -% if ( $curuser->access_right('Discount customer package') -% && $part_pkg->can_discount -% && ! scalar($cust_pkg->cust_pkg_discount_active) -% && ! scalar($cust_pkg->part_pkg->part_pkg_discount) -% ) -% { -% $br=1; - ( <%pkg_discount_link($cust_pkg)%> ) -% } +% if ( $curuser->access_right('Discount customer package') +% && $part_pkg->can_discount +% && ! scalar($cust_pkg->cust_pkg_discount_active) +% && ! scalar($cust_pkg->part_pkg->part_pkg_discount) +% ) +% { +% $br=1; + ( <%pkg_discount_link($cust_pkg)%> ) +% } % -% if ( $curuser->access_right('Customize customer package') ) { -% $br=1; - ( <%pkg_customize_link($cust_pkg,$part_pkg)%> ) -% } +% if ( $curuser->access_right('Customize customer package') ) { +% $br=1; + ( <%pkg_customize_link($cust_pkg,$part_pkg)%> ) +% } % - <% $br ? '
' : '' %> -% } + <% $br ? '
' : '' %> +% } -% if ( $cust_pkg->num_cust_event -% && ( $curuser->access_right('Billing event reports') -% || $curuser->access_right('View customer billing events') -% ) -% ) { - ( <%pkg_event_link($cust_pkg)%> ) -% } +% if ( $cust_pkg->num_cust_event +% && ( $curuser->access_right('Billing event reports') +% || $curuser->access_right('View customer billing events') +% ) +% ) { + ( <%pkg_event_link($cust_pkg)%> ) +% } +% } #!$supplemental
- <% include('/elements/table-grid.html') %> + <& /elements/table-grid.html &>
- Invoice details + <% mt('Invoice details') |h %> % if ( $editi && ! $cust_pkg->get('cancel') ) { - (<% include('/elements/popup_link.html', { + (<& /elements/popup_link.html, { 'action' => $editlink. 'I', - 'label' => 'edit', - 'actionlabel' => 'Edit invoice details', + 'label' => emt('edit'), + 'actionlabel' => emt('Edit invoice details'), 'color' => '#333399', 'width' => 763, - }) - %>) + } + &>) % } - <% include('/elements/table-grid.html') %> + <& /elements/table-grid.html &>
- Comments + <% mt('Comments') |h %> % if ( $editc ) { - (<% include('/elements/popup_link.html', { + (<& /elements/popup_link.html, { 'action' => $editlink. 'C', - 'label' => 'edit', - 'actionlabel' => 'Edit comments', + 'label' => emt('edit'), + 'actionlabel' => emt('Edit comments'), 'color' => '#333399', 'width' => 763, - }) - %>) + } + &>) % } % if ( $editc ) { - ( <% include('/elements/popup_link.html', { + ( <& /elements/popup_link.html, { 'action' => $editlink. 'C', - 'label' => 'Add comments', - 'actionlabel' => 'Add comments', + 'label' => emt('Add comments'), + 'actionlabel' => emt('Add comments'), 'color' => '#333399', 'width' => 763, - }) - %> ) + } + &> ) % }
@@ -179,6 +190,28 @@ % } % }
+% if ( @cust_pkg_usage ) { + + +% foreach my $usage (@cust_pkg_usage) { +% my $part = $usage->part_pkg_usage; +% my $ratio = 255 * ($usage->minutes / $part->minutes); +% $ratio = 255 if $ratio > 255; # because rollover +% my $color = sprintf('STYLE="font-weight: bold; color: #%02x%02x00"', 255 - $ratio, $ratio); +% my $trstyle = ''; +% $trstyle = ' CLASS="shared"' if $part->shared; + > + + + + +% if ( $part->shared ) { + +% } + +% } +
<% mt('Included usage') %>
<% $part->description %>: ALIGN="right"><% $usage->minutes %>> / ><% $part->minutes %>(shared)
+% }