[freeside-commits] branch FREESIDE_3_BRANCH updated. 7073aa63c742fc4d6f723bb8c2032e6579a22d49

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  7073aa63c742fc4d6f723bb8c2032e6579a22d49 (commit)
      from  b85a720cb3605855f685c8af1dce98c7b1658b4b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7073aa63c742fc4d6f723bb8c2032e6579a22d49
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Jan 16 12:17:16 2015 -0800

    allow discounting one-time charges, fix from #18330

diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html
index 99e40df..f7d7c24 100644
--- a/httemplate/view/cust_main/packages/package.html
+++ b/httemplate/view/cust_main/packages/package.html
@@ -51,8 +51,15 @@
 %           # One-time charge.  Nothing you can do with this, unless:
 %           if ( $curuser->access_right('Modify one-time charge') ) {
                 ( <%onetime_change_link($cust_pkg)%> )
-                <BR>
 %           }
+%           # also, you can discount it
+%           if ( $curuser->access_right('Discount customer package')
+%                && ! scalar($cust_pkg->cust_pkg_discount_active)
+%                && ! scalar($cust_pkg->part_pkg->part_pkg_discount)
+%              ) {
+              ( <%pkg_discount_link($cust_pkg)%> )
+%           }
+          <BR>
 %
 %         } elsif ( !$cust_pkg->get('cancel') and !$opt{no_links} ) {
 %           
@@ -65,6 +72,7 @@
 %             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

-----------------------------------------------------------------------

Summary of changes:
 httemplate/view/cust_main/packages/package.html |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)