fix display of contacts on customer basics tab, #25536

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

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 3440304..d73edbd 100755 (executable)
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -2,30 +2,40 @@
   emt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
 ) &>
 
-% if ( $conf->exists('deleteinvoices')
-%      && $curuser->access_right('Delete invoices' )
-%    )
-% {
-
-    <SCRIPT TYPE="text/javascript">
-    function areyousure(href, message) {
-      if (confirm(message) == true)
-        window.location.href = href;
-    }
-    </SCRIPT>
-
-    <A HREF  = "javascript:areyousure(
-                  '<%$p%>misc/delete-cust_bill.html?<% $invnum %>',
-                  '<% mt('Are you sure you want to delete this invoice?') |h %>'
-               )"
-       TITLE = "<% mt('Delete this invoice from the database completely') |h %>"
-    ><% mt('Delete this invoice') |h %></A>
-    <BR><BR>
+<SCRIPT TYPE="text/javascript">
+function areyousure(href, message) {
+  if (confirm(message) == true)
+    window.location.href = href;
+}
+</SCRIPT>
 
+% 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 ) {
+  &nbsp;|&nbsp;
+%   }
+%   if ( $can_delete ) {
+    <A href="" onclick="areyousure(\
+      '<%$p%>misc/delete-cust_bill.html?<% $invnum %>',\
+      <% mt('Are you sure you want to delete this invoice?') |js_string %>)"\
+    TITLE = "<% mt('Delete this invoice from the database completely') |h %>">\
+    <% emt('Delete this invoice') |h %></A>
+%   }
+%   if ( $can_void or $can_delete ) {
+  <BR><BR>
+%   }
 % }
 
 % if ( $cust_bill->owed > 0
-%      && scalar( grep $payby{$_}, qw(BILL CASH WEST MCRD) )
 %      && $curuser->access_right(['Post payment', 'Post check payment', 'Post cash payment'])
 %      && ! $conf->exists('pkg-balances')
 %    )
@@ -34,25 +44,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++ ? ' | ' : '' %>
           <A HREF="<% $p %>edit/cust_pay.cgi?payby=BILL;invnum=<% $invnum %>"><% mt('check') |h %></A>
 %     } 
 
-%     if ( $payby{'CASH'} && $curuser->access_right(['Post payment', 'Post cash payment']) ) { 
+%     if ( $curuser->access_right(['Post payment', 'Post cash payment']) ) { 
           <% $s++ ? ' | ' : '' %>
           <A HREF="<% $p %>edit/cust_pay.cgi?payby=CASH;invnum=<% $invnum %>"><% mt('cash') |h %></A>
 %     } 
 
-%     if ( $payby{'WEST'} && $curuser->access_right(['Post payment']) ) { 
-          <% $s++ ? ' | ' : '' %>
-          <A HREF="<% $p %>edit/cust_pay.cgi?payby=WEST;invnum=<% $invnum %>"><% mt('Western Union') |h %></A>
-%     } 
-
-%     if ( $payby{'MCRD'} && $curuser->access_right(['Post payment']) ) { 
-          <% $s++ ? ' | ' : '' %>
-          <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCRD;invnum=<% $invnum %>"><% mt('manual credit card') |h %></A>
-%     } 
+%#  %     if ( $payby{'WEST'} && $curuser->access_right(['Post payment']) ) { 
+%#            <% $s++ ? ' | ' : '' %>
+%#            <A HREF="<% $p %>edit/cust_pay.cgi?payby=WEST;invnum=<% $invnum %>"><% mt('Western Union') |h %></A>
+%#  %     } 
+%#  
+%#  %     if ( $payby{'MCRD'} && $curuser->access_right(['Post payment']) ) { 
+%#            <% $s++ ? ' | ' : '' %>
+%#            <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCRD;invnum=<% $invnum %>"><% mt('manual credit card') |h %></A>
+%#  %     } 
+%#  
+%#  %     if ( $payby{'MCHK'} && $curuser->access_right(['Post payment']) ) { 
+%#            <% $s++ ? ' | ' : '' %>
+%#            <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCHK;invnum=<% $invnum %>"><% mt('manual electronic check') |h %></A>
+%#  %     } 
 
       <% mt('payment against this invoice') |h %><BR><BR>
 
@@ -106,10 +121,6 @@
 <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 ) {
@@ -172,12 +183,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',
@@ -185,6 +190,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);