X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=6d5277612f190d181b3a4519bf7380ae19dcbade;hp=d73edbd79aa0d26a19117c4c0eb0e66781a87f58;hb=4dc075fc38008d1c6cbe9b88b2bdb32bdc92adbf;hpb=4f223dd481c3a9c7816bed964ff45171f9b5d014

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index d73edbd79..6d5277612 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -83,7 +83,7 @@ function areyousure(href, message) {
 %   $onclick = '<A HREF="#" onclick="'.$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) ) %>
       (&nbsp;<% $onclick %><% mt('change') |h %></A>&nbsp;)
       <BR><BR>
@@ -95,8 +95,21 @@ function areyousure(href, message) {
 % }
 
 % if ( $curuser->access_right('Resend invoices') ) {
+        <A HREF="<% $p %>misc/send-invoice.cgi?method=print;<% $link %>"><% mt('Print this invoice') |h %></A>
+% }
+
+% 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',
+          &>
+% }
 
-    <A HREF="<% $p %>misc/send-invoice.cgi?method=print;<% $link %>"><% mt('Re-print this invoice') |h %></A>
+% if ( $curuser->access_right('Resend invoices') ) {
 
 %   if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) { 
         | <A HREF="<% $p %>misc/send-invoice.cgi?method=email;<% $link %>"><% mt('Re-email this invoice') |h %></A>
@@ -106,25 +119,32 @@ function areyousure(href, message) {
         | <A HREF="<% $p %>misc/send-invoice.cgi?method=fax;<% $link %>"><% mt('Re-fax this invoice') |h %></A>
 %   } 
 
-    <BR><BR>
+% }
 
+% if (    $curuser->access_right('Resend invoices')
+%      || $curuser->access_right('Print and mail invoices') ) {
+        <BR><BR>
 % } 
 
-% if ( $conf->exists('invoice_latex') ) { 
+% my $br = 0;
+% if ( $conf->exists('invoice_latex') ) {
 
   <A HREF="<% $p %>view/cust_bill-pdf.cgi?<% $link %>"><% mt('View typeset invoice PDF') |h %></A>
-  <BR><BR>
+
+%   $br++;
 % } 
 
-% 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_event ) {
+<% $br ? '|' : '' %>
+<A HREF="<%$p%>search/cust_event.html?invnum=<% $cust_bill->invnum %>"><% mt('View invoice events') |h %></A> 
+%   $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:') %>
 <FORM STYLE="display:inline" ACTION="<% $cgi->url %>" METHOD="GET">
 <INPUT NAME="invnum" VALUE="<% $invnum %>" TYPE="hidden">
 <& /elements/select-table.html,
@@ -135,16 +155,18 @@ function areyousure(href, message) {
   name_col    => 'modename',
   onchange    => 'change_invoice_mode',
   empty_label => '(default)',
-&> )
+  $include_statement_template ? (
+    'post_options' => [ 'statement', '(statement)' ]
+  ) : ()
+&>
 <SCRIPT TYPE="text/javascript">
 function change_invoice_mode(obj) {
   obj.form.submit();
 }
 </SCRIPT>
-% $br++;
 % }
 
-<% $br ? '<BR><BR>' : '' %>
+<BR><BR>
 
 % if ( $conf->exists('invoice_html') && ! $cgi->param('plaintext') ) { 
   <% join('', $cust_bill->print_html(\%opt) ) %>
@@ -162,7 +184,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;
@@ -175,6 +197,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,
@@ -208,5 +239,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;
 
 </%init>