X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=c9839b9b10439e3f3cbc1438fdeb870675bffd86;hp=cb325e21dbff8ed0ca71492f116f4154aed8648c;hb=93519f9371b41ded713a93fba031ed7a361be04c;hpb=955c17771c7aa05a2609309809809be37f4c8267

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index cb325e21d..c9839b9b1 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,6 @@
 <% include('/elements/header.html', {
              'title' => $title,
+             'head'  => $head,
              'nobr'  => 1,
           })
 %>
@@ -57,12 +58,29 @@ function areyousure(href, message) {
                 'color'       => '#ff0000',
                 'cust_main'   => $cust_main,
                 'width'       => 616, #make room for reasons
+                'height'      => 366,
               }
             )
   %> | 
 
 % }
 
+% if ( $curuser->access_right('Merge customer') ) {
+
+  <% include( '/elements/popup_link-cust_main.html',
+              { 'action'      => $p. 'misc/merge_cust.html',
+                'label'       => 'Merge&nbsp;this&nbsp;customer',
+                'actionlabel' => 'Merge customer',
+                #'color'       => '#ff0000',
+                'cust_main'   => $cust_main,
+                'width'       => 480,
+                'height'      => 192,
+              }
+            )
+  %> | 
+
+% } 
+
 % if ( $conf->exists('deletecustomers')
 %        && $curuser->access_right('Delete customer')
 %      ) {
@@ -76,15 +94,29 @@ function areyousure(href, message) {
 
 <BR><BR>
 
+% my $br = 0;
 % if (    $curuser->access_right('Billing event reports') 
 %      || $curuser->access_right('View customer billing events')
 %    ) {
-
+% $br=1;
   <A HREF="<% $p %>search/cust_event.html?custnum=<% $custnum %>">View billing events for this customer</A>
-  <BR><BR>
+% }
 
+% if ( $conf->config('cust_main-external_links') ) {
+    <% $br++ ? ' | ' : '' %>
+%   my @links = split(/\n/, $conf->config('cust_main-external_links'));
+%   foreach my $link (@links) {
+%     $link =~ /^\s*(\S+)\s+(.*?)(\s*\(([^\)]*)\))?$/ or next;
+%     my($url, $label, $alt) = ($1, $2, $4);
+      <A HREF="<% $url.$custnum %>" ALT="<% $alt |h %>"><% $label |h %></A>
+%   }
 % }
 
+% if ( $br ) {
+  <BR><BR>
+% }
+</%doc>
+
 %my $signupurl = $conf->config('signupurl');
 %if ( $signupurl ) {
   This customer's signup URL: <A HREF="<% $signupurl %>?ref=<% $custnum %>"><% $signupurl %>?ref=<% $custnum %></A><BR><BR>
@@ -129,7 +161,7 @@ Comments
 <BR><BR>
 % }
 <A NAME="notes">
-% my $notecount = scalar($cust_main->notes());
+% my $notecount = scalar($cust_main->notes(0));
 % if ( ! $conf->exists('cust_main-disable_notes') || $notecount) {
 
 %   unless ( $view eq 'notes' && $cust_main->comments !~ /[^\s\n\r]/ ) {
@@ -290,4 +322,10 @@ my %viewname = reverse %views;
 
 my $view =  $cgi->param('show') || $curuser->default_customer_view;
 
+my $ie_compat = $conf->config('ie-compatibility_mode');
+my $head = '';
+if ( $ie_compat ) {
+  $head = qq(<meta http-equiv="X-UA-Compatible" content="IE=$ie_compat" />);
+}
+
 </%init>