'Amount',
'By',
'#',
+ 'Card Type',
#payment
'Date',
# line item
'Description',
+ 'Package class',
'Location',
@post_desc_header,
$cust_pay->payby =~ /^(CARD|CHEK)$/
? $cust_pay->paymask : $cust_pay->payinfo;
},
-
+ sub { my $cust_pay = shift->cust_bill_pay->cust_pay;
+ $cust_pay->payby =~ /^CARD$/
+ ? cardtype($cust_pay->paymask) : '';
+ },
sub { time2str('%b %d %Y', shift->get('cust_pay_date') ) },
sub { shift->cust_bill_pay->cust_pay->otaker },
? $_[0]->get('pkg') # possibly use override.pkg
: $_[0]->get('itemdesc') # but i think this correct
},
+ 'classname', #package class
$location_sub,
@post_desc,
'invnum',
'sort_fields' => [
'paid',
'', #payby
+ '', #payinfo/paymask
+ '', #cardtype
'cust_pay_date',
'', #'otaker',
'', #amount
'', #line item description
+ '', #package class
'', #location
@post_desc_null,
'invnum',
'',
'',
'',
+ '',
+ '',
@post_desc_null,
$ilink,
$ilink,
FS::UI::Web::cust_header()
),
],
- 'align' => 'rcrrlrlllrrcl'.
+ 'align' => 'rcrlrlrlll',
+#original value before cardtype & package were added
+#why are there 13 cols?
+#'rcrrlrlllrrcl'.
$post_desc_align.
'rr'.
FS::UI::Web::cust_aligns(),
'',
'',
'',
+ '',
+ '',
@post_desc_null,
'',
'',
'',
'',
'',
+ '',
+ '',
@post_desc_null,
'',
'',
$join_pkg = ' LEFT JOIN cust_pkg USING ( pkgnum )
LEFT JOIN part_pkg USING ( pkgpart )
+ LEFT JOIN pkg_class USING ( classnum )
LEFT JOIN part_pkg AS override
ON pkgpart_override = override.pkgpart ';
$join_pkg .= ' LEFT JOIN cust_location USING ( locationnum ) '
#warn "neither nottax nor istax parameters specified";
#same as before?
$join_pkg = ' LEFT JOIN cust_pkg USING ( pkgnum )
- LEFT JOIN part_pkg USING ( pkgpart ) ';
+ LEFT JOIN part_pkg USING ( pkgpart )
+ LEFT JOIN pkg_class USING ( classnum )';
}
'cust_pay._date AS cust_pay_date',
'cust_bill._date',
);
-push @select, 'part_pkg.pkg' unless $cgi->param('istax');
+push @select, 'part_pkg.pkg, pkg_class.classname' unless $cgi->param('istax');
push @select, 'cust_main.custnum',
FS::UI::Web::cust_sql_fields();
push @select, 'part_pkg.taxclass'; # or should this use override?
}
-warn "$join_cust_bill_pkg
- $join_pkg
- $join_pay
- $join_cust";
+#warn "$join_cust_bill_pkg
+# $join_pkg
+# $join_pay
+# $join_cust";
my $query = {
'table' => 'cust_bill_pay_pkg',