diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2014-02-12 14:59:16 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2014-02-12 14:59:16 -0800 |
| commit | b3215bc9e57be75ca8482f53bf678783dc4beb01 (patch) | |
| tree | ff0d6fd3ecc4cdeec122c4c2705a7a5c7bdab2fd | |
| parent | dfd0a5487139aa2fe33ac87d628e104af4c9d04e (diff) | |
EDI and other uncommon payments on payment report, RT#27557
| -rw-r--r-- | FS/FS/payby.pm | 4 | ||||
| -rwxr-xr-x | httemplate/search/elements/cust_pay_or_refund.html | 2 | ||||
| -rw-r--r-- | httemplate/search/elements/report_cust_pay_or_refund.html | 13 |
3 files changed, 14 insertions, 5 deletions
diff --git a/FS/FS/payby.pm b/FS/FS/payby.pm index b33f8f3..197d499 100644 --- a/FS/FS/payby.pm +++ b/FS/FS/payby.pm @@ -127,8 +127,8 @@ tie %hash, 'Tie::IxHash', }, 'EDI' => { tinyname => 'EDI', - shortname => 'Electronic Debit', - longname => 'Electronic Debit', + shortname => 'Electronic Debit (EDI)', + longname => 'Electronic Debit (EDI)', cust_main => '', #not a customer type }, 'WIRE' => { diff --git a/httemplate/search/elements/cust_pay_or_refund.html b/httemplate/search/elements/cust_pay_or_refund.html index 339fddb..7afab4e 100755 --- a/httemplate/search/elements/cust_pay_or_refund.html +++ b/httemplate/search/elements/cust_pay_or_refund.html @@ -271,7 +271,7 @@ if ( $cgi->param('magic') ) { foreach my $payby ( $cgi->param('payby') ) { $payby =~ - /^(CARD|CHEK|BILL|PREP|CASH|WEST|MCRD)(-(VisaMC|Amex|Discover|Maestro|Tokenized))?$/ + /^(CARD|CHEK|BILL|CASH|PPAL|APPL|ANRD|PREP|WIRE|WEST|EDI|MCRD)(-(VisaMC|Amex|Discover|Maestro|Tokenized))?$/ or die "illegal payby $payby"; my $payby_search = "$table.payby = '$1'"; diff --git a/httemplate/search/elements/report_cust_pay_or_refund.html b/httemplate/search/elements/report_cust_pay_or_refund.html index 25f7cda..3026605 100644 --- a/httemplate/search/elements/report_cust_pay_or_refund.html +++ b/httemplate/search/elements/report_cust_pay_or_refund.html @@ -30,19 +30,28 @@ Examples: <TR> <TD ALIGN="right"><% ucfirst(PL($name_singular)) %> of type: </TD> <TD> - <SELECT NAME="payby" SIZE=10 MULTIPLE> + <SELECT NAME="payby" SIZE=16 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="PPAL" SELECTED><% mt('Paypal') |h %></OPTION> + <OPTION VALUE="APPL" SELECTED><% mt('Apple Store') |h %></OPTION> + <OPTION VALUE="ANRD" SELECTED><% mt('Android Market') |h %></OPTION> + + <OPTION VALUE="PREP" SELECTED><% mt('prepaid card') |h %></OPTION> + <OPTION VALUE="WIRE" SELECTED><% mt('wire transfer') |h %></OPTION> <OPTION VALUE="WEST" SELECTED><% mt('Western Union') |h %></OPTION> + <OPTION VALUE="EDI" SELECTED><% mt('Electronic Debit (EDI)') |h %></OPTION> <OPTION VALUE="MCRD" SELECTED><% mt('manual credit card') |h %></OPTION> </SELECT> </TD> |