From 720cf723d2c8e88760704e2fdc50ebf48e0574f2 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Tue, 3 Aug 2010 03:30:20 +0000
Subject: customer view tab for an external info page, RT#8903

---
 httemplate/view/cust_main.cgi | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'httemplate/view/cust_main.cgi')

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index f6bef43ba..0b6148da0 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -233,6 +233,10 @@ Comments
 <% include('cust_main/change_history.html', $cust_main ) %> 	 
 % }
 
+% if ( $view eq 'custom' ) { 
+<% include('cust_main/custom.html', $cust_main ) %>
+% }
+
 </DIV>
 <% include('/elements/footer.html') %>
 <%init>
@@ -273,6 +277,8 @@ $views{'Payment History'} =  'payment_history'
                                unless $conf->config('payby-default' eq 'HIDE');
 $views{'Change History'}  =  'change_history'
   if $curuser->access_right('View customer history');
+$views{$conf->config('cust_main-custom_title') || 'Custom'} =  'custom'
+  if $conf->config('cust_main-custom_link');
 $views{'Jumbo'}           =  'jumbo';
 
 my %viewname = reverse %views;
-- 
cgit v1.2.1


From 955c17771c7aa05a2609309809809be37f4c8267 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Aug 2010 19:26:22 +0000
Subject: add cust_main-title-display_custnum, RT#9621

---
 httemplate/view/cust_main.cgi | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'httemplate/view/cust_main.cgi')

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 0b6148da0..cb325e21d 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <% include('/elements/header.html', {
-             'title' => "Customer: ". $cust_main->name,
+             'title' => $title,
              'nobr'  => 1,
           })
 %>
@@ -265,6 +265,11 @@ my $cust_main = qsearchs( {
 });
 die "Customer not found!" unless $cust_main;
 
+my $title = $cust_main->name;
+$title = '('. $cust_main->display_custnum. ") $title"
+  if $conf->exists('cust_main-title-display_custnum');
+$title = "Customer: $title";
+
 #false laziness w/pref/pref.html and Conf.pm (cust_main-default_view)
 tie my %views, 'Tie::IxHash',
        'Basics'           => 'basics',
-- 
cgit v1.2.1


From 48e3f879908a13cb87786e32e158ff8a8bf18fbb Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Sat, 4 Sep 2010 02:19:03 +0000
Subject: set expire date for customer packages, RT#9697

---
 httemplate/view/cust_main.cgi | 1 +
 1 file changed, 1 insertion(+)

(limited to 'httemplate/view/cust_main.cgi')

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index cb325e21d..b4a6170c5 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -57,6 +57,7 @@ function areyousure(href, message) {
                 'color'       => '#ff0000',
                 'cust_main'   => $cust_main,
                 'width'       => 616, #make room for reasons
+                'height'      => 366,
               }
             )
   %> | 
-- 
cgit v1.2.1


From a8e4b1744a6bbd2e1509b58e73b1d52751563880 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Oct 2010 02:07:02 +0000
Subject: customer merging, RT#10247

---
 httemplate/view/cust_main.cgi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'httemplate/view/cust_main.cgi')

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index b4a6170c5..0f9c1e250 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -64,6 +64,22 @@ function areyousure(href, message) {
 
 % }
 
+% 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')
 %      ) {
-- 
cgit v1.2.1