first part of ACL and re-skinning work and some other small stuff

1 files changed, 78 insertions, 58 deletions

diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index ce1c86612..174d4dde1 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
 my %pkg = ();
@@ -29,48 +28,62 @@ if ( $cgi->param('error') ) {
 }
 
 my $p1 = popurl(1);
-print header("Add/Edit Packages", '');
 
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
+%><%= include('/elements/header.html', "Add/Edit Packages", '') %>
 
-print qq!<FORM ACTION="${p1}process/cust_pkg.cgi" METHOD=POST>!;
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
 
-print qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
+<FORM ACTION="<%= $p1 %>process/cust_pkg.cgi" METHOD=POST>
 
+<INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $custnum %>">
+
+<%
 #current packages
-my @cust_pkg = qsearch('cust_pkg',{ 'custnum' => $custnum, 'cancel' => '' } );
+my @cust_pkg = qsearch('cust_pkg', { 'custnum' => $custnum, 'cancel' => '' } );
 
 if (@cust_pkg) {
-  print <<END;
-Current packages - select to remove (services are moved to a new package below)
-<TABLE>
-  <TR STYLE="background-color: #cccccc;">
-    <TH COLSPAN="2">Pkg #</TH>
-    <TH>Package description</TH>
-  </TR>
-<BR><BR>
-END
+%>
+
+  Current packages - select to remove (services are moved to a new package below)
+  <TABLE>
+    <TR STYLE="background-color: #cccccc;">
+      <TH COLSPAN="2">Pkg #</TH>
+      <TH>Package description</TH>
+    </TR>
+  <BR><BR>
 
-  foreach (sort { $all_pkg{$a->getfield('pkgpart')} cmp $all_pkg{$b->getfield('pkgpart')} } @cust_pkg) {
+  <%
+
+  foreach ( sort {     $all_pkg{ $a->getfield('pkgpart') }
+                   cmp $all_pkg{ $b->getfield('pkgpart') }
+                 }
+                 @cust_pkg
+          )
+  {
     my($pkgnum,$pkgpart)=( $_->getfield('pkgnum'), $_->getfield('pkgpart') );
     my $checked = $remove_pkg{$pkgnum} ? ' CHECKED' : '';
-    print <<END;
-  <TR>
-    <TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="$pkgnum"${checked}></TD>
-    <TD ALIGN="right">$pkgnum:</TD>\n
-    <TD>$all_pkg{$pkgpart} - $all_comment{$pkgpart}</TD>
-  </TR>
-END
-  }
-  print qq!</TABLE><BR><BR>!;
-}
 
-print <<END;
-Order new packages<BR><BR>
-END
+  %>
+
+    <TR>
+      <TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="<%= $pkgnum %>"<%= $checked %>></TD>
+      <TD ALIGN="right"><%= $pkgnum %>:</TD>
+      <TD><%= $all_pkg{$pkgpart} %> - <%= $all_comment{$pkgpart} %></TD>
+    </TR>
+
+  <% } %>
+
+  </TABLE>
+  <BR><BR>
 
+<% } %>
+
+Order new packages
+<BR><BR>
+
+<%
 my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 my $agent = qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
 
@@ -79,13 +92,15 @@ my %agent_pkgs = map { ( $_->pkgpart , $all_pkg{$_->pkgpart} ) }
 
 my $count = 0;
 my $pkgparts = 0;
-print <<END;
+%>
+
 <TABLE>
   <TR STYLE="background-color: #cccccc;">
     <TH>Qty.</TH>
     <TH COLSPAN="2">Package Description</TH>
   </TR>
-END
+
+<%
 #foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
 foreach my $pkgpart ( sort { $agent_pkgs{$a} cmp $agent_pkgs{$b} }
                              keys(%agent_pkgs) ) {
@@ -93,38 +108,43 @@ foreach my $pkgpart ( sort { $agent_pkgs{$a} cmp $agent_pkgs{$b} }
   next unless exists $pkg{$pkgpart}; #skip disabled ones
   #print qq!<TR>! if ( $count == 0 );
   my $value = $cgi->param("pkg$pkgpart") || 0;
-  print <<END;
+%>
+
   <TR>
-    <TD><INPUT TYPE="text" NAME="pkg$pkgpart" VALUE="$value" SIZE="2" MAXLENGTH="2"></TD>
-    <TD ALIGN="right">$pkgpart:</TD>
-    <TD>$pkg{$pkgpart} - $comment{$pkgpart}</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="<%= "pkg$pkgpart" %>" VALUE="<%= $value %>" SIZE="2" MAXLENGTH="2">
+    </TD>
+    <TD ALIGN="right"><%= $pkgpart %>:</TD>
+    <TD><%= $pkg{$pkgpart} %> - <%= $comment{$pkgpart}%></TD>
   </TR>
-END
+
+<%
   $count ++ ;
   #if ( $count == 2 ) {
   #  print qq!</TR>\n! ;
   #  $count = 0;
   #}
 }
-print qq!</TABLE>!;
-
-unless ( $pkgparts ) {
-  my $p2 = popurl(2);
-  my $typenum = $agent->typenum;
-  my $agent_type = qsearchs( 'agent_type', { 'typenum' => $typenum } );
-  my $atype = $agent_type->atype;
-  print <<END;
-(No <a href="${p2}browse/part_pkg.cgi">package definitions</a>, or agent type
-<a href="${p2}edit/agent_type.cgi?$typenum">$atype</a> not allowed to purchase
-any packages.)
-END
-}
+%>
 
-#submit
-print <<END;
-<P><INPUT TYPE="submit" VALUE="Order">
-    </FORM>
-  </BODY>
-</HTML>
-END
+</TABLE>
+
+<% unless ( $pkgparts ) {
+     my $p2 = popurl(2);
+     my $typenum = $agent->typenum;
+     my $agent_type = qsearchs( 'agent_type', { 'typenum' => $typenum } );
+     my $atype = $agent_type->atype;
 %>
+
+     (No <A HREF="<%= $p2 %>browse/part_pkg.cgi">package definitions</A>,
+     or agent type
+     <A HREF="<%= $p2 %>edit/agent_type.cgi?<%= $typenum %>"><%= $atype %></a>
+     is not allowed to purchase any packages.)
+
+<% } %>
+
+<P><INPUT TYPE="submit" VALUE="Order">
+
+</FORM>
+
+<%= include('/elements/footer.html') %>