X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2F477.html;h=2e9f9428ead16928f6c890df0c42acd1c020ea2b;hb=d2485c6fa278d7a4a1c940605816013f41d1f7e0;hp=ff2ac8638e4b5924dda19e0d94f3ae4bc45d08da;hpb=6cc3e679908ad79f0080960d30b1cab689326a07;p=freeside.git
diff --git a/httemplate/search/477.html b/httemplate/search/477.html
index ff2ac8638..2e9f9428e 100644
--- a/httemplate/search/477.html
+++ b/httemplate/search/477.html
@@ -32,26 +32,54 @@ 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) {
@@ -63,6 +91,14 @@ a.download {
% }
|
% } #foreach $item
+% # display errors
+% if ( keys %eh ) {
+
+% foreach my $key (sort keys %eh) {
+ - <% $eh{$key} %>
+% }
+ |
+% } # if there are errors
% $rownum++;
% } #foreach $row
@@ -98,10 +134,10 @@ foreach my $partname (@partnames) {
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).'cust_pkg.cgi?477part='.$partname.";date=$date;";
+ my $link = popurl(1).'477_cust_pkg.html?477part='.$partname.";date=$date;";
if ($agentnum) {
$link .= "agentnum=$agentnum;";
}
@@ -114,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';