[freeside-commits] freeside/httemplate/view/cust_main/packages package.html, 1.6, 1.7 status.html, 1.9, 1.10

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main/packages
In directory wavetail.420.am:/tmp/cvs-serv11953/httemplate/view/cust_main/packages

Modified Files:
	package.html status.html 
Log Message:
discounts, RT#6679

Index: status.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/packages/status.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- status.html	30 Jan 2010 08:55:11 -0000	1.9
+++ status.html	30 Jan 2010 23:00:25 -0000	1.10
@@ -304,6 +304,11 @@
               ' months remaining)'
       if $discount->months;
 
+    $label .= ' <FONT SIZE="-1">('.
+                '<A HREF="../misc/delete-cust_pkg_discount.html?'.
+                  $cust_pkg_discount->pkgdiscountnum.
+                '">remove&nbsp;discount</A>)</FONT>';
+
     $html .= pkg_status_row_colspan( $cust_pkg, $label, '',
                                      'colspan' => $opt{'colspan'},
                                      #%opt,

Index: package.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/packages/package.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- package.html	30 Jan 2010 08:55:12 -0000	1.6
+++ package.html	30 Jan 2010 23:00:24 -0000	1.7
@@ -36,6 +36,15 @@
               (&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)
+%              )
+%           {
+%             $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;)
@@ -196,6 +205,19 @@
 
 sub pkg_dates_link { pkg_link('edit/REAL_cust_pkg', 'Edit&nbsp;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;