Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / httemplate / view / cust_bill.cgi

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index c95e01d..762eec0 100755 (executable)
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,13 +1,6 @@
-<& /elements/header.html, mt('Invoice View'), menubar(
-  emt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
-) &>
+<& /elements/header-cust_main.html, view=>'payment_history', custnum=>$custnum &>
 
-<SCRIPT TYPE="text/javascript">
-function areyousure(href, message) {
-  if (confirm(message) == true)
-    window.location.href = href;
-}
-</SCRIPT>
+<h2>Invoice #<% $invnum %></h2>
 
 % if ( !$cust_bill->closed ) { # otherwise allow no changes
 %   my $can_delete = $conf->exists('deleteinvoices')
@@ -83,7 +76,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>
@@ -98,7 +91,10 @@ function areyousure(href, message) {
         <A HREF="<% $p %>misc/send-invoice.cgi?method=print;<% $link %>"><% mt('Print this invoice') |h %></A>
 % }
 
-% if ( $curuser->access_right('Print and mail invoices') ) {
+% 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',
@@ -129,19 +125,13 @@ function areyousure(href, message) {
   <A HREF="<% $p %>view/cust_bill-pdf.cgi?<% $link %>"><% mt('View typeset invoice PDF') |h %></A>
 
 %   $br++;
-% } 
-
-% 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 || $include_statement_template ) {
 <% $br ? '|' : '' %>
-<% mt('View as:') %>
+<% emt('View as:') %>
 <FORM STYLE="display:inline" ACTION="<% $cgi->url %>" METHOD="GET">
 <INPUT NAME="invnum" VALUE="<% $invnum %>" TYPE="hidden">
 <& /elements/select-table.html,
@@ -161,6 +151,37 @@ function change_invoice_mode(obj) {
   obj.form.submit();
 }
 </SCRIPT>
+</FORM>
+% }
+
+% 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++;
+% }
+% 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><BR>
@@ -171,7 +192,7 @@ function change_invoice_mode(obj) {
   <PRE><% join('', $cust_bill->print_text(\%opt) ) |h %></PRE>
 % } 
 
-<& /elements/footer.html &>
+<& /elements/footer-cust_main.html &>
 <%init>
 
 my $curuser = $FS::CurrentUser::CurrentUser;