[freeside-commits] branch master updated. d37fb0b5f49c46e0df95212ae8660a8423809305

[Mark Wells]

The branch, master has been updated
       via  d37fb0b5f49c46e0df95212ae8660a8423809305 (commit)
      from  602d22bbe08490648362a571672d89e7f944f6bd (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 d37fb0b5f49c46e0df95212ae8660a8423809305
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Apr 12 16:39:02 2013 -0700

    show discounts in change history, #18340

diff --git a/httemplate/view/cust_main/change_history.html b/httemplate/view/cust_main/change_history.html
index ea84b8f..bf32a49 100644
--- a/httemplate/view/cust_main/change_history.html
+++ b/httemplate/view/cust_main/change_history.html
@@ -43,10 +43,12 @@ tie my %tables, 'Tie::IxHash',
   'svc_external'      => 'External service',
   'svc_phone'         => 'Phone',
   'phone_device'      => 'Phone device',
+  'cust_pkg_discount' => 'Discount',
   #? it gets provisioned anyway 'phone_avail'         => 'Phone',
 ;
 
-my $svc_join = 'JOIN cust_svc USING ( svcnum ) JOIN cust_pkg USING ( pkgnum )';
+my $pkg_join = "JOIN cust_pkg USING ( pkgnum )";
+my $svc_join = "JOIN cust_svc USING ( svcnum ) $pkg_join";
 
 my %table_join = (
   'svc_acct'         => $svc_join,
@@ -58,6 +60,7 @@ my %table_join = (
   'svc_external'     => $svc_join,
   'svc_phone'        => $svc_join,
   'phone_device'     => $svc_join,
+  'cust_pkg_discount'=> $pkg_join,
 );
 
 
@@ -104,7 +107,7 @@ my $conf = new FS::Conf;
 
 my $curuser = $FS::CurrentUser::CurrentUser;
 
-die "access deined"
+die "access denied"
   unless $curuser->access_right('View customer history');
 
 # find out the beginning of this customer history, if possible

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

Summary of changes:
 httemplate/view/cust_main/change_history.html |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)