diff options
| author | ivan <ivan> | 2008-02-14 03:52:37 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2008-02-14 03:52:37 +0000 |
| commit | 3684dae04773904d5500ef93253c5f4c2f6d7f38 (patch) | |
| tree | e8cd1976c2982f64e57cfefa90713a5425e6fd9c /httemplate | |
| parent | 7e845b1ddaae5c89d50f5fdb7c2ed3ee0aab4b08 (diff) | |
add cust_pay.otaker field; populate it based on history on upgrades, and show the order taker on all payments (on customer view and payment search) closes: #2953
Diffstat (limited to 'httemplate')
| -rwxr-xr-x | httemplate/search/cust_pay.cgi | 11 | ||||
| -rw-r--r-- | httemplate/view/cust_main/payment_history.html | 8 |
2 files changed, 16 insertions, 3 deletions
diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi index 2166eb16d..e5465aee8 100755 --- a/httemplate/search/cust_pay.cgi +++ b/httemplate/search/cust_pay.cgi @@ -7,6 +7,7 @@ 'header' => [ 'Payment', 'Amount', 'Date', + 'By', FS::UI::Web::cust_header(), ], 'fields' => [ @@ -32,14 +33,20 @@ }, sub { sprintf('$%.2f', shift->paid ) }, sub { time2str('%b %d %Y', shift->_date ) }, + sub { my $o = shift->otaker; + $o = 'auto billing' if $o eq 'fs_daily'; + $o = 'customer self-service' if $o eq 'fs_selfservice'; + $o; + }, \&FS::UI::Web::cust_fields, ], #'align' => 'lrrrll', - 'align' => 'rrr'.FS::UI::Web::cust_aligns(), + 'align' => 'rrrc'.FS::UI::Web::cust_aligns(), 'links' => [ $link, $link, $link, + '', ( map { $_ ne 'Cust. Status' ? $cust_link : '' } FS::UI::Web::cust_header() ), @@ -48,12 +55,14 @@ '', '', '', + '', FS::UI::Web::cust_colors(), ], 'style' => [ '', '', '', + '', FS::UI::Web::cust_styles(), ], ) diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html index cbe143d59..44a888533 100644 --- a/httemplate/view/cust_main/payment_history.html +++ b/httemplate/view/cust_main/payment_history.html @@ -118,7 +118,7 @@ % $payby =~ s/^WEST$/Western Union/; % $payby =~ s/^MCRD$/Manual credit card/; % $payby =~ s/^BILL$//; -% my $info = $payby ? " ($payby$payinfo)" : ''; +% my $info = $payby ? "($payby$payinfo)" : ''; % % my( $pre, $post, $desc, $apply, $ext ) = ( '', '', '', '', '' ); % if ( scalar(@cust_bill_pay) == 0 @@ -243,9 +243,13 @@ % qq!>unapply</A>)!; % } % +% my $otaker = $cust_pay->otaker; +% $otaker = '<i>auto billing</i>' if $otaker eq 'fs_daily'; +% $otaker = '<i>customer self-service</i>' if $otaker eq 'fs_selfservice'; +% % push @history, { % 'date' => $cust_pay->_date, -% 'desc' => $pre. "Payment$post$info$desc". +% 'desc' => $pre. "Payment$post by $otaker $info$desc". % "$view$apply$refund$void$delete$unapply", % 'payment' => $cust_pay->paid, % 'target' => $target, |