X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=61679006f6d3c97428533cd73250496b40e9b9ce;hb=18092846de81204c8be139ce47fd41191e5606c2;hp=ec3191971522b761ad36b01414453fcfa332518b;hpb=f3c4966ed1f6ec3db7accd6dcdd3a5a3821d72a7;p=freeside.git

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index ec3191971..61679006f 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -91,14 +91,19 @@ function areyousure(href, message) {
   &> | 
 % }
 
-% if ( $curuser->access_right('Merge customer') ) {
+% if (     $curuser->access_right('Merge customer')
+%      and (    scalar($cust_main->ncancelled_pkgs)
+%            || $conf->exists('deletecustomers')
+%          )
+%    )
+% {
   <& /elements/popup_link-cust_main.html,
               { 'action'      => $p. 'misc/merge_cust.html',
                 'label'       => emt('Merge this customer'),
                 'actionlabel' => emt('Merge customer'),
                 'cust_main'   => $cust_main,
-                'width'       => 480,
-                'height'      => 192,
+                'width'       => 569,
+                'height'      => 210,
               }
   &> | 
 % } 
@@ -126,9 +131,10 @@ function areyousure(href, message) {
 % 
 % my $email_link = ($cust_main->invoicing_list_emailonly) && 
 %   include('/elements/email-link.html',
-%            'table' => 'cust_main', 
-%            'search_hash' => { 'custnum' => $custnum },
-%            'label' => 'Email a notice to this customer',
+%            'table'               => 'cust_main', 
+%            'search_hash'         => { 'custnum' => $custnum },
+%            'agent_virt_agentnum' => $cust_main->agentnum,
+%            'label'               => 'Email a notice to this customer',
 % );
 % if ( $email_link and $br ) {
  | 
@@ -148,7 +154,6 @@ function areyousure(href, message) {
 % if ( $br ) {
   <BR><BR>
 % }
-</%doc>
 
 %my $signupurl = $conf->config('signupurl');
 %if ( $signupurl ) {
@@ -157,11 +162,6 @@ function areyousure(href, message) {
   <BR><BR>
 % } 
 
-%if ( $conf->exists('maestro-status_test') ) {
-  <A HREF="<% $p %>misc/maestro-customer_status-test.html?<% $custnum %>"><% mt('Test maestro status') |h %></A>
-  <BR><BR>
-% } 
-
 <A NAME="cust_main"></A>
 <TABLE BORDER=0>
 <TR>
@@ -271,6 +271,16 @@ function areyousure(href, message) {
 
 % }
 
+% if ( $view eq 'appointments' || $view eq 'jumbo' ) {
+
+% if ( $conf->config('ticket_system')
+%        && $curuser->access_right('View appointments') ) { 
+  <& cust_main/appointments.html, $cust_main &>
+% } 
+  <BR><BR>
+
+% }
+
 % if ( $view eq 'jumbo' ) { #XXX enable me && $curuser->access_right('View customer packages') { 
 
   <A NAME="cust_pkg"><FONT SIZE="+2"><% mt('Packages') |h %></FONT></A><BR>
@@ -347,12 +357,15 @@ $title = mt("Customer:")." ".$title;
 
 #false laziness w/pref/pref.html and Conf.pm (cust_main-default_view)
 tie my %views, 'Tie::IxHash',
-       emt('Basics')       => 'basics',
-       emt('Notes')        => 'notes', #notes and files?
+       emt('Basics')           => 'basics',
+       emt('Notes')            => 'notes', #notes and files?
 ;
-$views{emt('Tickets')}     =  'tickets'
-                               if $conf->config('ticket_system');
-$views{emt('Packages')}    =  'packages';
+if ( $conf->config('ticket_system') ) {
+  $views{emt('Tickets')}       =  'tickets';
+  $views{emt('Appointments')}  =  'appointments'
+    if $curuser->access_right('View appointments');
+}
+$views{emt('Packages')}        =  'packages';
 $views{emt('Payment History')} =  'payment_history'
                                unless $conf->config('payby-default' eq 'HIDE');
 $views{emt('Change History')}  =  'change_history'