[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 79be33a1c66fd9ba7d2da685b3a487fff172c252

[Mark Wells]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  79be33a1c66fd9ba7d2da685b3a487fff172c252 (commit)
      from  183c7c355e3f783197457f348b99b0a14ad2e1d7 (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 79be33a1c66fd9ba7d2da685b3a487fff172c252
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Jul 10 16:52:46 2013 -0700

    show discounts in change history, #18340, backport

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(-)