X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_bill.cgi;h=6bc499a350352fdfd65add5846c0bf1bf2a00e52;hb=0870a4c1fb02be43ea5524f58650d99c81477681;hp=4dc03adc3d4f762228665807fe9d33b33658929d;hpb=a9916ce48023939ab1d2506704f5545eb183a2ea;p=freeside.git
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 4dc03adc3..6bc499a35 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,4 +1,4 @@
-<& /elements/header.html, emt('Invoice View'), menubar(
+<& /elements/header.html, mt('Invoice View'), menubar(
emt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
) &>
@@ -25,7 +25,7 @@
% }
% if ( $cust_bill->owed > 0
-% && scalar( grep $payby{$_}, qw(BILL CASH WEST MCRD) )
+% && scalar( grep $payby{$_}, qw(BILL CASH WEST MCRD MCHK) )
% && $curuser->access_right(['Post payment', 'Post check payment', 'Post cash payment'])
% && ! $conf->exists('pkg-balances')
% )
@@ -54,10 +54,36 @@
<% mt('manual credit card') |h %>
% }
+% if ( $payby{'MCHK'} && $curuser->access_right(['Post payment']) ) {
+ <% $s++ ? ' | ' : '' %>
+ <% mt('manual electronic check') |h %>
+% }
+
<% mt('payment against this invoice') |h %>
% }
+% if ( $conf->exists('cust_bill-enable_promised_date') ) {
+% my $onclick = include('/elements/popup_link_onclick.html',
+% 'action' => $p.'misc/cust_bill-promised_date.html?'.$invnum,
+% 'actionlabel' => emt('Set promised payment date'),
+% 'width' => 320,
+% 'height' => 240,
+% );
+% $onclick = '';
+% if ( $cust_bill->promised_date ) {
+% my $date_format = $conf->config('date_format') || '%b %o, %Y';
+ <% mt('Payment promised by [_1]',
+ time2str($date_format, $cust_bill->promised_date) ) %>
+ ( <% $onclick %><% mt('change') |h %> )
+
+% }
+% elsif ( $cust_bill->owed > 0 ) {
+ <% $onclick %><% mt('Set promised payment date' ) |h %>
+
+% }
+% }
+
% if ( $curuser->access_right('Resend invoices') ) {
<% mt('Re-print this invoice') |h %>
@@ -83,18 +109,37 @@
% my $br = 0;
% if ( $cust_bill->num_cust_event ) { $br++;
( <% mt('View invoice events') |h %> )
-% }
+% }
-% if ( $cust_bill->num_cust_bill_event ) { $br++;
-( <% mt('View deprecated, old-style invoice events') |h %> )
+% my @modes = grep {! $_->disabled}
+% $cust_bill->cust_main->agent->invoice_modes;
+% if ( @modes ) {
+( <% mt('View as:') %>
+