X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=a8b4ac15cfaabc4ee7edb8eeb8d96b2ad7ba3bb1;hb=5b73387992a96f7b80e40b5ecb2fedabd8a78d6b;hp=5540221d9d6b3a41c62da301aa3e5c0e9e1754f5;hpb=3a02e398ce013116c6ee97fc18472a6f40e0798d;p=freeside.git
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 5540221d9..a8b4ac15c 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,6 +1,6 @@
-<% include("/elements/header.html",'Invoice View', menubar(
- "View this customer (#$display_custnum)" => "${p}view/cust_main.cgi?$custnum",
-)) %>
+<& /elements/header.html, mt('Invoice View'), menubar(
+ emt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
+) &>
% if ( $conf->exists('deleteinvoices')
% && $curuser->access_right('Delete invoices' )
@@ -16,58 +16,79 @@
Delete this invoice
+ TITLE = "<% mt('Delete this invoice from the database completely') |h %>"
+ ><% mt('Delete this invoice') |h %>
% }
% if ( $cust_bill->owed > 0
% && scalar( grep $payby{$_}, qw(BILL CASH WEST MCRD) )
-% && $curuser->access_right('Post payment')
+% && $curuser->access_right(['Post payment', 'Post check payment', 'Post cash payment'])
% && ! $conf->exists('pkg-balances')
% )
% {
% my $s = 0;
- Post
+ <% mt('Post') |h %>
-% if ( $payby{'BILL'} ) {
+% if ( $payby{'BILL'} && $curuser->access_right(['Post payment', 'Post check payment']) ) {
<% $s++ ? ' | ' : '' %>
- check
+ <% mt('check') |h %>
% }
-% if ( $payby{'CASH'} ) {
+% if ( $payby{'CASH'} && $curuser->access_right(['Post payment', 'Post cash payment']) ) {
<% $s++ ? ' | ' : '' %>
- cash
+ <% mt('cash') |h %>
% }
-% if ( $payby{'WEST'} ) {
+% if ( $payby{'WEST'} && $curuser->access_right(['Post payment']) ) {
<% $s++ ? ' | ' : '' %>
- Western Union
+ <% mt('Western Union') |h %>
% }
-% if ( $payby{'MCRD'} ) {
+% if ( $payby{'MCRD'} && $curuser->access_right(['Post payment']) ) {
<% $s++ ? ' | ' : '' %>
- manual credit card
+ <% mt('manual credit card') |h %>
% }
- payment against this invoice
+ <% 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') ) {
- Re-print this invoice
+ <% mt('Re-print this invoice') |h %>
% if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) {
- | Re-email this invoice
+ | <% mt('Re-email this invoice') |h %>
% }
% if ( $conf->exists('hylafax') && length($cust_bill->cust_main->fax) ) {
- | Re-fax this invoice
+ | <% mt('Re-fax this invoice') |h %>
% }
@@ -76,30 +97,28 @@
% if ( $conf->exists('invoice_latex') ) {
- View typeset invoice PDF
+ <% mt('View typeset invoice PDF') |h %>
% }
% my $br = 0;
% if ( $cust_bill->num_cust_event ) { $br++;
-( View invoice events )
+( <% mt('View invoice events') |h %> )
% }
% if ( $cust_bill->num_cust_bill_event ) { $br++;
-( View deprecated, old-style invoice events )
+( <% mt('View deprecated, old-style invoice events') |h %> )
% }
<% $br ? '
' : '' %>
% if ( $conf->exists('invoice_html') ) {
-
- <% join('', $cust_bill->print_html('', $templatename) ) %>
+ <% join('', $cust_bill->print_html(\%opt) ) %>
% } else {
-
-
<% join('', $cust_bill->print_text('', $templatename) ) %>+
<% join('', $cust_bill->print_text(\%opt) ) %>% } -<% include('/elements/footer.html') %> +<& /elements/footer.html &> <%init> my $curuser = $FS::CurrentUser::CurrentUser; @@ -107,14 +126,28 @@ my $curuser = $FS::CurrentUser::CurrentUser; die "access denied" unless $curuser->access_right('View invoices'); -#untaint invnum +my( $invnum, $template, $notice_name ); my($query) = $cgi->keywords; -$query =~ /^((.+)-)?(\d+)$/; -my $templatename = $2; -my $invnum = $3; +if ( $query =~ /^((.+)-)?(\d+)$/ ) { + $template = $2; + $invnum = $3; + $notice_name = 'Invoice'; +} else { + $invnum = $cgi->param('invnum'); + $template = $cgi->param('template'); + $notice_name = $cgi->param('notice_name'); +} my $conf = new FS::Conf; +my %opt = ( + 'unsquelch_cdr' => $conf->exists('voip-cdr_email'), + 'template' => $template, + 'notice_name' => $notice_name, +); + +$opt{'barcode_img'} = 1 if $conf->exists('invoice-barcode'); + my @payby = grep /\w/, $conf->config('payby'); #@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP )) @payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP )) @@ -135,6 +168,8 @@ my $display_custnum = $cust_bill->cust_main->display_custnum; #my $printed = $cust_bill->printed; -my $link = $templatename ? "$templatename-$invnum" : $invnum; +my $link = "invnum=$invnum"; +$link .= ';template='. uri_escape($template) if $template; +$link .= ';notice_name='. $notice_name if $notice_name; %init>