diff options
Diffstat (limited to 'httemplate/view')
| -rw-r--r-- | httemplate/view/cust_main/packages/package.html | 100 | ||||
| -rwxr-xr-x | httemplate/view/cust_main/packages/section.html | 3 |
2 files changed, 77 insertions, 26 deletions
diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html index 5fad2d668..b29fedcbd 100644 --- a/httemplate/view/cust_main/packages/package.html +++ b/httemplate/view/cust_main/packages/package.html @@ -1,5 +1,7 @@ <TD CLASS="inv package" BGCOLOR="<% $bgcolor %>" VALIGN="top" <%$style%>> <TABLE CLASS="inv package"> + + <TR> <TD COLSPAN=2> <% $opt{before_pkg_callback} @@ -14,14 +16,6 @@ </TD> </TR> -% if ( $cust_pkg->quantity > 1 ) { - <TR> - <TD COLSPAN=2> - <% mt('Quantity:') |h %> - <B><% $cust_pkg->quantity %></B> - </TD> - </TR> -% } <TR> <TD COLSPAN=2> @@ -86,6 +80,60 @@ </TD> </TR> + + <TR> + <TD COLSPAN=2> + +% my $change_quan_label = 'Change quantity'; +% if ( $cust_pkg->quantity > 1 ) { +% $change_quan_label = 'change'; + <% mt('Quantity:') |h %> + <B><% $cust_pkg->quantity %></B> +% } + +% if ( $curuser->access_right('Change customer package') +% && ! $cust_pkg->get('cancel') +% && ! $supplemental +% && $part_pkg->freq ne '0' +% && ! $opt{no_links} +% && $opt{'invoice-unitprice'} +% ) +% { + <FONT SIZE="-1"> + ( <% pkg_change_quantity_link($cust_pkg, $change_quan_label) %> ) + </FONT> +% } + + </TD> + </TR> + + + <TR> + <TD COLSPAN=2> + +% my $change_sales_label = 'Change sales person'; +% if ( $cust_pkg->salesnum ) { +% $change_sales_label = 'change'; + <% mt('Sales Person:') |h %> + <B><% $cust_pkg->salesperson %></B> +% } + +% if ( $curuser->access_right('Change customer package') +% && ! $cust_pkg->get('cancel') +% && ! $supplemental +% #&& $part_pkg->freq ne '0' +% && ! $opt{no_links} +% ) +% { + <FONT SIZE="-1"> + ( <% pkg_change_salesnum_link($cust_pkg, $change_sales_label) %> ) + </FONT> +% } + + </TD> + </TR> + + % my $editi = $curuser->access_right('Edit customer package invoice details'); % my $editc = $curuser->access_right('Edit customer package comments'); % my @cust_pkg_detail = $cust_pkg->cust_pkg_detail; @@ -188,24 +236,11 @@ % } </TR> -% if ( $curuser->access_right('Change customer package') -% && ! $cust_pkg->get('cancel') -% && ! $supplemental -% && $part_pkg->freq ne '0' -% && ! $opt{no_links} -% ) -% { - <TR> -% # yeah, I guess we'll let you do this on a future change package -% if ( FS::Conf->new->exists('invoice-unitprice') ) { - <TD><FONT SIZE="-1"> - ( <% pkg_change_quantity_link($cust_pkg) %> ) - </FONT></TD> -% } - </TR> -% } + + % } </TABLE> + % if ( @cust_pkg_usage ) { <TABLE CLASS="usage inv"> <TR><TH COLSPAN=4><% mt('Included usage') %></TH></TR> @@ -309,11 +344,24 @@ sub pkg_change_location_link { } sub pkg_change_quantity_link { + my( $cust_pkg, $label ) = @_; include( '/elements/popup_link-cust_pkg.html', 'action' => $p. 'edit/cust_pkg_quantity.html?', - 'label' => emt('Change quantity'), + 'label' => emt($label), 'actionlabel' => emt('Change'), - 'cust_pkg' => shift, + 'cust_pkg' => $cust_pkg, + 'width' => 390, + 'height' => 220, + ); +} + +sub pkg_change_salesnum_link { + my( $cust_pkg, $label ) = @_; + include( '/elements/popup_link-cust_pkg.html', + 'action' => $p. 'edit/cust_pkg_salesnum.html?', + 'label' => emt($label), + 'actionlabel' => emt('Change'), + 'cust_pkg' => $cust_pkg, 'width' => 390, 'height' => 220, ); diff --git a/httemplate/view/cust_main/packages/section.html b/httemplate/view/cust_main/packages/section.html index 0383fe892..152ccaa5d 100755 --- a/httemplate/view/cust_main/packages/section.html +++ b/httemplate/view/cust_main/packages/section.html @@ -77,6 +77,9 @@ my $pkg_attached = ( scalar(keys %change_custnum) == 1 my $countrydefault = scalar($conf->config('countrydefault')) || 'US'; my %conf_opt = ( + #for package.html + 'invoice-unitprice' => $conf->exists('invoice-unitprice'), + #for services.html and status.html 'cust_pkg-display_times' => ($conf->exists('cust_pkg-display_times') || $curuser->option('cust_pkg-display_times')), |