X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Fcust_pay_or_refund.html;h=4ed297dac34b6d458b3b938ea6234d1f2fce8c4e;hp=5808e5f3edbb2e334f7f75c72ca918330c5cc86e;hb=6273a625ec990db6269254a767478282a7a8d05e;hpb=ba95860daaf6c4de2f90ef28057516bc7d44c8a0 diff --git a/httemplate/search/elements/cust_pay_or_refund.html b/httemplate/search/elements/cust_pay_or_refund.html index 5808e5f3e..4ed297dac 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, ) @@ -57,7 +58,7 @@ Examples: 'group_column' => 'payby', 'group_label' => 'payby_name', - 'subtotal' => { $opt{name_verb} => "sum($amount_field)" }, + 'subtotal' => { $opt{amount_field} => "sum($amount_field)" }, 'subtotal_row' => [ 'Subtotal', sub { sprintf($money, $_[0]->$amount_field) }, ], @@ -80,6 +81,8 @@ die "access denied" 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'}; @@ -184,6 +187,16 @@ push @fields, 'payby_payinfo_pretty', 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'; @@ -198,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'; @@ -207,6 +228,7 @@ unless ( $opt{'disable_by'} ) { $o = 'customer self-service' if $o eq 'fs_selfservice'; $o; }; + push @sort_fields, ''; } if ( $tax_names ) { @@ -223,6 +245,7 @@ if ( $tax_names ) { split('\|', shift->tax_names) ); }; + push @sort_fields, '', ''; } push @header, FS::UI::Web::cust_header(); @@ -232,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') ) { @@ -282,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'"; @@ -301,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]' ". @@ -314,13 +342,19 @@ 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' ". + " OR substring($table.payinfo from 1 for 3) = '2[2-7]x' ". " ) "; } elsif ( $cardtype eq 'Amex' ) { @@ -336,7 +370,10 @@ if ( $cgi->param('magic') ) { $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' ". @@ -344,27 +381,41 @@ if ( $cgi->param('magic') ) { " 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' " :"" ). - " OR substring($table.payinfo from 1 for 3 ) = '622' ". #China Union Pay processed as Discover outside CN + + #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]' " + :"" + ). + " ) "; } elsif ( $cardtype eq 'Maestro' ) { @@ -422,6 +473,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'; } @@ -503,6 +555,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 ) {