X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=762eec03351d42e44f7a7e8f8c5e006e42414f96;hp=27376d5054f660059846ad2de6580147086d9295;hb=5dabafc5e63ae7559ca6d2867e653660b981e639;hpb=8d953e7c2f94dc007d94da74650d27c5a74cc792 diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi index 27376d505..762eec033 100755 --- a/httemplate/view/cust_bill.cgi +++ b/httemplate/view/cust_bill.cgi @@ -1,31 +1,34 @@ -<& /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 %> -

- +<& /elements/header-cust_main.html, view=>'payment_history', custnum=>$custnum &> + +

Invoice #<% $invnum %>

+ +% if ( !$cust_bill->closed ) { # otherwise allow no changes +% my $can_delete = $conf->exists('deleteinvoices') +% && $curuser->access_right('Delete invoices'); +% my $can_void = $curuser->access_right('Void invoices'); +% if ( $can_void ) { + <& /elements/popup_link.html, + 'label' => emt('Void this invoice'), + 'actionlabel' => emt('Void this invoice'), + 'action' => $p.'misc/void-cust_bill.html?invnum='.$invnum, + &> +% } +% if ( $can_void and $can_delete ) { +  |  +% } +% if ( $can_delete ) { + \ + <% emt('Delete this invoice') |h %> +% } +% if ( $can_void or $can_delete ) { +

+% } % } % if ( $cust_bill->owed > 0 -% && scalar( grep $payby{$_}, qw(BILL CASH WEST MCRD MCHK) ) % && $curuser->access_right(['Post payment', 'Post check payment', 'Post cash payment']) % && ! $conf->exists('pkg-balances') % ) @@ -34,30 +37,30 @@ <% mt('Post') |h %> -% if ( $payby{'BILL'} && $curuser->access_right(['Post payment', 'Post check payment']) ) { +% if ( $curuser->access_right(['Post payment', 'Post check payment']) ) { <% $s++ ? ' | ' : '' %> <% mt('check') |h %> % } -% if ( $payby{'CASH'} && $curuser->access_right(['Post payment', 'Post cash payment']) ) { +% if ( $curuser->access_right(['Post payment', 'Post cash payment']) ) { <% $s++ ? ' | ' : '' %> <% mt('cash') |h %> % } -% if ( $payby{'WEST'} && $curuser->access_right(['Post payment']) ) { - <% $s++ ? ' | ' : '' %> - <% mt('Western Union') |h %> -% } - -% if ( $payby{'MCRD'} && $curuser->access_right(['Post payment']) ) { - <% $s++ ? ' | ' : '' %> - <% mt('manual credit card') |h %> -% } - -% if ( $payby{'MCHK'} && $curuser->access_right(['Post payment']) ) { - <% $s++ ? ' | ' : '' %> - <% mt('manual electronic check') |h %> -% } +%# % if ( $payby{'WEST'} && $curuser->access_right(['Post payment']) ) { +%# <% $s++ ? ' | ' : '' %> +%# <% mt('Western Union') |h %> +%# % } +%# +%# % if ( $payby{'MCRD'} && $curuser->access_right(['Post payment']) ) { +%# <% $s++ ? ' | ' : '' %> +%# <% 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 %>

@@ -73,7 +76,7 @@ % $onclick = ''; % if ( $cust_bill->promised_date ) { % my $date_format = $conf->config('date_format') || '%b %o, %Y'; - <% mt('Payment promised by [_1]', + <% emt('Payment promised by [_1]', time2str($date_format, $cust_bill->promised_date) ) %> ( <% $onclick %><% mt('change') |h %> )

@@ -85,8 +88,21 @@ % } % if ( $curuser->access_right('Resend invoices') ) { + <% mt('Print this invoice') |h %> +% } + +% if ( $conf->exists('support-key') +% && $curuser->access_right('Print and mail invoices') +% ) +% { + | <& /elements/popup_link.html, + 'action' => $p."misc/post_fsinc-invoice.cgi?$link", + 'label' => 'Print and mail this invoice online', + 'actionlabel' => 'Invoice printing and mailing', + &> +% } - <% mt('Re-print this invoice') |h %> +% if ( $curuser->access_right('Resend invoices') ) { % if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) { | <% mt('Re-email this invoice') |h %> @@ -96,29 +112,26 @@ | <% mt('Re-fax this invoice') |h %> % } -

+% } +% if ( $curuser->access_right('Resend invoices') +% || $curuser->access_right('Print and mail invoices') ) { +

% } -% if ( $conf->exists('invoice_latex') ) { +% my $br = 0; +% if ( $conf->exists('invoice_latex') ) { <% mt('View typeset invoice PDF') |h %> -

-% } -% 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 %> ) +% $br++; % } % my @modes = grep {! $_->disabled} % $cust_bill->cust_main->agent->invoice_modes; -% if ( @modes ) { -( <% mt('View as:') %> +% if ( @modes || $include_statement_template ) { +<% $br ? '|' : '' %> +<% emt('View as:') %>
<& /elements/select-table.html, @@ -129,16 +142,49 @@ name_col => 'modename', onchange => 'change_invoice_mode', empty_label => '(default)', -&> ) + $include_statement_template ? ( + 'post_options' => [ 'statement', '(statement)' ] + ) : () +&> -% $br++; +
+% } + +% if ( $cust_bill->num_cust_event ) { +<% $br ? '|' : '' %> +<% mt('View invoice events') |h %> +% $br++; +% } +% if ( $cust_bill->tax > 0 ) { # inefficient +<% $br ? '|' : '' %> +<& /elements/popup_link.html, + 'action' => 'cust_bill_tax_matrix.html?' . $cust_bill->invnum, + 'label' => mt('View tax details'), + 'actionlabel' => mt('Tax details'), + 'width' => 1050, + 'height' => 500, + 'title' => emt('Tax details'), +&> +% $br++; +% } +% if ( $cust_bill->taxengine_request ) { # inefficient +<% $br ? '|' : '' %> +<& /elements/popup_link.html, + 'action' => 'cust_bill-taxengine_request.html?invnum=' . $cust_bill->invnum, + 'label' => mt('View raw tax engine request'), + 'actionlabel' => mt('Tax engine request'), + 'width' => 1050, + 'height' => 600, + 'title' => emt('Tax engine request'), +&> +% $br++; % } -<% $br ? '

' : '' %> +

% if ( $conf->exists('invoice_html') && ! $cgi->param('plaintext') ) { <% join('', $cust_bill->print_html(\%opt) ) %> @@ -146,7 +192,7 @@ function change_invoice_mode(obj) {
<% join('', $cust_bill->print_text(\%opt) ) |h %>
% } -<& /elements/footer.html &> +<& /elements/footer-cust_main.html &> <%init> my $curuser = $FS::CurrentUser::CurrentUser; @@ -156,7 +202,7 @@ die "access denied" my $conf = FS::Conf->new; -my( $invnum, $mode, $template, $notice_name ); +my( $invnum, $mode, $template, $notice_name, $no_coupon ); my($query) = $cgi->keywords; if ( $query =~ /^((.+)-)?(\d+)$/ ) { $template = $2; @@ -169,6 +215,15 @@ if ( $query =~ /^((.+)-)?(\d+)$/ ) { $mode = $cgi->param('mode'); } +if ($mode eq 'statement') { + $mode = undef; + $template = 'statement'; + $notice_name = 'Statement'; + $no_coupon = 1; +} + +my $include_statement_template = $conf->config('payment_receipt_statement_mode') ? 0 : 1; + my %opt = ( 'unsquelch_cdr' => $conf->exists('voip-cdr_email'), 'template' => $template, @@ -177,12 +232,6 @@ my %opt = ( $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 )) - unless @payby; -my %payby = map { $_=>1 } @payby; - my $cust_bill = qsearchs({ 'select' => 'cust_bill.*', 'table' => 'cust_bill', @@ -190,6 +239,13 @@ my $cust_bill = qsearchs({ 'hashref' => { 'invnum' => $invnum }, 'extra_sql' => ' AND '. $curuser->agentnums_sql, }); +# if we're asked for a voided invnum, redirect appropriately +if (!$cust_bill and FS::cust_bill_void->row_exists("invnum = $invnum") ) { + $m->clear_buffer; + my $url = $p.'view/cust_bill_void.html?'.$cgi->query_string; + $m->print( $cgi->redirect($url) ); + $m->abort; +} die "Invoice #$invnum not found!" unless $cust_bill; $cust_bill->set('mode' => $mode); @@ -201,5 +257,6 @@ my $link = "invnum=$invnum"; $link .= ';mode=' . $mode if $mode; $link .= ';template='. uri_escape($template) if $template; $link .= ';notice_name='. $notice_name if $notice_name; +$link .= ';no_coupon=1' if $no_coupon;