X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fpackage.html;h=8cae5fdba0dbbd6933eb80b7cf54ced9e60eab94;hb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;hp=b07e1af94556b1ea36b5ded5dd6fca8caddd82a6;hpb=705f7d564546e7211844773f3566a89f0ae87a2c;p=freeside.git
diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html
index b07e1af94..8cae5fdba 100644
--- a/httemplate/view/cust_main/packages/package.html
+++ b/httemplate/view/cust_main/packages/package.html
@@ -1,4 +1,4 @@
-
+ |
@@ -6,7 +6,7 @@
ID ="cust_pkg<% $cust_pkg->pkgnum %>"
><% $curuser->option('show_pkgnum') ? $cust_pkg->pkgnum.': ' : '' %><% $part_pkg->pkg |h %>
-
- <% $part_pkg->comment |h %>
+ <% $part_pkg->custom_comment |h %>
|
@@ -36,9 +36,19 @@
( <%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('Customize customer package') ) {
% $br=1;
- ( <%pkg_customize_link($cust_pkg,$cust_pkg->custnum)%> )
+ ( <%pkg_customize_link($cust_pkg,$part_pkg)%> )
% }
%
<% $br ? ' ' : '' %>
@@ -58,18 +68,18 @@
% 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;
+% my @invoice_detail = grep { $_->detailtype eq 'I' } @cust_pkg_detail;
+% my @comments = grep { $_->detailtype eq 'C' } @cust_pkg_detail;
%
-% if ( $cust_pkg->cust_pkg_detail('I')
-% || $cust_pkg->cust_pkg_detail('C')
-% || $editi
-% || $editc ) {
+% if ( scalar(@invoice_detail) || scalar(@comments) || $editi || $editc ) {
%
% my $editlink = $p. 'edit/cust_pkg_detail?pkgnum='. $cust_pkg->pkgnum.
% ';detailtype=';
-% if ( $cust_pkg->cust_pkg_detail('I') ) {
+% if ( @invoice_detail ) {
<% include('/elements/table-grid.html') %>
|
@@ -89,7 +99,7 @@
-% foreach my $cust_pkg_detail ( $cust_pkg->cust_pkg_detail('I') ) {
+% foreach my $cust_pkg_detail ( @invoice_detail ) {
- <% $cust_pkg_detail->detail |h %> |
@@ -113,7 +123,7 @@
% }
-% if ( $cust_pkg->cust_pkg_detail('C') ) {
+% if ( @comments ) {
<% include('/elements/table-grid.html') %>
|
@@ -133,7 +143,7 @@
-% foreach my $cust_pkg_detail ( $cust_pkg->cust_pkg_detail('C') ) {
+% foreach my $cust_pkg_detail ( @comments ) {
- <% $cust_pkg_detail->detail |h %> |
@@ -158,8 +168,16 @@
% }
+% if ( $curuser->access_right('Change customer package') and
+% !$cust_pkg->get('cancel') and
+% !$opt{'show_location'}) {
+
+
+ ( <% pkg_change_location_link($cust_pkg) %> )
+ |
+
+% }
% }
-
|
@@ -174,6 +192,10 @@ my $part_pkg = $opt{'part_pkg'};
my $curuser = $FS::CurrentUser::CurrentUser;
+my $countrydefault = $opt{'countrydefault'} || 'US';
+my $statedefault = $opt{'statedefault'}
+ || ($countrydefault eq 'US' ? 'CA' : '');
+
#subroutines
#false laziness w/status.html
@@ -194,13 +216,40 @@ sub pkg_change_link {
);
}
+sub pkg_change_location_link {
+ my $cust_pkg = shift;
+ my $pkgpart = $cust_pkg->pkgpart;
+ include( '/elements/popup_link-cust_pkg.html',
+ 'action' => $p. "misc/change_pkg.cgi?locationnum=-1;pkgpart=$pkgpart;".
+ "address1=;address2=;city=;county=;state=$statedefault;".
+ "zip=;country=$countrydefault",
+ 'label' => 'Change location',
+ 'actionlabel' => 'Change',
+ 'cust_pkg' => $cust_pkg,
+ );
+}
+
sub pkg_dates_link { pkg_link('edit/REAL_cust_pkg', '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',
+ 'cust_pkg' => $cust_pkg,
+ 'width' => 616,
+ );
+}
+
sub pkg_customize_link {
my $cust_pkg = shift or return '';
+ my $part_pkg = shift;
my $custnum = $cust_pkg->custnum;
qq!Customize!;
}