X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Fcust_pay_or_refund.html;h=82b786e571e738bda72d7b54f3e8c5ad1ed83e30;hb=a941bc2ebde67e4bb0be5d6516cf1b09c092e8a1;hp=8aece0cc24f30f692a1f1ae34628609c09571141;hpb=71e5c03982da683dfafff0a4d7c295d3c1e342ae;p=freeside.git diff --git a/httemplate/search/elements/cust_pay_or_refund.html b/httemplate/search/elements/cust_pay_or_refund.html index 8aece0cc2..82b786e57 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: ) -<& 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'}; @@ -74,29 +91,30 @@ my $title = ''; $title = 'Unapplied ' if $unapplied; $title .= "\u$name_singular Search Results"; -my $link = ''; -if ( ( $curuser->access_right('View invoices') #remove in 2.5 (2.7?) - || ($curuser->access_right('View payments') && $table =~ /^cust_pay/) - || ($curuser->access_right('View refunds') && $table eq 'cust_refund') - ) - && ! $opt{'disable_link'} - ) -{ - - my $key; - my $q = ''; - if ( $table eq 'cust_pay_void' ) { - $key = 'paynum'; - $q .= 'void=1;'; - } elsif ( $table eq /^cust_(\w+)$/ ) { - $key = $1.'num'; - } - - if ( $key ) { - $q .= "$key="; - $link = [ "${p}view/$table.html?$q", $key ] - } -} +###NOT USED??? +#my $link = ''; +#if ( ( $curuser->access_right('View invoices') #remove in 2.5 (2.7?) +# || ($curuser->access_right('View payments') && $table =~ /^cust_pay/) +# || ($curuser->access_right('View refunds') && $table eq 'cust_refund') +# ) +# && ! $opt{'disable_link'} +# ) +#{ +# +# my $key; +# my $q = ''; +# if ( $table eq 'cust_pay_void' ) { +# $key = 'paynum'; +# $q .= 'void=1;'; +# } elsif ( $table eq /^cust_(\w+)$/ ) { +# $key = $1.'num'; +# } +# +# if ( $key ) { +# $q .= "$key="; +# $link = [ "${p}view/$table.html?$q", $key ] +# } +#} my $cust_link = sub { my $cust_thing = shift; @@ -149,12 +167,18 @@ if ( $opt{'pre_header'} ) { push @sort_fields, @{ $opt{'pre_fields'} }; } -my $sub_receipt = sub { +my $sub_receipt = $opt{'disable_link'} ? '' : sub { my $obj = shift; my $objnum = $obj->primary_key . '=' . $obj->get($obj->primary_key); + my $table = $obj->table; + my $void = ''; + if ($table eq 'cust_pay_void') { + $table = 'cust_pay'; + $void = ';void=1'; + } include('/elements/popup_link_onclick.html', - 'action' => $p.'view/cust_pay.html?link=popup;'.$objnum, + 'action' => $p.'view/'.$table.'.html?link=popup;'.$objnum.$void, 'actionlabel' => emt('Payment Receipt'), ); }; @@ -165,16 +189,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 +218,14 @@ push @links, ''; push @fields, sub { time2str('%b %d %Y', shift->_date ) }; push @sort_fields, '_date'; +if ($cgi->param('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 +235,7 @@ unless ( $opt{'disable_by'} ) { $o = 'customer self-service' if $o eq 'fs_selfservice'; $o; }; + push @sort_fields, ''; } if ( $tax_names ) { @@ -209,6 +252,7 @@ if ( $tax_names ) { split('\|', shift->tax_names) ); }; + push @sort_fields, '', ''; } push @header, FS::UI::Web::cust_header(); @@ -218,11 +262,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 +277,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', ); @@ -239,30 +287,26 @@ if ( $cgi->param('magic') ) { 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"; } - # 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, "custnum = $1"; + push @search, "$table.custnum = $1"; } if ( $cgi->param('payby') ) { @@ -271,7 +315,7 @@ if ( $cgi->param('magic') ) { foreach my $payby ( $cgi->param('payby') ) { $payby =~ - /^(CARD|CHEK|BILL|CASH|PPAL|APPL|ANRD|PREP|WIRE|WEST|EDI|MCRD)(-(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 +334,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 +349,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' ) { @@ -321,12 +373,14 @@ 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 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' ". @@ -334,27 +388,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' " + :"" + ). + + #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' ) { @@ -399,10 +467,18 @@ if ( $cgi->param('magic') ) { } + if ( $cgi->param('paymask') ) { + $cgi->param('paymask') =~ /^\s*(\d+)\s*$/ + or die "illegal paymask ". $cgi->param('paymask'); + my $regexp = regexp_sql(); + push @search, "$table.paymask $regexp '$1\$'"; + } + 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-:]+)$/ ) { @@ -411,6 +487,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'; } @@ -421,22 +498,22 @@ if ( $cgi->param('magic') ) { #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); - 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'; @@ -492,6 +569,26 @@ 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"; + } + } + + #check for customer tags + my @tags = $cgi->param('tagnum'); + if (@tags) { + my $tags = join(',',@tags); + $addl_from .= " LEFT JOIN cust_tag ON (cust_tag.custnum = cust_pay.custnum)"; + push @search, "cust_tag.tagnum in ($tags)"; + } + if ( $cgi->param('tax_names') ) { if ( dbh->{Driver}->{Name} =~ /^Pg/i ) { @@ -515,9 +612,116 @@ if ( $cgi->param('magic') ) { } } + #customer location... total false laziness w/cust_main/Search.pm + + my $current = ''; + unless ( $cgi->param('location_history') ) { + $current = ' + AND ( cust_location.locationnum IN ( cust_main.bill_locationnum, + cust_main.ship_locationnum + ) + OR cust_location.locationnum IN ( + SELECT locationnum FROM cust_pkg + WHERE cust_pkg.custnum = cust_main.custnum + AND locationnum IS NOT NULL + AND '. FS::cust_pkg->ncancelled_recurring_sql.' + ) + )'; + } + + + ## + # address + ## + if ( $cgi->param('address') ) { + my @values = $cgi->param('address'); + my @orwhere; + foreach (grep /\S/, @values) { + my $address = dbh->quote('%'. lc($_). '%'); + push @orwhere, + "LOWER(cust_location.address1) LIKE $address", + "LOWER(cust_location.address2) LIKE $address"; + } + if (@orwhere) { + push @search, "EXISTS( + SELECT 1 FROM cust_location + WHERE cust_location.custnum = cust_main.custnum + AND (".join(' OR ',@orwhere).") + $current + )"; + } + } + + ## + # city + ## + if ( $cgi->param('city') =~ /\S/ ) { + my $city = dbh->quote($cgi->param('city')); + push @search, "EXISTS( + SELECT 1 FROM cust_location + WHERE cust_location.custnum = cust_main.custnum + AND cust_location.city = $city + $current + )"; + } + + ## + # county + ## + if ( $cgi->param('county') =~ /\S/ ) { + my $county = dbh->quote($cgi->param('county')); + push @search, "EXISTS( + SELECT 1 FROM cust_location + WHERE cust_location.custnum = cust_main.custnum + AND cust_location.county = $county + $current + )"; + } + + ## + # state + ## + if ( $cgi->param('state') =~ /\S/ ) { + my $state = dbh->quote($cgi->param('state')); + push @search, "EXISTS( + SELECT 1 FROM cust_location + WHERE cust_location.custnum = cust_main.custnum + AND cust_location.state = $state + $current + )"; + } + + ## + # zipcode + ## + if ( $cgi->param('zip') =~ /\S/ ) { + my $zip = dbh->quote($cgi->param('zip') . '%'); + push @search, "EXISTS( + SELECT 1 FROM cust_location + WHERE cust_location.custnum = cust_main.custnum + AND cust_location.zip LIKE $zip + $current + )"; + } + + ## + # country + ## + if ( $cgi->param('country') =~ /^(\w\w)$/ ) { + my $country = uc($1); + push @search, "EXISTS( + SELECT 1 FROM cust_location + WHERE cust_location.custnum = cust_main.custnum + AND cust_location.country = '$country' + $current + )"; + } + + #end of false laziness w/cust_main/Search.pm + 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". @@ -538,6 +742,7 @@ if ( $cgi->param('magic') ) { } else { #hmm... is this still used? + warn "undefined search magic"; $cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo"; my $payinfo = $1; @@ -545,7 +750,7 @@ if ( $cgi->param('magic') ) { $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} );