X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=2ce294e9a87202d4cfcdda45bfb3352df91909bf;hb=3d2e1d9b5d1883f768f5a90e0dfaae7cc9a41367;hp=c5373ff196cf98019a596a1afd5d9b9340d0bf35;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1;p=freeside.git
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index c5373ff19..2ce294e9a 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,99 +1,132 @@
-<% include("/elements/header.html",'Invoice View', menubar(
- "Main Menu" => $p,
- "View this customer (#$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' )
+% )
+% {
+
+
+
+ <% mt('Delete this invoice') |h %>
+
+% }
% if ( $cust_bill->owed > 0
-% && ( $payby{'BILL'} || $payby{'CASH'} || $payby{'WEST'} || $payby{'MCRD'} )
-% )
-% {
+% && scalar( grep $payby{$_}, qw(BILL CASH WEST MCRD) )
+% && $curuser->access_right(['Post payment', 'Post check payment', 'Post cash payment'])
+% && ! $conf->exists('pkg-balances')
+% )
+% {
% my $s = 0;
- Post
-% if ( $payby{'BILL'} ) {
+ <% mt('Post') |h %>
-
- <% $s++ ? ' | ' : '' %>
- check
-% }
-% if ( $payby{'CASH'} ) {
+% if ( $payby{'BILL'} && $curuser->access_right(['Post payment', 'Post check payment']) ) {
+ <% $s++ ? ' | ' : '' %>
+ <% mt('check') |h %>
+% }
-
- <% $s++ ? ' | ' : '' %>
- cash
-% }
-% if ( $payby{'WEST'} ) {
+% if ( $payby{'CASH'} && $curuser->access_right(['Post payment', 'Post cash payment']) ) {
+ <% $s++ ? ' | ' : '' %>
+ <% mt('cash') |h %>
+% }
-
- <% $s++ ? ' | ' : '' %>
- Western Union
-% }
-% if ( $payby{'MCRD'} ) {
+% if ( $payby{'WEST'} && $curuser->access_right(['Post payment']) ) {
+ <% $s++ ? ' | ' : '' %>
+ <% mt('Western Union') |h %>
+% }
-
- <% $s++ ? ' | ' : '' %>
- manual credit card
-% }
+% if ( $payby{'MCRD'} && $curuser->access_right(['Post payment']) ) {
+ <% $s++ ? ' | ' : '' %>
+ <% mt('manual credit card') |h %>
+% }
+ <% mt('payment against this invoice') |h %>
- payment against this invoice
% }
+% if ( $curuser->access_right('Resend invoices') ) {
-Re-print this invoice
-% if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) {
+ <% mt('Re-print this invoice') |h %>
- | Re-email
- this invoice
-% }
-% if ( $conf->exists('hylafax') && length($cust_bill->cust_main->fax) ) {
+% if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) {
+ | <% mt('Re-email this invoice') |h %>
+% }
- | Re-fax
- this invoice
-% }
+% if ( $conf->exists('hylafax') && length($cust_bill->cust_main->fax) ) {
+ | <% mt('Re-fax this invoice') |h %>
+% }
+
+
+% }
-
% if ( $conf->exists('invoice_latex') ) {
- View typeset invoice
+ <% 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; + die "access denied" - unless $FS::CurrentUser::CurrentUser->access_right('View invoices'); + 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 )) @@ -105,16 +138,17 @@ my $cust_bill = qsearchs({ 'table' => 'cust_bill', 'addl_from' => 'LEFT JOIN cust_main USING ( custnum )', 'hashref' => { 'invnum' => $invnum }, - 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql, + 'extra_sql' => ' AND '. $curuser->agentnums_sql, }); die "Invoice #$invnum not found!" unless $cust_bill; my $custnum = $cust_bill->custnum; +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> - -