[freeside-commits] freeside/httemplate/elements menu.html, 1.100.2.14, 1.100.2.15 change_history_common.html, NONE, 1.1.2.2

Erik Levinson levinse at wavetail.420.am
Fri Jul 1 15:03:20 PDT 2011


Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail.420.am:/tmp/cvs-serv8266/httemplate/elements

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	menu.html 
Added Files:
      Tag: FREESIDE_2_1_BRANCH
	change_history_common.html 
Log Message:
add employee audit report, RT13350

--- NEW FILE: change_history_common.html ---
<% include("/elements/table-grid.html") %>
% my $bgcolor1 = '#eeeeee';
%   my $bgcolor2 = '#ffffff';
%   my $bgcolor = '';

<TR>
  <TH CLASS="grid" BGCOLOR="#cccccc">User</TH>
  <TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
  <TH CLASS="grid" BGCOLOR="#cccccc">Time</TH>
  <% $single_cust ? '' : 
           '<TH CLASS="grid" BGCOLOR="#cccccc">Customer</TH>'
  %>
  <TH CLASS="grid" BGCOLOR="#cccccc">Item</TH>
  <TH CLASS="grid" BGCOLOR="#cccccc">Action</TH>
  <TH CLASS="grid" BGCOLOR="#cccccc">Description</TH>
</TR>

% foreach my $item ( sort { $a->history_date <=> $b->history_date
%                           #|| table order
%                           || $a->historynum <=> $b->historynum
%                         }
%                         @history
%                  )
% {
%   my $history_other = '';
%   my $act  = $item->history_action;
%   if ( $act =~ /^replace/ ) {
%     my $pkey = $item->primary_key;
%     my $date = $item->history_date;
%     $history_other = qsearchs({
%       'table'     => $item->table,
%       'hashref'   => { $pkey            => $item->$pkey(),
%                        'history_action' => $replace_other{$act},
%                        'historynum'     => { 'op'    => $replace_dir{$act},
%                                              'value' => $item->historynum
%                                            },
%                      },
%       'extra_sql' => "
%         AND history_date $replace_direq{$act} $date
%         AND ($date $replace_op{$act} $fuzz) $replace_direq{$act} history_date
%         ORDER BY historynum $replace_ord{$act} LIMIT 1
%       ",
%     });
%   }
%
%   if ( $bgcolor eq $bgcolor1 ) {
%     $bgcolor = $bgcolor2;
%   } else {
%     $bgcolor = $bgcolor1;
%   }

  <TR>
    <TD ALIGN="left" CLASS="grid" BGCOLOR="<% $bgcolor %>">
%     my $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 %>
    </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;
      <% $t %>
    </TD>

% unless ( $single_cust ) {
    <TD ALIGN="center" CLASS="grid" BGCOLOR="<% $bgcolor %>">
%    my $cust_main = qsearchs('cust_main', { custnum => $item->custnum });
      <% $cust_main ? "<A HREF='${p}view/cust_main.cgi?"
                            .$cust_main->custnum."'>".$cust_main->name.'</A>' : '' %>
    </TD>
% }

    <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};
% }
      <% $label %>
    </TD>
    <TD ALIGN="left" CLASS="grid" BGCOLOR="<% $bgcolor %>">
      <% $action{$item->history_action} %>
    </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
         )
      %>
    </TD>
  </TR>

% }
</TABLE>
<%init>

my %opt = @_;
my @history = @{$opt{'history'}};
my %tables = %{$opt{'tables'}};
my $single_cust = $opt{'single_cust'};
my $conf = new FS::Conf;
my $curuser = $FS::CurrentUser::CurrentUser;

die "access deined"
  unless $curuser->access_right('View customer history');

my %action = (
  'insert'      => 'Insert', #'Create',
  'replace_old' => 'Change&nbsp;from',
  'replace_new' => 'Change&nbsp;to',
  'delete'      => 'Remove',
);

my %cust_pkg_date_fields = map { $_=>1 } qw(
  start_date setup bill last_bill susp adjourn cancel expire contract_end
  change_date
);

# finding the other replace row

my %replace_other = (
  'replace_new' => 'replace_old',
  'replace_old' => 'replace_new',
);
my %replace_dir = (
  'replace_new' => '<',
  'replace_old' => '>',
);
my %replace_direq = (
  'replace_new' => '<=',
  'replace_old' => '>=',
);
my %replace_op = (
  'replace_new' => '-',
  'replace_old' => '+',
);
my %replace_ord = (
  'replace_new' => 'DESC',
  'replace_old' => 'ASC',
);

my $fuzz = 5; #seems like a lot

my %pkgpart = ();
my $pkg_labelsub = sub {
  my($item, $label) = @_;
  $pkgpart{$item->pkgpart} ||= $item->part_pkg->pkg;
  $label. ': <b>'. encode_entities($pkgpart{$item->pkgpart}). '</b>';
};

my $svc_labelsub = sub {
  my($item, $label) = @_;
  $label. ': <b>'. encode_entities($item->label($item->history_date)). '</b>';
};

my %h_table_labelsub = (
  'h_cust_pkg'      => $pkg_labelsub,
  'h_svc_acct'      => $svc_labelsub,
  #'h_radius_usergroup' =>
  'h_svc_domain'    => $svc_labelsub,
  'h_svc_www'       => $svc_labelsub,
  'h_svc_forward'   => $svc_labelsub,
  'h_svc_broadband' => $svc_labelsub,
  'h_svc_external'  => $svc_labelsub,
  'h_svc_phone'     => $svc_labelsub,
  #'h_phone_device'
);

my $cust_pkg_date_format = '%b %o, %Y';
$cust_pkg_date_format .= ' %l:%M:%S%P'
  if $conf->exists('cust_pkg-display_times')
  || $curuser->option('cust_pkg-display_times');

</%init>

Index: menu.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/menu.html,v
retrieving revision 1.100.2.14
retrieving revision 1.100.2.15
diff -u -w -d -r1.100.2.14 -r1.100.2.15
--- menu.html	20 May 2011 20:19:25 -0000	1.100.2.14
+++ menu.html	1 Jul 2011 22:03:18 -0000	1.100.2.15
@@ -290,6 +290,7 @@
     'Refund Report' => [ $fsurl.'search/report_cust_refund.html', 'Refund report (by type and/or date range)' ],
     'Unapplied Refunds' => [ $fsurl.'search/report_cust_refund.html?unapplied=1', 'Unapplied refund report (by type and/or date range)' ],
     'Package Costs Report' => [ $fsurl.'graph/report_cust_pkg_cost.html', 'Package setup and recurring costs graph' ],
+    'Employee Audit Report' => [ $fsurl.'search/report_employee_audit.html', 'Employee audit report' ],
   );
   $report_financial{'A/R Aging'} = [ $fsurl.'search/report_receivables.html', 'Accounts Receivable Aging report' ];
   $report_financial{'Prepaid Income'} = [ $fsurl.'search/report_prepaid_income.html', 'Prepaid income (unearned revenue)  report' ];



More information about the freeside-commits mailing list