X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fchange_history_common.html;h=e228e65555e752f3a1d12aa461a97da70d3e1609;hb=3fc0a546caf38b444b63744726c5080ce5d9bbbb;hp=34ce70b6cba2330f5b2c67c84c8119ad462b7d12;hpb=ded0ab5cac02f099b387de360fb6dd6bd8cbb6b4;p=freeside.git

diff --git a/httemplate/elements/change_history_common.html b/httemplate/elements/change_history_common.html
index 34ce70b6c..e228e6555 100644
--- a/httemplate/elements/change_history_common.html
+++ b/httemplate/elements/change_history_common.html
@@ -3,6 +3,7 @@
 %   my $bgcolor2 = '#ffffff';
 %   my $bgcolor = '';
 
+<THEAD>
 <TR>
   <TH CLASS="grid" BGCOLOR="#cccccc">User</TH>
   <TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
@@ -14,11 +15,12 @@
   <TH CLASS="grid" BGCOLOR="#cccccc">Action</TH>
   <TH CLASS="grid" BGCOLOR="#cccccc">Description</TH>
 </TR>
+</THEAD>
 
 % foreach my $item ( @history ) {
 %   my $history_other = '';
 %   my $act  = $item->history_action;
-%   if ( $act =~ /^replace/ ) {
+%   if ( $act =~ /^replace/ && $item->table ne 'legacy_cust_history' ) {
 %     my $pkey = $item->primary_key;
 %     my $date = $item->history_date;
 %     $history_other = qsearchs({
@@ -44,18 +46,29 @@
 %   }
 
   <TR>
+
     <TD ALIGN="left" CLASS="grid" BGCOLOR="<% $bgcolor %>">
-%     my $otaker = $item->history_user;
+%     my $otaker = '';
+%     if ( $item->history_usernum ) {
+%       $access_user{ $item->history_usernum } ||=
+%         FS::access_user->by_key( $item->history_usernum );
+%       $otaker = $access_user{ $item->history_usernum }->username
+%         if $access_user{ $item->history_usernum };
+%     }
+%     $otaker ||= $item->history_user;
 %     $otaker = '<i>auto billing</i>'          if $otaker eq 'fs_daily';
 %     $otaker = '<i>customer self-service</i>' if $otaker eq 'fs_selfservice';
 %     $otaker = '<i>job queue</i>'             if $otaker eq 'fs_queue';
+%     $otaker = '<i>system bootstrap user</i>' if $otaker eq 'fs_bootstrap';
       <% $otaker %>
     </TD>
+
     <TD ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
 %     my $d = time2str('%b %o, %Y', $item->history_date );
 %     $d =~ s/ /&nbsp;/g;
       <% $d %>
     </TD>
+
     <TD ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
 %     my $t = time2str('%r', $item->history_date );
 %     $t =~ s/ /&nbsp;/g;
@@ -72,41 +85,53 @@
 
     <TD ALIGN="center" CLASS="grid" BGCOLOR="<% $bgcolor %>">
 %       my $label = '';
-%       $label = $item->table;
-%       $label =~ s/^h_//;
-%       $label = $tables{$label};
-% if ( $single_cust ) {
-%     $label = &{ $h_table_labelsub{$item->table} }( $item, $label )
-%       if $h_table_labelsub{$item->table};
-% }
+%       if ( $item->table eq 'legacy_cust_history' ) {
+%         $label = $item->item;
+%       } else {
+%         $label = $item->table;
+%         $label =~ s/^h_//;
+%         $label = $tables{$label};
+%         $label = &{ $h_table_labelsub{$item->table} }( $item, $label )
+%           if $single_cust && $h_table_labelsub{$item->table};
+%       }
       <% $label %>
     </TD>
+
     <TD ALIGN="left" CLASS="grid" BGCOLOR="<% $bgcolor %>">
-      <% $action{$item->history_action} %>
+      <% $action{$item->history_action} || ucfirst($item->history_action) |h %>
     </TD>
+
     <TD ALIGN="left" CLASS="grid" BGCOLOR="<% $bgcolor %>">
-      <% join(', ',
-           map  { my $value = ( $_ =~ /(^pay(info|cvv)|^ss|_password)$/ ) 
-                                ? 'N/A'
-                                : $item->get($_);
-                  $value = time2str($cust_pkg_date_format, $value)
-                   if $item->table eq 'h_cust_pkg'
-                   && $cust_pkg_date_fields{$_}
-                   && $value;
-
-                  $value = substr($value, 0, 77).'...' if length($value) > 80;
-                  $value = encode_entities($value);
-                  "<I>$_</I>:<B>$value</B>";
-                }
-           grep { $history_other
-                    ? ( $item->get($_) ne $history_other->get($_) )
-                    : ( $item->get($_) =~ /\S/ )
-                }
-           grep { ! /^(history|custnum$)/i }
-                $item->fields
-         )
-      %>
+%     if ( $item->table eq 'legacy_cust_history' ) {
+        <% $item->description |h %>
+%     } else {
+        <% join(', ',
+             map  { my $value = ( $_ =~ /(^pay(info|cvv)|^ss|_password)$/ ) 
+                                  ? 'N/A'
+                                  : $item->get($_);
+                    $value = time2str($cust_pkg_date_format, $value)
+                     if $item->table eq 'h_cust_pkg'
+                     && $cust_pkg_date_fields{$_}
+                     && $value;
+
+                    $value = substr($value, 0, 77).'...' if length($value) > 80;
+                    $value = encode_entities($value);
+                    "<I>$_</I>:<B>$value</B>";
+                  }
+             grep { $history_other
+                      ? ( $item->get($_) ne $history_other->get($_) )
+                      : ( $item->get($_) =~ /\S/ )
+                  }
+             grep { ! /^(history|custnum$)/i }
+                  $item->fields
+           )
+        %>
+%       if ( $single_cust && $h_table_descripsub{$item->table} ) {
+          <% &{ $h_table_descripsub{$item->table} }( $item ) %>
+%       }
+%     }
     </TD>
+
   </TR>
 
 % }
@@ -125,8 +150,8 @@ die "access deined"
 
 my %action = (
   'insert'      => 'Insert', #'Create',
-  'replace_old' => 'Change&nbsp;from',
-  'replace_new' => 'Change&nbsp;to',
+  'replace_old' => "Change\xA0from",
+  'replace_new' => "Change\xA0to",
   'delete'      => 'Remove',
 );
 
@@ -185,6 +210,27 @@ my %h_table_labelsub = (
   #'h_phone_device'
 );
 
+my $discounts = {};
+my $discount_descripsub = sub {
+  my($item) = @_;
+  $pkgpart{$item->pkgpart} ||= qsearchs({
+    'table' => 'part_pkg',
+    'hashref' => {'pkgpart' => $item->pkgpart}
+  })->pkg;
+  my $dnum = $item->discountnum;
+  $discounts->{$dnum} ||= qsearchs({
+    'table'=>'discount',
+    'hashref'=>{'discountnum'=>$dnum}
+  });
+  my $d = $discounts->{$dnum};
+  '(<b>' . encode_entities($d->description_short) . '</b>'
+  . ' on <b>' . encode_entities($pkgpart{$item->pkgpart}) . '</b>)';
+};
+
+my %h_table_descripsub = (
+  'h_cust_pkg_discount' => $discount_descripsub,
+);
+
 my $cust_pkg_date_format = '%b %o, %Y';
 $cust_pkg_date_format .= ' %l:%M:%S%P'
   if $conf->exists('cust_pkg-display_times')
@@ -197,4 +243,6 @@ if ( $curuser->option('history_order') eq 'newest' ) {
   @history = reverse @history;
 }
 
+my %access_user = (); #cache
+
 </%init>