X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=391988190fe17d51d56233fa4742b5f5c7db66b9;hb=6ac45d15e85b10e3d63645c26a0a2acbad103df1;hp=ec3191971522b761ad36b01414453fcfa332518b;hpb=f3c4966ed1f6ec3db7accd6dcdd3a5a3821d72a7;p=freeside.git
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index ec3191971..391988190 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -91,24 +91,23 @@ function areyousure(href, message) {
&> |
% }
-% if ( $curuser->access_right('Merge customer') ) {
+% if ( $curuser->access_right('Merge customer')
+% and ( scalar($cust_main->ncancelled_pkgs)
+% # || we start supporting payment info merge again in some way
+% )
+% )
+% {
<& /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,
}
&> |
% }
-% if ( $conf->exists('deletecustomers')
-% && $curuser->access_right('Delete customer')
-% ) {
- <% mt('Delete this customer') |h %> |
-% }
-
% unless ( $conf->exists('disable_customer_referrals') ) {
<% mt('Refer a new customer') |h %> |
<% mt('View this customer\'s referrals') |h %>
@@ -148,7 +147,6 @@ function areyousure(href, message) {
% if ( $br ) {
% }
-%doc>
%my $signupurl = $conf->config('signupurl');
%if ( $signupurl ) {
@@ -157,11 +155,6 @@ function areyousure(href, message) {
% }
-%if ( $conf->exists('maestro-status_test') ) {
- <% mt('Test maestro status') |h %>
-
-% }
-