diff options
author | Ivan Kohler <ivan@freeside.biz> | 2013-10-08 23:00:26 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2013-10-08 23:00:26 -0700 |
commit | fe4515eb37d76849dd08c62782d86bc7ba311dcd (patch) | |
tree | 6952cc3598de0c72b6a3eab1d53bde07a16c27f2 /httemplate/view | |
parent | f2766e203e1aa144d046a26cf13e01e1f5b00f64 (diff) | |
parent | 81ae0992cf8506c6a77485548ebde25eb946a9a9 (diff) |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Conflicts:
FS/FS/cust_main.pm
Diffstat (limited to 'httemplate/view')
-rwxr-xr-x | httemplate/view/cust_bill.cgi | 35 | ||||
-rwxr-xr-x | httemplate/view/cust_main.cgi | 1 | ||||
-rwxr-xr-x | httemplate/view/cust_statement.html | 4 | ||||
-rw-r--r-- | httemplate/view/elements/cust_bill-typeset | 7 |
4 files changed, 38 insertions, 9 deletions
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi index 95ce60b..4822ab7 100755 --- a/httemplate/view/cust_bill.cgi +++ b/httemplate/view/cust_bill.cgi @@ -104,12 +104,35 @@ % my $br = 0; % if ( $cust_bill->num_cust_event ) { $br++; <A HREF="<%$p%>search/cust_event.html?invnum=<% $cust_bill->invnum %>">( <% mt('View invoice events') |h %> )</A> -% } +% } % if ( $cust_bill->num_cust_bill_event ) { $br++; <A HREF="<%$p%>search/cust_bill_event.cgi?invnum=<% $cust_bill->invnum %>">( <% mt('View deprecated, old-style invoice events') |h %> )</A> % } +% my @modes = grep {! $_->disabled} +% $cust_bill->cust_main->agent->invoice_modes; +% if ( @modes ) { +( <% mt('View as:') %> +<FORM STYLE="display:inline" ACTION="<% $cgi->url %>" METHOD="GET"> +<INPUT NAME="invnum" VALUE="<% $invnum %>" TYPE="hidden"> +<& /elements/select-table.html, + table => 'invoice_mode', + field => 'mode', + curr_value => scalar($cgi->param('mode')), + records => \@modes, + name_col => 'modename', + onchange => 'change_invoice_mode', + empty_label => '(default)', +&> ) +<SCRIPT TYPE="text/javascript"> +function change_invoice_mode(obj) { + obj.form.submit(); +} +</SCRIPT> +% $br++; +% } + <% $br ? '<BR><BR>' : '' %> % if ( $conf->exists('invoice_html') ) { @@ -126,7 +149,9 @@ my $curuser = $FS::CurrentUser::CurrentUser; die "access denied" unless $curuser->access_right('View invoices'); -my( $invnum, $template, $notice_name ); +my $conf = FS::Conf->new; + +my( $invnum, $mode, $template, $notice_name ); my($query) = $cgi->keywords; if ( $query =~ /^((.+)-)?(\d+)$/ ) { $template = $2; @@ -136,10 +161,9 @@ if ( $query =~ /^((.+)-)?(\d+)$/ ) { $invnum = $cgi->param('invnum'); $template = $cgi->param('template'); $notice_name = $cgi->param('notice_name'); + $mode = $cgi->param('mode'); } -my $conf = new FS::Conf; - my %opt = ( 'unsquelch_cdr' => $conf->exists('voip-cdr_email'), 'template' => $template, @@ -163,10 +187,13 @@ my $cust_bill = qsearchs({ }); die "Invoice #$invnum not found!" unless $cust_bill; +$cust_bill->set('mode' => $mode); + my $custnum = $cust_bill->custnum; my $display_custnum = $cust_bill->cust_main->display_custnum; my $link = "invnum=$invnum"; +$link .= ';mode=' . $mode if $mode; $link .= ';template='. uri_escape($template) if $template; $link .= ';notice_name='. $notice_name if $notice_name; diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index 430c50c..3919881 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -147,7 +147,6 @@ function areyousure(href, message) { % if ( $br ) { <BR><BR> % } -</%doc> %my $signupurl = $conf->config('signupurl'); %if ( $signupurl ) { diff --git a/httemplate/view/cust_statement.html b/httemplate/view/cust_statement.html index 3e1345e..5d37b31 100755 --- a/httemplate/view/cust_statement.html +++ b/httemplate/view/cust_statement.html @@ -35,10 +35,10 @@ % if ( $conf->exists('invoice_html') ) { - <% join('', $cust_statement->print_html('', $templatename) ) %> + <% join('', $cust_statement->print_html('template' => $templatename) ) %> % } else { - <PRE><% join('', $cust_statement->print_text('', $templatename) ) %></PRE> + <PRE><% join('', $cust_statement->print_text('template' => $templatename) ) %></PRE> % } <% include('/elements/footer.html') %> diff --git a/httemplate/view/elements/cust_bill-typeset b/httemplate/view/elements/cust_bill-typeset index 00f503f..778e538 100644 --- a/httemplate/view/elements/cust_bill-typeset +++ b/httemplate/view/elements/cust_bill-typeset @@ -6,7 +6,7 @@ die "access denied" my $type = shift; -my( $invnum, $template, $notice_name ); +my( $invnum, $mode, $template, $notice_name ); my($query) = $cgi->keywords; if ( $query =~ /^((.+)-)?(\d+)(.pdf)?$/ ) { #probably not necessary anymore? $template = $2; @@ -16,7 +16,8 @@ if ( $query =~ /^((.+)-)?(\d+)(.pdf)?$/ ) { #probably not necessary anymore? $invnum = $cgi->param('invnum'); $invnum =~ s/\.pdf//i; #probably not necessary anymore $template = $cgi->param('template'); - $notice_name = ( $cgi->param('notice_name') || 'Invoice' ); + $notice_name = $cgi->param('notice_name'); + $mode = $cgi->param('mode'); } my $conf = new FS::Conf; @@ -36,6 +37,8 @@ my $cust_bill = qsearchs({ }); die "Invoice #$invnum not found!" unless $cust_bill; +$cust_bill->set(mode => $mode); + my $method = "print_$type"; my $content = $cust_bill->$method(\%opt); |