X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=49d6ff4cd1c9d8b64ac04bf124707ffd98ed7399;hb=d21d7864c1f1bc4fed05a01c0b037628a4ca5b99;hp=111810e4ff84828b700bf0567a7efd89ccf26aed;hpb=f099e0dfa8f438a84d8f1bce36f5e5bda60481e5;p=freeside.git diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html index 111810e4f..49d6ff4cd 100644 --- a/httemplate/view/cust_main/payment_history.html +++ b/httemplate/view/cust_main/payment_history.html @@ -3,33 +3,29 @@ % my $s = 0; % if ( $payby{'BILL'} && $curuser->access_right(['Post payment', 'Post check payment' ]) ) { <% $s++ ? ' | ' : '' %> - <% include('/elements/popup_link-cust_main.html', - 'label' => 'Enter check payment', + <& /elements/popup_link-cust_main.html, + 'label' => mt('Enter check payment'), 'action' => "${p}edit/cust_pay.cgi?popup=1;payby=BILL", 'cust_main' => $cust_main, - 'actionlabel' => 'Enter check payment', + 'actionlabel' => mt('Enter check payment'), 'width' => 392, - #default# 'height' => 336, - ) - %> + &> % } % if ( $payby{'CASH'} && $curuser->access_right(['Post payment', 'Post cash payment']) ) { <% $s++ ? ' | ' : '' %> - <% include('/elements/popup_link-cust_main.html', - 'label' => 'Enter cash payment', + <& /elements/popup_link-cust_main.html, + 'label' => mt('Enter cash payment'), 'action' => "${p}edit/cust_pay.cgi?popup=1;payby=CASH", 'cust_main' => $cust_main, - 'actionlabel' => 'Enter cash payment', + 'actionlabel' => mt('Enter cash payment'), 'width' => 392, - #default# 'height' => 336, - ) - %> + &> % } % if ( $payby{'WEST'} && $curuser->access_right('Post payment') ) { <% $s++ ? ' | ' : '' %> - Enter Western Union payment + <% mt('Enter Western Union payment') |h %> % } % if ( ( $payby{'CARD'} || $payby{'DCRD'} ) @@ -37,7 +33,7 @@ % && ! $cust_main->is_encrypted($cust_main->payinfo) % ) { <% $s++ ? ' | ' : '' %> - Process credit card payment + <% mt('Process credit card payment') |h %> % } % if ( ( $payby{'CHEK'} || $payby{'DCHK'} ) @@ -45,12 +41,12 @@ % && ! $cust_main->is_encrypted($cust_main->payinfo) % ) { <% $s++ ? ' | ' : '' %> - Process electronic check (ACH) payment + <% mt('Process electronic check (ACH) payment') |h %> % } % if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) { <% $s++ ? ' | ' : '' %> - Post manual (offline/POS) credit card payment + <% mt('Post manual (offline/POS) credit card payment') |h %> % }
@@ -58,15 +54,13 @@ %# credit link % if ( $curuser->access_right('Post credit') ) { - <% include('/elements/popup_link-cust_main.html', - 'label' => 'Enter credit', + <& /elements/popup_link-cust_main.html, + 'label' => mt('Enter credit'), 'action' => "${p}edit/cust_credit.cgi", 'cust_main' => $cust_main, - 'actionlabel' => 'Enter credit', + 'actionlabel' => mt('Enter credit'), 'width' => 616, #make room for reasons #540 default - #default# 'height' => 336, - ) - %> + &>
% } @@ -75,28 +69,24 @@ % $s = 0; % if ( $payby{'BILL'} && $curuser->access_right(['Post refund', 'Post check refund']) ) { <% $s++ ? ' | ' : '' %> - <% include('/elements/popup_link-cust_main.html', - 'label' => 'Enter check refund', + <& /elements/popup_link-cust_main.html, + 'label' => mt('Enter check refund'), 'action' => "${p}edit/cust_refund.cgi?popup=1;payby=BILL", 'cust_main' => $cust_main, - 'actionlabel' => 'Enter check refund', + 'actionlabel' => mt('Enter check refund'), 'width' => 392, - #default# 'height' => 336, - ) - %> + &> % } % if ( $payby{'CASH'} && $curuser->access_right(['Post refund', 'Post cash refund']) ) { <% $s++ ? ' | ' : '' %> - <% include('/elements/popup_link-cust_main.html', - 'label' => 'Enter cash refund', + <& /elements/popup_link-cust_main.html, + 'label' => mt('Enter cash refund'), 'action' => "${p}edit/cust_refund.cgi?popup=1;payby=CASH", 'cust_main' => $cust_main, - 'actionlabel' => 'Enter cash refund', + 'actionlabel' => mt('Enter cash refund'), 'width' => 392, - #default# 'height' => 336, - ) - %> + &> % } %# someday, perhaps. very few gateways let you do unlinked refunds at all. @@ -120,7 +110,7 @@ % if ( $payby{'MCRD'} && $curuser->access_right('Post refund') ) { <% $s++ ? ' | ' : '' %> - Post manual (offline/POS) credit card refund + <% mt('Post manual (offline/POS) credit card refund') |h %> % }
@@ -134,22 +124,20 @@ % if ( $view_exemptions || $add_adjustment ) { % if ( $view_exemptions ) { - View tax exemptions + <% mt('View tax exemptions') |h %> <% $add_adjustment ? '|' : '' %> % } % if ( $add_adjustment ) { - <% include('/elements/popup_link.html', { + <& /elements/popup_link.html, { 'action' => $p.'edit/cust_tax_adjustment.html?custnum='. $cust_main->custnum, - 'label' => 'Add tax adjustment', - 'actionlabel' => 'Add tax adjustment', - #'color' => '#333399', - #'width' => 763, + 'label' => mt('Add tax adjustment'), + 'actionlabel' => mt('Add tax adjustment'), 'height' => 200, - }) - %> + } + &> | - View tax adjustments + <% mt('View tax adjustments') |h %> % }
@@ -161,9 +149,9 @@ % && $curuser->access_right('View customer batched payments') % ) % { - View batched payments: + <% mt('View batched payments:') |h %> % foreach my $status (qw( Queued In-transit Complete All )) { - <% $status %> + <% mt($status) |h %> <% $status ne 'All' ? '|' : '' %> % }
@@ -175,24 +163,24 @@ % && scalar($cust_main->cust_pay_pending) % ) % { - View pending payments
+ <% mt('View pending payments') |h %>
% } %# and now the table -<% include("/elements/table-grid.html") %> +<& /elements/table-grid.html &> % my $bgcolor1 = '#eeeeee'; % my $bgcolor2 = '#ffffff'; % my $bgcolor = ''; - Date - Description - Invoice - Payment - In-house
Credit
- Refund - Balance + <% mt('Date') |h %> + <% mt('Description') |h %> + <% mt('Invoice') |h %> + <% mt('Payment') |h %> + In-house Credit + <% mt('Refund') |h %> + <% mt('Balance') |h %> %#display payment history @@ -209,8 +197,8 @@ - Starting balance on <% time2str($date_format, $date) %> - (show prior history) + <% mt("Starting balance on [_1]", time2str($date_format, $date) ) |h %> + (<% mt('show prior history') |h %>) @@ -412,6 +400,16 @@ foreach my $cust_pay ($cust_main->cust_pay) { }; } +#pending payments +foreach my $cust_pay_pending ($cust_main->cust_pay_pending) { + push @history, { + 'date' => $cust_pay_pending->_date, + 'desc' => include('payment_history/pending_payment.html', $cust_pay_pending, %opt ), + 'void_payment' => $cust_pay_pending->paid, + }; +} + + #voided payments foreach my $cust_pay_void ($cust_main->cust_pay_void) { push @history, { @@ -452,4 +450,37 @@ foreach my $cust_refund ($cust_main->cust_refund) { } +sub translate_payby { + my ($payby,$payinfo) = (shift,shift); + my %payby = ( + BILL => $payinfo ? mt('Check #') : '', + CHEK => mt('Electronic check '), + PREP => mt('Prepaid card '), + CARD => mt('Credit card #'), + COMP => mt('Complimentary by '), + CASH => mt('Cash'), + WEST => mt('Western Union'), + MCRD => mt('Manual credit card'), + ); + $payby = (exists $payby{$payby}) ? $payby{$payby} : $payby; + $payby; +}; + +sub translate_payby_refund { + my ($payby,$payinfo) = (shift,shift); + my %payby = ( + BILL => $payinfo ? mt('Check #') : mt('Check'), + CHEK => mt('Electronic check '), + CARD => 'CARD ', + COMP => 'COMP ', + ); + $payby = (exists $payby{$payby}) ? $payby{$payby} : $payby; + $payby; +}; + +sub areyousure_link { + my ($url,$msg,$title,$label) = (shift,shift,shift,shift); + ' ('.$label.')'; +} +