diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/elements/cust_payby.html | 13 | ||||
| -rw-r--r-- | httemplate/search/cust_bill_pay_pkg.html | 8 | ||||
| -rwxr-xr-x | httemplate/search/cust_pay.html | 1 | ||||
| -rwxr-xr-x | httemplate/search/elements/cust_pay_or_refund.html | 8 |
4 files changed, 27 insertions, 3 deletions
diff --git a/httemplate/elements/cust_payby.html b/httemplate/elements/cust_payby.html index 60e6eb8b1..f30d18557 100644 --- a/httemplate/elements/cust_payby.html +++ b/httemplate/elements/cust_payby.html @@ -298,8 +298,17 @@ if ( $curr_value ) { $cust_payby = new FS::cust_payby {}; } my $sel_payby = $cgi->param($name.'_payby') || $cust_payby->payby; -$sel_payby = 'CARD' if $sel_payby eq 'DCRD' || $sel_payby eq ''; -$sel_payby = 'CHEK' if $sel_payby eq 'DCHK'; +# convert DCRD to CARD + no weight, and the same for DCHK/CHEK +if ($sel_payby eq 'DCRD') { + $sel_payby = 'CARD'; + $cust_payby->weight(''); +} elsif ($sel_payby eq 'DCHK') { + $sel_payby = 'CHEK'; + $cust_payby->weight(''); +} elsif (!$sel_payby) { + # default + $sel_payby = 'CARD'; +} my @payby = FS::payby->cust_payby; my %conf_payby = map { $_=>1 } $conf->config('payby'); diff --git a/httemplate/search/cust_bill_pay_pkg.html b/httemplate/search/cust_bill_pay_pkg.html index 5a3be7551..7c231a65d 100644 --- a/httemplate/search/cust_bill_pay_pkg.html +++ b/httemplate/search/cust_bill_pay_pkg.html @@ -14,6 +14,7 @@ #payment 'Date', + 'Order Number', 'By', #application @@ -43,6 +44,7 @@ ? cardtype($cust_pay->paymask) : ''; }, sub { time2str('%b %d %Y', shift->get('cust_pay_date') ) }, + sub { shift->cust_bill_pay->cust_pay->order_number }, sub { shift->cust_bill_pay->cust_pay->otaker }, sub { sprintf($money_char.'%.2f', shift->amount ) }, @@ -64,6 +66,7 @@ '', #payinfo/paymask '', #cardtype 'cust_pay_date', + '', #order_number '', #'otaker', '', #amount '', #line item description @@ -85,6 +88,7 @@ '', '', '', + '', @post_desc_null, $ilink, $ilink, @@ -92,7 +96,7 @@ FS::UI::Web::cust_header() ), ], - 'align' => 'rcrlrlrlll', + 'align' => 'rcrlrrlrlll', #original value before cardtype & package were added #why are there 13 cols? #'rcrrlrlllrrcl'. @@ -110,6 +114,7 @@ '', '', '', + '', @post_desc_null, '', '', @@ -126,6 +131,7 @@ '', '', '', + '', @post_desc_null, '', '', diff --git a/httemplate/search/cust_pay.html b/httemplate/search/cust_pay.html index e466f6afa..536ab291f 100755 --- a/httemplate/search/cust_pay.html +++ b/httemplate/search/cust_pay.html @@ -4,4 +4,5 @@ 'name_singular' => emt('payment'), 'name_verb' => emt('paid'), 'show_card_type' => 1, + 'show_order_number' => 1, &> diff --git a/httemplate/search/elements/cust_pay_or_refund.html b/httemplate/search/elements/cust_pay_or_refund.html index b07f5e9d2..9f725bb0b 100755 --- a/httemplate/search/elements/cust_pay_or_refund.html +++ b/httemplate/search/elements/cust_pay_or_refund.html @@ -211,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'; |