X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fchange_history.html;h=a781c73721b5c3e130b9d3fbeb26376000a8c929;hp=ea84b8f75608e04143900796c3fa8551eb217c79;hb=6df492990ea195513430f3a56d537e57e50b6913;hpb=d6ff3967df6ee08263023a4d35865b66bdb8a672

diff --git a/httemplate/view/cust_main/change_history.html b/httemplate/view/cust_main/change_history.html
index ea84b8f75..a781c7372 100644
--- a/httemplate/view/cust_main/change_history.html
+++ b/httemplate/view/cust_main/change_history.html
@@ -42,24 +42,35 @@ tie my %tables, 'Tie::IxHash',
   'svc_broadband'     => 'Broadband',
   'svc_external'      => 'External service',
   'svc_phone'         => 'Phone',
+  'svc_cable'         => 'Cable',
   'phone_device'      => 'Phone device',
+  'cust_pkg_discount' => 'Discount',
   #? it gets provisioned anyway 'phone_avail'         => 'Phone',
+  'cust_tag'          => 'Tag',
 ;
 
-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 @svc_tables = qw(
+  svc_acct
+  svc_domain
+  svc_www
+  svc_forward
+  svc_broadband
+  svc_external
+  svc_phone
+  svc_cable
+);
 
 my %table_join = (
-  'svc_acct'         => $svc_join,
   'radius_usergroup' => $svc_join,
-  'svc_domain'       => $svc_join,
-  'svc_www'          => $svc_join,
-  'svc_forward'      => $svc_join,
-  'svc_broadband'    => $svc_join,
-  'svc_external'     => $svc_join,
-  'svc_phone'        => $svc_join,
   'phone_device'     => $svc_join,
+  'cust_pkg_discount'=> $pkg_join,
 );
 
+%table_join = (%table_join, map { $_ => $svc_join } @svc_tables);
+
 
 # cust_main
 # cust_main_invoice
@@ -104,7 +115,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
@@ -129,6 +140,7 @@ my $newer_than = int( time - $years * 31556736 ); #60*60*24*365.24
 
 local($FS::Record::nowarn_classload) = 1;
 
+my %foundsvcs;
 foreach my $table ( keys %tables ) {
   my @items = qsearch({
     'table'     => "h_$table",
@@ -136,8 +148,56 @@ foreach my $table ( keys %tables ) {
     'hashref'   => { 'history_date' =>  { op=>'>=', value=>$newer_than }, },
     'extra_sql' => ' AND custnum = '. $cust_main->custnum,
   });
+  %foundsvcs = (%foundsvcs, map { $_->svcnum => 1 } @items)
+    if $table =~ /^svc/;
   push @history, @items;
+}
 
+### Load svcs that are no longer linked (cust_svc has been deleted)
+
+# get list of all svcs for this customer from h_cust_svc
+# could also load svcdb here by joining to part_svc on svcpart,
+#   but it would spoil database optimizations on this lookup
+my @svcnumobj = qsearch({
+  'select' => 'DISTINCT svcnum',
+  'hashref'   => { 'history_date' =>  { op=>'>=', value=>$newer_than } },
+  'table'  => 'h_cust_svc',
+  'addl_from' => 'JOIN cust_pkg USING (pkgnum)',
+  'extra_sql' => ' AND custnum = '. $cust_main->custnum,
+});
+
+# now grab those svcs explicitly 
+foreach my $svcnum ( map { $_->get('svcnum') } @svcnumobj ) {
+  # can skip the services we already found
+  next if $foundsvcs{$svcnum};
+  # grab any given h_cust_svc record for this svcnum to get svcdb
+  my $svcdbobj = qsearchs({
+    'select' => 'svcdb',
+    'hashref' => { svcnum => $svcnum },
+    'table'  => 'h_cust_svc',
+    'addl_from' => 'JOIN part_svc USING (svcpart)',
+    'extra_sql' => 'LIMIT 1',
+  });
+  unless ($svcdbobj && $svcdbobj->get('svcdb')) {
+    # don't think this ever happens, but just in case, don't break history page over it
+    warn "Could not load svcdb for svcnum $svcnum";
+    next;
+  }
+  my @items = qsearch({
+    'table'     => "h_".$svcdbobj->get('svcdb'),
+    'hashref'   => { 'history_date' =>  { op=>'>=', value=>$newer_than },
+                     'svcnum' => $svcnum },
+  });
+  push @history, @items;
 }
 
+## legacy history
+
+my @legacy_items = qsearch({
+  'table'     => 'legacy_cust_history',
+  'hashref'   => { 'history_date' =>  { op=>'>=', value=>$newer_than }, },
+  'extra_sql' => ' AND custnum = '. $cust_main->custnum,
+});
+push @history, @legacy_items;
+
 </%init>