X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Fcust_pay_or_refund.html;h=c6617b14267a631eb9485a2a176b143357ca9314;hb=661eff7b7593ca9a2c39d6838948b96a15d8c0e6;hp=699266d0fb2e96f352db478698b17f5d6070aa26;hpb=83be664e22c7b4e9b974c04884145c028ef42d17;p=freeside.git
diff --git a/httemplate/search/elements/cust_pay_or_refund.html b/httemplate/search/elements/cust_pay_or_refund.html
index 699266d0f..c6617b142 100755
--- a/httemplate/search/elements/cust_pay_or_refund.html
+++ b/httemplate/search/elements/cust_pay_or_refund.html
@@ -26,6 +26,7 @@ Examples:
'html_init' => '',
'addl_header' => [],
'addl_fields' => [],
+ 'addl_sort_fields' => [],
'redirect_empty' => $redirect_empty,
)
@@ -39,7 +40,7 @@ Examples:
)
%doc>
-<& search.html,
+<& grouped-search.html,
'title' => $title, # XXX: translate
'name_singular' => $name_singular,
'query' => $sql_query,
@@ -54,6 +55,17 @@ Examples:
'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' => [ 'Total',
+ sub { sprintf("$money", $_[0]->$amount_field) },
+ ],
+ 'show_combined' => 1,
&>
<%init>
@@ -61,11 +73,16 @@ my %opt = @_;
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'};
@@ -165,16 +182,26 @@ push @header, "\u$name_singular",
$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 @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, '';
}
@@ -184,6 +211,14 @@ push @links, '';
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';
@@ -193,6 +228,7 @@ unless ( $opt{'disable_by'} ) {
$o = 'customer self-service' if $o eq 'fs_selfservice';
$o;
};
+ push @sort_fields, '';
}
if ( $tax_names ) {
@@ -209,6 +245,7 @@ if ( $tax_names ) {
split('\|', shift->tax_names)
);
};
+ push @sort_fields, '', '';
}
push @header, FS::UI::Web::cust_header();
@@ -218,11 +255,14 @@ push @links, map { $_ ne 'Cust. Status' ? $cust_link : '' }
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') ) {
@@ -230,6 +270,7 @@ 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',
);
@@ -252,14 +293,10 @@ if ( $cgi->param('magic') ) {
$title = $part_referral->referral. " $title";
}
- # cust_classnum (false laziness w/ elements/cust_main_dayranges.html, prepaid_income.html, cust_bill_pay.html, cust_bill_pkg.html cust_bill_pkg_referral.html, unearned_detail.html, cust_credit.html, cust_credit_refund.html, cust_main::Search::search_sql)
- if ( grep { $_ eq 'cust_classnum' } $cgi->param ) {
- my @classnums = grep /^\d*$/, $cgi->param('cust_classnum');
- push @search, 'COALESCE( cust_main.classnum, 0) IN ( '.
- join(',', map { $_ || '0' } @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, "$table.custnum = $1";
@@ -271,7 +308,7 @@ if ( $cgi->param('magic') ) {
foreach my $payby ( $cgi->param('payby') ) {
$payby =~
- /^(CARD|CHEK|BILL|CASH|PPAL|APPL|ANRD|PREP|WIRE|WEST|EDI|MCRD|MCHK)(-(VisaMC|Amex|Discover|Maestro|Tokenized))?$/
+ /^(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'";
@@ -290,7 +327,9 @@ if ( $cgi->param('magic') ) {
#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]' ".
@@ -303,13 +342,18 @@ if ( $cgi->param('magic') ) {
" AND substring($table.payinfo from 1 for 6) ".
" 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' ".
" ) ";
} elsif ( $cardtype eq 'Amex' ) {
@@ -321,20 +365,19 @@ if ( $cgi->param('magic') ) {
} 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 2 ) = '65' ".
- " OR substring($table.payinfo from 1 for 3 ) = '300' ".
+ " OR substring($table.payinfo from 1 for 3 ) = '300' ". # diner's 300-305
" 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 ) = '303' ".
" 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 2 ) = '36' ".
+ " OR substring($table.payinfo from 1 for 4 ) = '3095' ". # diner's 3095
+ " OR substring($table.payinfo from 1 for 2 ) = '36' ". # diner's 36, 38, 39
" 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' ".
@@ -343,8 +386,8 @@ if ( $cgi->param('magic') ) {
" 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
+ ( $country =~ /^(US|PR|VI|MP|PW|GU)$/
+ ?" OR substring($table.payinfo from 1 for 4 ) = '3528' ". # JCB cards in the 3528-3589 range identified as Discover inside US & territories (NOT Canada)
" 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' ".
@@ -354,7 +397,10 @@ if ( $cgi->param('magic') ) {
" OR substring($table.payinfo from 1 for 3 ) = '358' "
:""
).
- " OR substring($table.payinfo from 1 for 3 ) = '622' ". #China Union Pay processed as Discover outside CN
+ ( $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-68]' " #China Union Pay processed as Discover outside CN
+ :""
+ ).
" ) ";
} elsif ( $cardtype eq 'Maestro' ) {
@@ -412,6 +458,7 @@ if ( $cgi->param('magic') ) {
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';
}
@@ -437,7 +484,7 @@ if ( $cgi->param('magic') ) {
"$table.void_date <= $v_ending";
}
- push @search, FS::UI::Web::parse_lt_gt($cgi, "$table.$amount_field" );
+ push @search, FS::UI::Web::parse_lt_gt($cgi, $amount_field, $table);
$orderby = '_date';
@@ -493,6 +540,18 @@ if ( $cgi->param('magic') ) {
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} =~ /^Pg/i ) {