Will things ever be the same again?

It's the final masonize

1 files changed, 79 insertions, 73 deletions

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 8267fea51..e82a5196c 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,23 +1,25 @@
-<%
+%
+%
+%my $conf = new FS::Conf;
+%
+%my $curuser = $FS::CurrentUser::CurrentUser;
+%
+%die "No customer specified (bad URL)!" unless $cgi->keywords;
+%my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
+%$query =~ /^(\d+)$/;
+%my $custnum = $1;
+%my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
+%die "Customer not found!" unless $cust_main;
+%
+%
 
-my $conf = new FS::Conf;
 
-my $curuser = $FS::CurrentUser::CurrentUser;
+<% include("/elements/header.html","Customer View: ". $cust_main->name ) %>
+% if ( $curuser->access_right('Edit customer') ) { 
 
-die "No customer specified (bad URL)!" unless $cgi->keywords;
-my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
-$query =~ /^(\d+)$/;
-my $custnum = $1;
-my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
-die "Customer not found!" unless $cust_main;
+  <A HREF="<% $p %>edit/cust_main.cgi?<% $custnum %>">Edit this customer</A> | 
+% } 
 
-%>
-
-<%= include("/elements/header.html","Customer View: ". $cust_main->name ) %>
-
-<% if ( $curuser->access_right('Edit customer') ) { %>
-  <A HREF="<%= $p %>edit/cust_main.cgi?<%= $custnum %>">Edit this customer</A> | 
-<% } %>
 
 
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
@@ -33,96 +35,100 @@ function areyousure(href, message) {
 </SCRIPT>
 
 <SCRIPT TYPE="text/javascript">
-
-<%
-my $ban = '';
-if ( $cust_main->payby =~ /^(CARD|DCRD|CHEK|DCHK)$/ ) {
-  $ban = '<BR><P ALIGN="center">'.
-         '<INPUT TYPE="checkbox" NAME="ban" VALUE="1"> Ban this customer\\\'s ';
-  if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
-    $ban .= 'credit card';
-  } elsif (  $cust_main->payby =~ /^(CHEK|DCHK)$/ ) {
-    $ban .= 'ACH account';
-  }
-}
-%>
-
-var confirm_cancel = '<FORM METHOD="POST" ACTION="<%= $p %>misc/cust_main-cancel.cgi"> <INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $custnum %>"> <BR><P ALIGN="center"><B>Permanently delete all services and cancel this customer?</B> <%= $ban%><BR><P ALIGN="CENTER"> <INPUT TYPE="submit" VALUE="Cancel customer">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="BUTTON" VALUE="Don\'t cancel" onClick="cClick()"> </FORM> ';
+%
+%my $ban = '';
+%if ( $cust_main->payby =~ /^(CARD|DCRD|CHEK|DCHK)$/ ) {
+%  $ban = '<BR><P ALIGN="center">'.
+%         '<INPUT TYPE="checkbox" NAME="ban" VALUE="1"> Ban this customer\\\'s ';
+%  if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
+%    $ban .= 'credit card';
+%  } elsif (  $cust_main->payby =~ /^(CHEK|DCHK)$/ ) {
+%    $ban .= 'ACH account';
+%  }
+%}
+%
+
+
+var confirm_cancel = '<FORM METHOD="POST" ACTION="<% $p %>misc/cust_main-cancel.cgi"> <INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>"> <BR><P ALIGN="center"><B>Permanently delete all services and cancel this customer?</B> <% $ban%><BR><P ALIGN="CENTER"> <INPUT TYPE="submit" VALUE="Cancel customer">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="BUTTON" VALUE="Don\'t cancel" onClick="cClick()"> </FORM> ';
 
 </SCRIPT>
+% if ( $curuser->access_right('Cancel customer')
+%        && $cust_main->ncancelled_pkgs
+%      ) {
+%
 
-<% if ( $curuser->access_right('Cancel customer')
-        && $cust_main->ncancelled_pkgs
-      ) {
-%>
   <A HREF="javascript:void(0);" onClick="overlib(confirm_cancel, CAPTION, 'Confirm cancellation', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, 128, TEXTSIZE, 3, BGCOLOR, '#ff0000', CGCOLOR, '#ff0000' ); return false; ">Cancel this customer</A> | 
-<% } %>
-
+% } 
+% if ( $conf->exists('deletecustomers')
+%        && $curuser->access_right('Delete customer')
+%      ) {
+%
 
-<% if ( $conf->exists('deletecustomers')
-        && $curuser->access_right('Delete customer')
-      ) {
-%>
-  <A HREF="<%= $p %>misc/delete-customer.cgi?<%= $custnum%>">Delete this customer</A> | 
-<% } %>
+  <A HREF="<% $p %>misc/delete-customer.cgi?<% $custnum%>">Delete this customer</A> | 
+% } 
+% unless ( $conf->exists('disable_customer_referrals') ) { 
 
+  <A HREF="<% popurl(2) %>edit/cust_main.cgi?referral_custnum=<% $custnum %>">Refer a new customer</A> | 
+  <A HREF="<% popurl(2) %>search/cust_main.cgi?referral_custnum=<% $custnum %>">View this customer's referrals</A>
+% } 
 
-<% unless ( $conf->exists('disable_customer_referrals') ) { %>
-  <A HREF="<%= popurl(2) %>edit/cust_main.cgi?referral_custnum=<%= $custnum %>">Refer a new customer</A> | 
-  <A HREF="<%= popurl(2) %>search/cust_main.cgi?referral_custnum=<%= $custnum %>">View this customer's referrals</A>
-<% } %>
 
 
 <BR><BR>
+%
+%my $signupurl = $conf->config('signupurl');
+%if ( $signupurl ) {
+%
+
+  This customer's signup URL: <A HREF="<% $signupurl %>?ref=<% $custnum %>"><% $signupurl %>?ref=<% $custnum %></A><BR><BR>
+% } 
 
-<%
-my $signupurl = $conf->config('signupurl');
-if ( $signupurl ) {
-%>
-  This customer's signup URL: <A HREF="<%= $signupurl %>?ref=<%= $custnum %>"><%= $signupurl %>?ref=<%= $custnum %></A><BR><BR>
-<% } %>
 
 <A NAME="cust_main"></A>
 <TABLE BORDER=0>
 <TR>
   <TD VALIGN="top">
-    <%= include('cust_main/contacts.html', $cust_main ) %>
+    <% include('cust_main/contacts.html', $cust_main ) %>
   </TD>
   <TD VALIGN="top" STYLE="padding-left: 54px">
-    <%= include('cust_main/misc.html', $cust_main ) %>
-    <% if ( $conf->config('payby-default') ne 'HIDE' ) { %>
+    <% include('cust_main/misc.html', $cust_main ) %>
+% if ( $conf->config('payby-default') ne 'HIDE' ) { 
+
       <BR>
-      <%= include('cust_main/billing.html', $cust_main ) %>
-    <% } %>
+      <% include('cust_main/billing.html', $cust_main ) %>
+% } 
+
   </TD>
 </TR>
 </TABLE>
+%
+%if ( defined $cust_main->dbdef_table->column('comments')
+%     && $cust_main->comments =~ /[^\s\n\r]/              ) {
+%
 
-<%
-if ( defined $cust_main->dbdef_table->column('comments')
-     && $cust_main->comments =~ /[^\s\n\r]/              ) {
-%>
 <BR>
 Comments
-<%= ntable("#cccccc") %><TR><TD><%= ntable("#cccccc",2) %>
+<% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
 <TR>
   <TD BGCOLOR="#ffffff">
-    <PRE><%= encode_entities($cust_main->comments) %></PRE>
+    <PRE><% encode_entities($cust_main->comments) %></PRE>
   </TD>
 </TR>
 </TABLE></TABLE>
-<% } %>
+% } 
+% if ( $conf->config('ticket_system') ) { 
 
-<% if ( $conf->config('ticket_system') ) { %>
   <BR>
-  <%= include('cust_main/tickets.html', $cust_main ) %>
-<% } %>
+  <% include('cust_main/tickets.html', $cust_main ) %>
+% } 
+
 
 <BR><BR>
-<%= include('cust_main/packages.html', $cust_main ) %>
+<% include('cust_main/packages.html', $cust_main ) %>
+% if ( $conf->config('payby-default') ne 'HIDE' ) { 
+
+  <% include('cust_main/payment_history.html', $cust_main ) %>
+% } 
 
-<% if ( $conf->config('payby-default') ne 'HIDE' ) { %>
-  <%= include('cust_main/payment_history.html', $cust_main ) %>
-<% } %>
 
-<%= include('/elements/footer.html') %>
+<% include('/elements/footer.html') %>