X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fpackage.html;h=3a362b6fa987aabf07ae92681526eeb9d509545f;hb=a65d16767bcaa1077be0f41568a4349c9db18990;hp=d6cee73d0faf5271a002821f2cb225471f3290e8;hpb=7ef2ddadbd35cad8b9e65a3682e870230e5f8c89;p=freeside.git

diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html
index d6cee73d0..3a362b6fa 100644
--- a/httemplate/view/cust_main/packages/package.html
+++ b/httemplate/view/cust_main/packages/package.html
@@ -1,5 +1,6 @@
-<TD CLASS="inv" BGCOLOR="<% $bgcolor %>" VALIGN="top">
-  <TABLE CLASS="inv" BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%">
+<TD CLASS="inv package" BGCOLOR="<% $bgcolor %>" VALIGN="top"
+  STYLE="border-left-width: <% $supplemental * 30 %>px">
+  <TABLE CLASS="inv package"> 
     <TR>
       <TD COLSPAN=2>
         <A NAME="cust_pkg<% $cust_pkg->pkgnum %>"
@@ -17,7 +18,7 @@
         <B><% $cust_pkg->quantity %></B>
       </TD>
     </TR>
-%  }
+% }
 
     <TR>
       <TD COLSPAN=2>
@@ -25,42 +26,51 @@
 
 %         unless ( $cust_pkg->get('cancel') ) { 
 %
-%           my $br = 0;
-%           if ( $curuser->access_right('Change customer package') ) {
-%             $br=1;
-              (&nbsp;<%pkg_change_link($cust_pkg)%>&nbsp;)
-%           } 
+%           if ( $supplemental ) {
+%             # then only show "Edit dates", "Add invoice details", and "Add
+%             # comments".
+%             if ( $curuser->access_right('Edit customer package dates') ) {
+                (&nbsp;<%pkg_dates_link($cust_pkg)%>&nbsp;)
+%             }
+%           } else {
+%             # the usual case
+%             my $br = 0;
+%             if ( $curuser->access_right('Change customer package') ) {
+%               $br=1;
+                (&nbsp;<%pkg_change_link($cust_pkg)%>&nbsp;)
+%             } 
 %
-%           if ( $curuser->access_right('Edit customer package dates') ) {
-%             $br=1;
-              (&nbsp;<%pkg_dates_link($cust_pkg)%>&nbsp;)
-%           } 
+%             if ( $curuser->access_right('Edit customer package dates') ) {
+%               $br=1;
+                (&nbsp;<%pkg_dates_link($cust_pkg)%>&nbsp;)
+%             } 
 %
-%           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;
-              (&nbsp;<%pkg_discount_link($cust_pkg)%>&nbsp;)
-%           }
+%             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;
+                (&nbsp;<%pkg_discount_link($cust_pkg)%>&nbsp;)
+%             }
 %
-%           if ( $curuser->access_right('Customize customer package') ) {
-%             $br=1;
-              (&nbsp;<%pkg_customize_link($cust_pkg,$part_pkg)%>&nbsp;)
-%           } 
+%             if ( $curuser->access_right('Customize customer package') ) {
+%               $br=1;
+                (&nbsp;<%pkg_customize_link($cust_pkg,$part_pkg)%>&nbsp;)
+%             } 
 %
-            <% $br ? '<BR>' : '' %>
-%         } 
+              <% $br ? '<BR>' : '' %>
+%           } 
 
-%         if ( $cust_pkg->num_cust_event
-%              && (    $curuser->access_right('Billing event reports')
-%                   || $curuser->access_right('View customer billing events')
-%                 )
-%            ) {
-            (&nbsp;<%pkg_event_link($cust_pkg)%>&nbsp;)
-%         }
+%           if ( $cust_pkg->num_cust_event
+%                && (    $curuser->access_right('Billing event reports')
+%                     || $curuser->access_right('View customer billing events')
+%                   )
+%              ) {
+              (&nbsp;<%pkg_event_link($cust_pkg)%>&nbsp;)
+%           }
+%         } #!$supplemental
 
         </FONT>
       </TD>
@@ -74,7 +84,7 @@
 %
 %   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=';
 
       <TR>
@@ -89,8 +99,8 @@
 %                   if ( $editi && ! $cust_pkg->get('cancel') ) {
                       (<& /elements/popup_link.html, { 
                                     'action'      => $editlink. 'I',
-                                    'label'       => mt('edit'),
-                                    'actionlabel' => mt('Edit invoice details'),
+                                    'label'       => emt('edit'),
+                                    'actionlabel' => emt('Edit invoice details'),
                                     'color'       => '#333399',
                                     'width'       => 763,
                                  }
@@ -112,8 +122,8 @@
               <FONT SIZE="-1">
                 (&nbsp;<% include('/elements/popup_link.html', { 
                                'action'      => $editlink. 'I',
-                               'label'       => mt('Add invoice details'),
-                               'actionlabel' => mt('Add invoice details'),
+                               'label'       => emt('Add invoice details'),
+                               'actionlabel' => emt('Add invoice details'),
                                'color'       => '#333399',
                                'width'       => 763,
                             })
@@ -133,8 +143,8 @@
 %                   if ( $editc ) {
                       (<& /elements/popup_link.html, { 
                                     'action'      => $editlink. 'C',
-                                    'label'       => mt('edit'),
-                                    'actionlabel' => mt('Edit comments'),
+                                    'label'       => emt('edit'),
+                                    'actionlabel' => emt('Edit comments'),
                                     'color'       => '#333399',
                                     'width'       => 763,
                                  }
@@ -156,8 +166,8 @@
               <FONT SIZE="-1">
                 (&nbsp;<& /elements/popup_link.html, { 
                                'action'      => $editlink. 'C',
-                               'label'       => mt('Add comments'),
-                               'actionlabel' => mt('Add comments'),
+                               'label'       => emt('Add comments'),
+                               'actionlabel' => emt('Add comments'),
                                'color'       => '#333399',
                                'width'       => 763,
                             }
@@ -170,6 +180,7 @@
       </TR>
 %     if ( $curuser->access_right('Change customer package') and 
 %           !$cust_pkg->get('cancel') and
+%           !$supplemental and
 %           !$opt{'show_location'}) {
       <TR>
         <TD><FONT SIZE="-1">
@@ -196,6 +207,7 @@ my $countrydefault = $opt{'countrydefault'} || 'US';
 my $statedefault   = $opt{'statedefault'}
                      || ($countrydefault eq 'US' ? 'CA' : '');
 
+my $supplemental = $opt{'supplemental'} || 0;
 #subroutines
 
 #false laziness w/status.html
@@ -210,8 +222,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'       => mt('Change package'),
-    'actionlabel' => mt('Change'),
+    'label'       => emt('Change package'),
+    'actionlabel' => emt('Change'),
     'cust_pkg'    => $cust_pkg,
   );
 }
@@ -223,22 +235,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'       => mt('Change location'),
-    'actionlabel' => mt('Change'),
+    'label'       => emt('Change location'),
+    'actionlabel' => emt('Change'),
     'cust_pkg'    => $cust_pkg,
   );
 }
 
-sub pkg_dates_link { pkg_link('edit/REAL_cust_pkg', 'Edit&nbsp;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'       => mt('Discount'),
-    'actionlabel' => mt('Discount'),
+    'label'       => emt('Discount'),
+    'actionlabel' => emt('Discount'),
     'cust_pkg'    => $cust_pkg,
     'width'       => 616,
   );
@@ -251,13 +261,13 @@ sub pkg_customize_link {
   qq!<A HREF="${p}edit/part_pkg.cgi?!.
     "clone=". $part_pkg->pkgpart. ';'.
     "pkgnum=". $cust_pkg->pkgnum.
-    qq!">!.mt('Customize').'</A>';
+    qq!">!.emt('Customize').'</A>';
 }
 
 sub pkg_event_link {
   my($cust_pkg) = @_;
   qq!<a href="${p}search/cust_event.html?pkgnum=!. $cust_pkg->pkgnum. qq!">!.
-  mt('View package events').
+  emt('View package events').
   '</a>';
 }