X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fsearch%2F477.html;h=2e9f9428ead16928f6c890df0c42acd1c020ea2b;hb=8572f2347f879d414a60e8e0dc111fa927d66c14;hp=fb85f1e09b4771408a54c0c37d8b5192960482ee;hpb=7c370a4579d1ed8b81dba2fb5fae9978b283b49e;p=freeside.git
diff --git a/httemplate/search/477.html b/httemplate/search/477.html
index fb85f1e09..2e9f9428e 100644
--- a/httemplate/search/477.html
+++ b/httemplate/search/477.html
@@ -32,30 +32,76 @@ table.fcc477part thead tr.subhead {
font-size: large;
float: left;
}
+.errortitle {
+ font-weight: bold;
+ color: #ff0000;
+}
+tr.error td {
+ background-color: #ffdddd;
+}
+tr.error td.error {
+ text-align: left;
+ border: none;
+}
+tr.error ul {
+ margin: 0px;
+ list-style-image: url("<% $fsurl %>images/cross.png");
+}
a.download {
float: right;
}
% foreach my $partname (@partnames) {
+% my $this_part = $parts{$partname};
% $cgi->param('parts', $partname);
% $cgi->param('type', 'csv');
<% $part_titles->{$partname} %>
+% if ( $this_part->{num_errors} > 0 ) {
+% # disable downloading while it contains errors
+
+ <% emt('This section contains [quant,_1,error].', $this_part->{num_errors}) %>
+
+% } else {
Download
+% }
% my $header = ".header_$partname";
-% my $data = $parts{$partname};
+% my $data = $this_part->{data};
+% my $error = $this_part->{error};
<& $header &>
+% my $rownum = 0;
% foreach my $row (@$data) {
-
+% my %eh; # error hash
+% if ( $error->[$rownum] ) {
+% %eh = %{ $error->[$rownum] };
+% }
+
>
+% my $first = 1;
% foreach my $item (@$row) {
- <% $item %> |
+
+% if ($first and $part_link{$partname}) {
+ "><% $item || '(empty)' %>
+% $first = 0;
+% } else {
+ <% $item %>
+% }
+ |
+% } #foreach $item
+% # display errors
+% if ( keys %eh ) {
+
+% foreach my $key (sort keys %eh) {
+ - <% $eh{$key} %>
% }
+ |
+% } # if there are errors
-% }
+% $rownum++;
+% } #foreach $row
% } # foreach $partname
<& /elements/footer.html &>
@@ -64,6 +110,7 @@ die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('List packages');
my %parts;
+my %part_link;
# load from cache if possible
my $session;
if ( $cgi->param('session') =~ /^(\d+)$/ ) {
@@ -80,11 +127,22 @@ if ($cgi->param('agentnum') =~ /^(\d+)$/ ) {
}
my $date = parse_datetime($cgi->param('date')) || time;
my @partnames = grep /^\w+$/, $cgi->param('parts');
+my $ignore_quantity = ($cgi->param('ignore_quantity') ? 1 : 0);
+
foreach my $partname (@partnames) {
$parts{$partname} ||= FS::Report::FCC_477->report( $partname,
- date => $date,
- agentnum => $agentnum
- );
+ date => $date,
+ agentnum => $agentnum,
+ ignore_quantity => $ignore_quantity,
+ ); # includes error, detail, and data parts
+ my $detail_table = FS::Report::FCC_477->part_table($partname);
+ if ($detail_table eq 'cust_pkg') {
+ my $link = popurl(1).'477_cust_pkg.html?477part='.$partname.";date=$date;";
+ if ($agentnum) {
+ $link .= "agentnum=$agentnum;";
+ }
+ $part_link{$partname} = $link;
+ } # don't include detail links to deploy_blocks, that's pointless
}
$m->cache->set($session, \%parts, '1h');
@@ -92,7 +150,7 @@ my $title = 'FCC Form 477 Data - ' . time2str('%b %o, %Y', $date);
if ( $cgi->param('type') eq 'csv' ) {
my $partname = $partnames[0]; # ignore any beyond the first
- my $data = $parts{$partname};
+ my $data = $parts{$partname}->{data};
my $csv = Text::CSV_XS->new({ eol => "\r\n" }); # i think
my $filename = time2str('%Y-%m-%d', $date) . '-'. $partname . '.csv';
@@ -190,7 +248,7 @@ my $part_titles = FS::Report::FCC_477->parts;
%def>
<%def .header_voip>
- State |
+ State |
VoIP OTT |
VoIP Non-OTT |