X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Freport_cust_pay_or_refund.html;h=fc0db63b470f896e110ab212f547ec9bc57412c4;hp=b39c7c0886b16d3248c95eb7ef54239ab30d6f48;hb=a941bc2ebde67e4bb0be5d6516cf1b09c092e8a1;hpb=49d620491ee0004274c066156748d41bae7e2b3d diff --git a/httemplate/search/elements/report_cust_pay_or_refund.html b/httemplate/search/elements/report_cust_pay_or_refund.html index b39c7c088..fc0db63b4 100644 --- a/httemplate/search/elements/report_cust_pay_or_refund.html +++ b/httemplate/search/elements/report_cust_pay_or_refund.html @@ -23,31 +23,27 @@ Examples: <TR> <TH CLASS="background" COLSPAN=2 ALIGN="left"> - <FONT SIZE="+1"><% mt('Payment search options') |h %></FONT> + <FONT SIZE="+1"><% mt('[_1] search options', ucfirst($name_singular)) |h %></FONT> </TH> </TR> + <& /elements/tr-select.html, + label => ucfirst(PL($name_singular)) . ' of type:', + field => 'payby', + options => [ keys %payby ], + labels => \%payby, + multiple => 1, + size => 18, + &> + +% if (substr($conf->config('card_masking_method'), -5) eq 'last4' || !$conf->config('card_masking_method')) { <TR> - <TD ALIGN="right"><% ucfirst(PL($name_singular)) %> of type: </TD> + <TD ALIGN="right"><% mt('Card Last 4 #:') |h %></TD> <TD> - <SELECT NAME="payby" SIZE=10 MULTIPLE> -%# <OPTION VALUE=""><% mt('all') |h %></OPTION> -%# <OPTION VALUE="CARD"><% mt('credit card (all)') |h %></OPTION> - <OPTION VALUE="CARD-VisaMC" SELECTED><% mt('credit card (Visa/MasterCard)') |h %></OPTION> - <OPTION VALUE="CARD-Amex" SELECTED><% mt('credit card (American Express)') |h %></OPTION> - <OPTION VALUE="CARD-Discover" SELECTED><% mt('credit card (Discover)') |h %></OPTION> - <OPTION VALUE="CARD-Maestro" SELECTED><% mt('credit card (Maestro/Switch/Solo)') |h %></OPTION> - <OPTION VALUE="CARD-Tokenized" SELECTED><% mt('credit card (Tokenized)') |h %></OPTION> - <OPTION VALUE="CHEK" SELECTED><% mt('electronic check / ACH') |h %></OPTION> - <OPTION VALUE="BILL" SELECTED><% mt('check') |h %></OPTION> - <OPTION VALUE="PREP" SELECTED><% mt('prepaid card') |h %></OPTION> - <OPTION VALUE="CASH" SELECTED><% mt('cash') |h %></OPTION> - <OPTION VALUE="WEST" SELECTED><% mt('Western Union') |h %></OPTION> - <OPTION VALUE="MCRD" SELECTED><% mt('manual credit card') |h %></OPTION> - </SELECT> + <INPUT TYPE="text" ID="paymask" NAME="paymask"> </TD> </TR> - +% } <TR> <TD ALIGN="right"><% mt('Check #:') |h %> </TD> <TD> @@ -63,6 +59,20 @@ Examples: <& /elements/tr-select-user.html &> +% if ( $has_reason ) { +% # limit to reasons that are in use for the table being reported on +% # (maybe order by count(*) desc?) + <& /elements/tr-select-table.html, + label => emt('Reason'), + field => 'reasonnum', + id => 'reasonnum', + table => 'reason', + name_col => 'reason', + extra_sql => " WHERE EXISTS(SELECT 1 FROM $table WHERE $table.reasonnum = reason.reasonnum) ", + empty_label => emt('any'), + &> +% } + <TR> <TD ALIGN="right" VALIGN="center"><% mt(ucfirst($name_singular). ' date') |h %></TD> <TD> @@ -89,6 +99,16 @@ Examples: </TR> % } +% if ( $table eq 'cust_pay' ) { + +% # payment batch +% # <& /elements/tr-select-batchnum.html &> + +% #payment "entry" batch (should probably just all become the same thing) + <& /elements/tr-select-paybatch.html &> + +% } + <& /elements/tr-input-lessthan_greaterthan.html, 'label' => emt('Amount'), 'field' => 'paid', @@ -107,6 +127,10 @@ Examples: </TH> </TR> + <& /elements/tr-select-cust_tag.html, + 'custnum' => $opt{'custnum'}, + &> + <& /elements/tr-select-agent.html, 'curr_value' => scalar($cgi->param('agentnum')), 'label' => emt('Agent'), @@ -117,10 +141,11 @@ Examples: 'label' => emt('Customer class'), 'field' => 'cust_classnum', 'multiple' => 1, - 'pre_options' => [ '' => emt('(none)') ], - 'all_selected' => 1, + 'pre_options' => [ 0 => emt('(none)') ], &> + <& options_cust_location.html &> + </TABLE> % if ( $table eq 'cust_pay' ) { @@ -140,6 +165,12 @@ Examples: 'value' => 1, &> + <& /elements/tr-checkbox.html, + 'label' => emt('Include order number'), + 'field' => 'show_order_number', + 'value' => 1, + &> + </TABLE> % } @@ -169,4 +200,29 @@ my $title = $void ? "Voided $name_singular report" : "\u$name_singular report" ; $table .= '_void' if $void; +my $has_reason = dbdef->table($table)->column('reasonnum'); + +tie (my %payby, 'Tie::IxHash', + 'CARD-VisaMC' => 'credit card (Visa/MasterCard)', + 'CARD-Amex' => 'credit card (American Express)', + 'CARD-Discover' => 'credit card (Discover)', + 'CARD-Maestro' => 'credit card (Maestro/Switch/Solo)', + 'CARD-Tokenized' => 'credit card (Tokenized)', + + 'CHEK' => 'electronic check / ACH', + 'BILL' => 'check', + 'CASH' => 'cash', + 'PPAL' => 'Paypal', + 'APPL' => 'Apple Store', + 'ANRD' => 'Android Market', + + 'PREP' => 'prepaid card', + 'WIRE' => 'wire transfer', + 'WEST' => 'Western Union', + 'IDTP' => 'IDT Payment Services', + 'EDI' => 'Electronic Debit (EDI)', + 'MCRD' => 'manual credit card', + 'MCHK' => 'manual electronic check', +); + </%init>