'html_init' => '',
'addl_header' => [],
'addl_fields' => [],
+ 'addl_sort_fields' => [],
'redirect_empty' => $redirect_empty,
)
)
</%doc>
-<& search.html,
+<& grouped-search.html,
'title' => $title, # XXX: translate
'name_singular' => $name_singular,
'query' => $sql_query,
'link_onclicks' => \@link_onclicks,
'color' => \@color,
'style' => \@style,
+
+ 'group_column' => 'payby',
+ 'group_label' => 'payby_name',
+ 'subtotal' => { $opt{amount_field} => "sum($amount_field)" },
+ 'subtotal_row' => [ 'Subtotal',
+ sub { sprintf($money, $_[0]->$amount_field) },
+ ],
+ 'total_row' => [ '<B>Total</B>',
+ sub { sprintf("<B>$money</B>", $_[0]->$amount_field) },
+ ],
+ 'show_combined' => 1,
&>
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
+my $conf = FS::Conf->new;
+my $money = ($conf->config('money_char') || '$') . '%.2f';
+
die "access denied"
unless $curuser->access_right('Financial reports');
my $table = $opt{'table'} || 'cust_'.$opt{'thing'};
+my $has_reason = dbdef->table($table)->column('reasonnum') ? 1 : 0;
+
my $amount_field = $opt{'amount_field'};
my $name_singular = $opt{'name_singular'};
# only valid for $table == 'cust_pay' atm
my $tax_names = '';
if ( $cgi->param('tax_names') ) {
- if ( dbh->{Driver}->{Name} eq 'Pg' ) {
+ if ( dbh->{Driver}->{Name} =~ /^Pg/i ) {
$tax_names = "
array_to_string(
$align .= 'rr';
push @links, '', '';
push @fields, 'payby_payinfo_pretty',
- sub { sprintf('$%.2f', shift->$amount_field() ) },
+ sub { sprintf($money, shift->$amount_field() ) },
;
-push @link_onclicks, $sub_receipt, '',
-push @sort_fields, '', $amount_field;
+push @link_onclicks, $sub_receipt, '';
+push @sort_fields, 'paysort', $amount_field;
+
+if ($opt{'show_card_type'}) {
+ push @header, emt('Card Type');
+ $align .= 'r';
+ push @links, '';
+ push @fields, sub {
+ (($_[0]->payby eq 'CARD') && ($_[0]->paymask !~ /N\/A/)) ? cardtype($_[0]->paymask) : ''
+ };
+ push @sort_fields, '';
+}
if ( $unapplied ) {
push @header, emt('Unapplied');
$align .= 'r';
push @links, '';
- push @fields, sub { sprintf('$%.2f', shift->unapplied_amount) };
+ push @fields, sub { sprintf($money, shift->unapplied_amount) };
push @sort_fields, '';
}
push @fields, sub { time2str('%b %d %Y', shift->_date ) };
push @sort_fields, '_date';
+if ($opt{'show_order_number'}) {
+ push @header, emt('Order Number');
+ $align .= 'r';
+ push @links, '';
+ push @fields, 'order_number';
+ push @sort_fields, 'order_number';
+}
+
unless ( $opt{'disable_by'} ) {
push @header, emt('By');
$align .= 'c';
$o = 'customer self-service' if $o eq 'fs_selfservice';
$o;
};
+ push @sort_fields, '';
}
if ( $tax_names ) {
split('\|', shift->tax_names)
);
};
+ push @sort_fields, '', '';
}
push @header, FS::UI::Web::cust_header();
my @color = ( ( map '', @fields ), FS::UI::Web::cust_colors() );
my @style = ( ( map '', @fields ), FS::UI::Web::cust_styles() );
push @fields, \&FS::UI::Web::cust_fields;
+push @sort_fields, FS::UI::Web::cust_sort_fields;
push @header, @{ $opt{'addl_header'} }
if $opt{'addl_header'};
push @fields, @{ $opt{'addl_fields'} }
if $opt{'addl_fields'};
+push @sort_fields, @{ $opt{'addl_sort_fields'} }
+ if $opt{'addl_sort_fields'};
my( $count_query, $sql_query, @count_addl );
if ( $cgi->param('magic') ) {
my @search = ();
my @select = (
"$table.*",
+ "( $table.payby || ' ' || coalesce($table.paymask, $table.payinfo) ) AS paysort",
FS::UI::Web::cust_sql_fields(),
'cust_main.custnum AS cust_main_custnum',
);
if ( $cgi->param('magic') eq '_date' ) {
if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
- push @search, "agentnum = $1"; # $search{'agentnum'} = $1;
+ push @search, "cust_main.agentnum = $1"; # $search{'agentnum'} = $1;
my $agent = qsearchs('agent', { 'agentnum' => $1 } );
die "unknown agentnum $1" unless $agent;
$title = $agent->agent. " $title";
}
if ( $cgi->param('refnum') && $cgi->param('refnum') =~ /^(\d+)$/ ) {
- push @search, "refnum = $1";
+ push @search, "cust_main.refnum = $1";
my $part_referral = qsearchs('part_referral', { 'refnum' => $1 } );
die "unknown refnum $1" unless $part_referral;
$title = $part_referral->referral. " $title";
}
- if ( $cgi->param('cust_classnum') ) {
- my @classnums = grep /^\d+$/, $cgi->param('cust_classnum');
- push @search, 'cust_main.classnum IN('.join(',',@classnums).')'
- if @classnums;
- }
+ # cust_classnum - standard matching
+ push @search, $m->comp('match-classnum',
+ param => 'cust_classnum', field => 'cust_main.classnum'
+ );
if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
- push @search, "custnum = $1";
+ push @search, "$table.custnum = $1";
}
if ( $cgi->param('payby') ) {
foreach my $payby ( $cgi->param('payby') ) {
$payby =~
- /^(CARD|CHEK|BILL|PREP|CASH|WEST|MCRD)(-(VisaMC|Amex|Discover|Maestro))?$/
+ /^(CARD|CHEK|BILL|CASH|PPAL|APPL|ANRD|PREP|WIRE|WEST|IDTP|EDI|MCRD|MCHK)(-(VisaMC|Amex|Discover|Maestro|Tokenized))?$/
or die "illegal payby $payby";
my $payby_search = "$table.payby = '$1'";
my $cardtype = $3;
+ my $similar_to = dbh->{Driver}->{Name} =~ /^mysql/i
+ ? 'REGEXP' #doesn't behave exactly the same, but
+ #should work for our patterns
+ : 'SIMILAR TO';
+
my $search;
if ( $cardtype eq 'VisaMC' ) {
+
#avoid posix regexes for portability
$search =
+ # Visa
" ( ( substring($table.payinfo from 1 for 1) = '4' ".
+ # is not Switch
" AND substring($table.payinfo from 1 for 4) != '4936' ".
" AND substring($table.payinfo from 1 for 6) ".
- " NOT SIMILAR TO '49030[2-9]' ".
+ " NOT $similar_to '49030[2-9]' ".
" AND substring($table.payinfo from 1 for 6) ".
- " NOT SIMILAR TO '49033[5-9]' ".
+ " NOT $similar_to '49033[5-9]' ".
" AND substring($table.payinfo from 1 for 6) ".
- " NOT SIMILAR TO '49110[1-2]' ".
+ " NOT $similar_to '49110[1-2]' ".
" AND substring($table.payinfo from 1 for 6) ".
- " NOT SIMILAR TO '49117[4-9]' ".
+ " NOT $similar_to '49117[4-9]' ".
" AND substring($table.payinfo from 1 for 6) ".
- " NOT SIMILAR TO '49118[1-2]' ".
+ " NOT $similar_to '49118[1-2]' ".
" )".
+ # MasterCard
" OR substring($table.payinfo from 1 for 2) = '51' ".
" OR substring($table.payinfo from 1 for 2) = '52' ".
" OR substring($table.payinfo from 1 for 2) = '53' ".
" OR substring($table.payinfo from 1 for 2) = '54' ".
" OR substring($table.payinfo from 1 for 2) = '54' ".
" OR substring($table.payinfo from 1 for 2) = '55' ".
-# " OR substring($table.payinfo from 1 for 2) = '36' ". #Diner's int'l was processed as Visa/MC inside US, now Discover
+ " OR substring($table.payinfo from 1 for 4) $similar_to '222[1-9]' ".
+ " OR substring($table.payinfo from 1 for 3) $similar_to '22[3-9]' ".
+ " OR substring($table.payinfo from 1 for 2) $similar_to '2[3-6]' ".
+ " OR substring($table.payinfo from 1 for 3) $similar_to '27[0-1]' ".
+ " OR substring($table.payinfo from 1 for 4) = '2720' ".
+ " OR substring($table.payinfo from 1 for 3) = '2[2-7]x' ".
" ) ";
+
} elsif ( $cardtype eq 'Amex' ) {
+
$search =
" ( substring($table.payinfo from 1 for 2 ) = '34' ".
" OR substring($table.payinfo from 1 for 2 ) = '37' ".
" ) ";
+
} elsif ( $cardtype eq 'Discover' ) {
- my $conf = new FS::Conf;
my $country = $conf->config('countrydefault') || 'US';
$search =
" ( substring($table.payinfo from 1 for 4 ) = '6011' ".
+ " OR substring($table.payinfo from 1 for 3 ) = '60x' ".
" OR substring($table.payinfo from 1 for 2 ) = '65' ".
+
+ # diner's 300-305 / 3095
" OR substring($table.payinfo from 1 for 3 ) = '300' ".
" OR substring($table.payinfo from 1 for 3 ) = '301' ".
" OR substring($table.payinfo from 1 for 3 ) = '302' ".
" OR substring($table.payinfo from 1 for 3 ) = '304' ".
" OR substring($table.payinfo from 1 for 3 ) = '305' ".
" OR substring($table.payinfo from 1 for 4 ) = '3095' ".
+ " OR substring($table.payinfo from 1 for 3 ) = '30x' ".
+
+ # diner's 36, 38, 39
" OR substring($table.payinfo from 1 for 2 ) = '36' ".
" OR substring($table.payinfo from 1 for 2 ) = '38' ".
" OR substring($table.payinfo from 1 for 2 ) = '39' ".
+
" OR substring($table.payinfo from 1 for 3 ) = '644' ".
" OR substring($table.payinfo from 1 for 3 ) = '645' ".
" OR substring($table.payinfo from 1 for 3 ) = '646' ".
" OR substring($table.payinfo from 1 for 3 ) = '647' ".
" OR substring($table.payinfo from 1 for 3 ) = '648' ".
" OR substring($table.payinfo from 1 for 3 ) = '649' ".
- ( $country =~ /^(US|CA)$/
- ?" OR substring($table.payinfo from 1 for 4 ) = '3528' ". # JCB cards in the 3528-3589 range identified as Discover inside US/CA
+ " OR substring($table.payinfo from 1 for 3 ) = '64x' ".
+
+ # JCB cards in the 3528-3589 range identified as Discover inside US & territories (NOT Canada)
+ ( $country =~ /^(US|PR|VI|MP|PW|GU)$/
+ ?" OR substring($table.payinfo from 1 for 4 ) = '3528' ".
" OR substring($table.payinfo from 1 for 4 ) = '3529' ".
" OR substring($table.payinfo from 1 for 3 ) = '353' ".
" OR substring($table.payinfo from 1 for 3 ) = '354' ".
" OR substring($table.payinfo from 1 for 3 ) = '355' ".
" OR substring($table.payinfo from 1 for 3 ) = '356' ".
" OR substring($table.payinfo from 1 for 3 ) = '357' ".
- " OR substring($table.payinfo from 1 for 3 ) = '358' "
+ " OR substring($table.payinfo from 1 for 3 ) = '358' ".
+ " OR substring($table.payinfo from 1 for 3 ) = '35x' "
+ :""
+ ).
+
+ #China Union Pay processed as Discover in US, Mexico and Caribbean
+ ( $country =~ /^(US|MX|AI|AG|AW|BS|BB|BM|BQ|VG|KY|CW|DM|DO|GD|GP|JM|MQ|MS|BL|KN|LC|VC|MF|SX|TT|TC)$/
+ ?" OR substring($table.payinfo from 1 for 3 ) $similar_to '62[24-68x]' "
:""
).
- " OR substring($table.payinfo from 1 for 3 ) = '622' ". #China Union Pay processed as Discover outside CN
+
" ) ";
- } elsif ( $cardtype eq 'Maestro' ) {
+
+ } elsif ( $cardtype eq 'Maestro' ) {
+
$search =
" ( substring($table.payinfo from 1 for 2 ) = '63' ".
" OR substring($table.payinfo from 1 for 2 ) = '67' ".
" OR substring($table.payinfo from 1 for 6 ) = '564182' ".
" OR substring($table.payinfo from 1 for 4 ) = '4936' ".
" OR substring($table.payinfo from 1 for 6 ) ".
- " SIMILAR TO '49030[2-9]' ".
+ " $similar_to '49030[2-9]' ".
" OR substring($table.payinfo from 1 for 6 ) ".
- " SIMILAR TO '49033[5-9]' ".
+ " $similar_to '49033[5-9]' ".
" OR substring($table.payinfo from 1 for 6 ) ".
- " SIMILAR TO '49110[1-2]' ".
+ " $similar_to '49110[1-2]' ".
" OR substring($table.payinfo from 1 for 6 ) ".
- " SIMILAR TO '49117[4-9]' ".
+ " $similar_to '49117[4-9]' ".
" OR substring($table.payinfo from 1 for 6 ) ".
- " SIMILAR TO '49118[1-2]' ".
+ " $similar_to '49118[1-2]' ".
" ) ";
+
+ } elsif ( $cardtype eq 'Tokenized' ) {
+
+ $search = " substring($table.payinfo from 1 for 2 ) = '99' ";
+
} else {
die "unknown card type $cardtype";
}
if ( $cgi->param('payinfo') ) {
$cgi->param('payinfo') =~ /^\s*(\d+)\s*$/
or die "illegal payinfo ". $cgi->param('payinfo');
- push @search, "$table.payinfo = '$1'";
+ my $regexp = regexp_sql();
+ push @search, "$table.payinfo $regexp '^0*$1\$'";
}
if ( $cgi->param('ccpay') =~ /^([\w-:]+)$/ ) {
push @search, "($table.auth LIKE '$1%') OR ($table.order_number LIKE '$1%')";
push @fields, 'auth', 'order_number';
push @header, 'Auth #', 'Transaction #';
+ push @sort_fields, '', '';
$align .= 'rr';
}
#for cust_pay_pending... statusNOT=done
if ( $cgi->param('statusNOT') =~ /^(\w+)$/ ) {
- push @search, "status != '$1'";
+ push @search, "$table.status != '$1'";
}
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-warn $beginning;
- push @search, "_date >= $beginning ",
- "_date <= $ending";
+
+ push @search, "$table._date >= $beginning ",
+ "$table._date <= $ending";
if ( $table eq 'cust_pay_void' ) {
my($v_beginning, $v_ending) =
FS::UI::Web::parse_beginning_ending($cgi, 'void');
- push @search, "void_date >= $v_beginning ",
- "void_date <= $v_ending";
+ push @search, "$table.void_date >= $v_beginning ",
+ "$table.void_date <= $v_ending";
}
- push @search, FS::UI::Web::parse_lt_gt($cgi, $amount_field );
+ push @search, FS::UI::Web::parse_lt_gt($cgi, $amount_field, $table);
$orderby = '_date';
$cgi->param('paybatch') =~ /^([\w\/\:\-\.]+)$/
or die "illegal paybatch: ". $cgi->param('paybatch');
- push @search, "paybatch = '$1'";
-
$orderby = "LOWER(company || ' ' || last || ' ' || first )";
} elsif ( $cgi->param('magic') eq 'batchnum' ) {
die "unknown search magic: ". $cgi->param('magic');
}
+ if ( $cgi->param('paybatch') =~ /^([\w\/\:\-\.]+)$/ ) {
+ push @search, "paybatch = '$1'";
+ }
+
#unapplied payment/refund
if ( $unapplied ) {
push @select, '(' . "FS::$table"->unapplied_sql . ') AS unapplied_amount';
#here is the agent virtualization
push @search, $curuser->agentnums_sql;
- my $addl_from = FS::UI::Web::join_cust_main('cust_pay');
+ my $addl_from = FS::UI::Web::join_cust_main($table);
my $group_by = '';
+ # reasons, for refunds and voided payments
+ if ( $has_reason ) {
+ push @select, "reason.reason";
+ $addl_from .= " LEFT JOIN reason USING (reasonnum)\n";
+ push @fields, 'reason';
+ push @sort_fields, 'reason.reason';
+ push @header, emt('Reason');
+ if ( $cgi->param('reasonnum') =~ /^(\d+)$/ ) {
+ push @search, "COALESCE(reasonnum, 0) = $1";
+ }
+ }
+
if ( $cgi->param('tax_names') ) {
- if ( dbh->{Driver}->{Name} eq 'Pg' ) {
+ if ( dbh->{Driver}->{Name} =~ /^Pg/i ) {
0;#twiddle thumbs
my $search = ' WHERE '. join(' AND ', @search);
- $count_query = "SELECT COUNT(*), SUM($amount_field) ";
+ $count_query = "SELECT COUNT(*), SUM($table.$amount_field) ";
$count_query .= ', SUM(' . "FS::$table"->unapplied_sql . ') '
if $unapplied;
$count_query .= "FROM $table $addl_from".
} else {
#hmm... is this still used?
+ warn "undefined search magic";
$cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo";
my $payinfo = $1;
$cgi->param('payby') =~ /^(\w+)$/ or die "illegal payby";
my $payby = $1;
- $count_query = "SELECT COUNT(*), SUM($amount_field) FROM $table".
+ $count_query = "SELECT COUNT(*), SUM($table.$amount_field) FROM $table".
" WHERE payinfo = '$payinfo' AND payby = '$payby'".
" AND ". $curuser->agentnums_sql;
@count_addl = ( '$%.2f total '.$opt{name_verb} );
projects / freeside.git / blobdiff