X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=cf0c3190a66e61b4c51a4d57378d923c265139c4;hb=d9f0a98539cd8dd957ea9a4b5d77fbb739d43d2e;hp=8884ddea4404f5d16dc5d4a0f6f348bed68433de;hpb=a0e3c43f10daaff70886197ff40a47d92f2c345b;p=freeside.git diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi index 8884ddea4..cf0c3190a 100755 --- a/httemplate/view/cust_bill.cgi +++ b/httemplate/view/cust_bill.cgi @@ -9,13 +9,30 @@ function areyousure(href, message) { } -% if ( !$cust_bill->closed && $curuser->access_right('Void invoices') ) { +% 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 @@ -93,21 +110,25 @@ function areyousure(href, message) { % } -% if ( $conf->exists('invoice_latex') ) { +% my $br = 0; +% if ( $conf->exists('invoice_latex') ) { <% mt('View typeset invoice PDF') |h %> -

+ +% $br++; % } -% my $br = 0; -% if ( $cust_bill->num_cust_event ) { $br++; -( <% mt('View invoice events') |h %> ) +% if ( $cust_bill->num_cust_event ) { +<% $br ? '|' : '' %> +<% mt('View 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 ? '|' : '' %> +<% mt('View as:') %>
<& /elements/select-table.html, @@ -118,16 +139,18 @@ function areyousure(href, message) { name_col => 'modename', onchange => 'change_invoice_mode', empty_label => '(default)', -&> ) + $include_statement_template ? ( + 'post_options' => [ 'statement', '(statement)' ] + ) : () +&> -% $br++; % } -<% $br ? '

' : '' %> +

% if ( $conf->exists('invoice_html') && ! $cgi->param('plaintext') ) { <% join('', $cust_bill->print_html(\%opt) ) %> @@ -145,7 +168,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; @@ -158,6 +181,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, @@ -191,5 +223,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;