X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fpackage.html;h=f0ece98845097d7685e57dc4b7a9633c98a5acf6;hb=e4419db2b564c53ba0b0aa32590b22a8e114650a;hp=520305a9ad07dfb03f79f3f26c44a8d88602f192;hpb=f3e0ac2b009c4edd5692cb587ff709dac2223ebe;p=freeside.git
diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html
index 520305a9a..f0ece9884 100644
--- a/httemplate/view/cust_main/packages/package.html
+++ b/httemplate/view/cust_main/packages/package.html
@@ -1,8 +1,13 @@
-
+ | >
+
+
+ <% $opt{before_pkg_callback}
+ ? &{ $opt{before_pkg_callback} }( $cust_pkg )
+ : ''
+ %>
<% $curuser->option('show_pkgnum') ? $cust_pkg->pkgnum.': ' : '' %><% $part_pkg->pkg |h %>
@@ -11,29 +16,22 @@
|
-% if ( $cust_pkg->quantity > 1 ) {
-
-
- <% mt('Quantity:') |h %>
- <% $cust_pkg->quantity %>
- |
-
-% }
-% unless ( $cust_pkg->get('cancel') ) {
+% unless ( $cust_pkg->get('cancel') || $opt{no_links} ) {
%
-% if ( $supplemental or $part_pkg->freq eq '0' ) {
+% if ( $change_from ) {
+% # This is the target package for a future change.
+% # Nothing you can do with it besides modify/cancel the
+% # future change, and that's on the current package.
+% } elsif ( $supplemental or $part_pkg->freq eq '0' ) {
% # Supplemental packages can't be changed independently.
% # One-time charges don't need to be changed.
-% # For both of those, we only show "Edit dates", "Add comments",
+% # For both of those, we only show "Add comments",
% # and "Add invoice details".
-% if ( $curuser->access_right('Edit customer package dates') ) {
- ( <%pkg_dates_link($cust_pkg)%> )
-% }
% } else {
% # the usual case: links to change package definition,
% # discount, and customization
@@ -43,11 +41,6 @@
( <%pkg_change_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)
@@ -79,6 +72,60 @@
|
+
+
+
+
+% my $change_quan_label = 'Change quantity';
+% if ( $cust_pkg->quantity > 1 ) {
+% $change_quan_label = 'change';
+ <% mt('Quantity:') |h %>
+ <% $cust_pkg->quantity %>
+% }
+
+% if ( $curuser->access_right('Change customer package')
+% && ! $cust_pkg->get('cancel')
+% && ! $supplemental
+% && $part_pkg->freq ne '0'
+% && ! $opt{no_links}
+% && $opt{'invoice-unitprice'}
+% )
+% {
+
+ ( <% pkg_change_quantity_link($cust_pkg, $change_quan_label) %> )
+
+% }
+
+ |
+
+
+
+
+
+
+% my $change_sales_label = 'Change sales person';
+% if ( $cust_pkg->salesnum ) {
+% $change_sales_label = 'change';
+ <% mt('Sales Person:') |h %>
+ <% $cust_pkg->salesperson %>
+% }
+
+% if ( $curuser->access_right('Change customer package')
+% && ! $cust_pkg->get('cancel')
+% && ! $supplemental
+% #&& $part_pkg->freq ne '0'
+% && ! $opt{no_links}
+% )
+% {
+
+ ( <% pkg_change_salesnum_link($cust_pkg, $change_sales_label) %> )
+
+% }
+
+ |
+
+
+
% 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;
@@ -99,7 +146,7 @@
<% mt('Invoice details') |h %>
-% if ( $editi && ! $cust_pkg->get('cancel') ) {
+% if ( $editi && ! $cust_pkg->get('cancel') && ! $opt{no_links} ) {
(<& /elements/popup_link.html, {
'action' => $editlink. 'I',
'label' => emt('edit'),
@@ -121,7 +168,7 @@
% } else {
|
-% if ( $editi && ! $cust_pkg->get('cancel') ) {
+% if ( $editi && ! $cust_pkg->get('cancel') && ! $opt{no_links} ) {
( <% include('/elements/popup_link.html', {
'action' => $editlink. 'I',
@@ -143,7 +190,7 @@
|
<% mt('Comments') |h %>
-% if ( $editc ) {
+% if ( $editc && ! $opt{no_links} ) {
(<& /elements/popup_link.html, {
'action' => $editlink. 'C',
'label' => emt('edit'),
@@ -165,7 +212,7 @@
% } else {
|
-% if ( $editc ) {
+% if ( $editc && ! $opt{no_links} ) {
( <& /elements/popup_link.html, {
'action' => $editlink. 'C',
@@ -181,20 +228,11 @@
% }
-% if ( $curuser->access_right('Change customer package') and
-% !$cust_pkg->get('cancel') and
-% !$supplemental and
-% $part_pkg->freq ne '0' ) {
-
-% if ( FS::Conf->new->exists('invoice-unitprice') ) {
-
- ( <% pkg_change_quantity_link($cust_pkg) %> )
- |
-% }
-
-% }
+
+
% }
|
+
% if ( @cust_pkg_usage ) {
<% mt('Included usage') %> |
@@ -234,7 +272,21 @@ my $countrydefault = $opt{'countrydefault'} || 'US';
my $statedefault = $opt{'statedefault'}
|| ($countrydefault eq 'US' ? 'CA' : '');
+# put a marker on the left edge of this column
+# 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"!;
+}
$cust_pkg->pkgnum =~ /^(\d+)$/;
my $pkgnum = $1;
@@ -263,6 +315,8 @@ sub pkg_change_link {
'label' => emt('Change package'),
'actionlabel' => emt('Change'),
'cust_pkg' => $cust_pkg,
+ 'width' => 960,
+ 'height' => 490,
);
}
@@ -276,21 +330,34 @@ sub pkg_change_location_link {
'label' => emt('Change location'),
'actionlabel' => emt('Change'),
'cust_pkg' => $cust_pkg,
+ 'width' => 960,
+ 'height' => 490,
);
}
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_dates_link { pkg_link('edit/REAL_cust_pkg', emt('Edit dates'), @_ ); }
+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,
+ );
+}
sub pkg_discount_link {
my $cust_pkg = shift or return '';
|