1 files changed, 62 insertions, 71 deletions
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index 1a97e1312..249ba31d0 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,6 +1,61 @@
-<!-- mason kludge -->
-<%
+<%  header("Apply Credit", '') %>
 
+% if ( $cgi->param('error') ) { 
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <% $cgi->param('error') %></FONT>
+  <BR><BR>
+% } 
+
+<FORM ACTION="<% $p1 %>process/cust_credit_bill.cgi" METHOD=POST>
+
+Credit #<B><% $crednum %></B>
+<INPUT TYPE="hidden" NAME="crednum" VALUE="<% $crednum %>">
+
+<BR>Date: <B><% time2str("%D", $cust_credit->_date) %></B>
+
+<BR>Amount: $<B><% $cust_credit->amount %></B>
+
+<BR>Unapplied amount: $<B><% $credited %></B>
+
+<BR>Reason: <B><% $cust_credit->reason %></B>
+
+<SCRIPT>
+function changed(what) {
+  cust_bill = what.options[what.selectedIndex].value;
+
+% foreach my $cust_bill ( @cust_bill ) {
+
+  if ( cust_bill == <% $cust_bill->invnum %> ) {
+    what.form.amount.value = "<% min($cust_bill->owed, $credited) %>";
+  }
+
+% } 
+
+  if ( cust_bill == "Refund" ) {
+    what.form.amount.value = "<% $credited %>";
+  }
+}
+</SCRIPT>
+
+<BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">
+<OPTION VALUE="">
+
+% foreach my $cust_bill ( @cust_bill ) { 
+  <OPTION<% $cust_bill->invnum eq $invnum ? ' SELECTED' : '' %> VALUE="<% $cust_bill->invnum %>"><% $cust_bill->invnum %> - <% time2str("%D",$cust_bill->_date) %> - $<% $cust_bill->owed %>
+% } 
+
+<OPTION VALUE="Refund">Refund
+</SELECT>
+
+<BR>Amount $<INPUT TYPE="text" NAME="amount" VALUE="<% $amount %>" SIZE=8 MAXLENGTH=8>
+
+<BR>
+<CENTER><INPUT TYPE="submit" VALUE="Apply"></CENTER>
+
+</FORM>
+</BODY>
+</HTML>
+
+<%init>
 my($crednum, $amount, $invnum);
 if ( $cgi->param('error') ) {
   #$cust_credit_bill = new FS::cust_credit_bill ( {
@@ -23,79 +78,15 @@ my $otaker = getotaker;
 
 my $p1 = popurl(1);
 
-print header("Apply Credit", '');
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT><BR><BR>"
-  if $cgi->param('error');
-print <<END;
-    <FORM ACTION="${p1}process/cust_credit_bill.cgi" METHOD=POST>
-END
-
 my $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
 die "credit $crednum not found!" unless $cust_credit;
 
 my $credited = $cust_credit->credited;
 
-print "Credit # <B>$crednum</B>".
-      qq!<INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!.
-      '<BR>Date: <B>'. time2str("%D", $cust_credit->_date). '</B>'.
-      '<BR>Amount: $<B>'. $cust_credit->amount. '</B>'.
-      "<BR>Unapplied amount: \$<B>$credited</B>".
-      '<BR>Reason: <B>'. $cust_credit->reason. '</B>'
-      ;
-
-my @cust_bill = grep $_->owed != 0,
+my @cust_bill = sort {    $a->_date  <=> $b->_date
+                       or $a->invnum <=> $b->invnum
+                     }
+                grep { $_->owed != 0 }
                 qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } );
+</%init>
 
-print <<END;
-<SCRIPT>
-function changed(what) {
-  cust_bill = what.options[what.selectedIndex].value;
-END
-
-foreach my $cust_bill ( @cust_bill ) {
-  my $invnum = $cust_bill->invnum;
-  my $changeto = $cust_bill->owed < $cust_credit->credited
-                   ? $cust_bill->owed 
-                   : $cust_credit->credited;
-  print <<END;
-  if ( cust_bill == $invnum ) {
-    what.form.amount.value = "$changeto";
-  }
-END
-}
-
-print <<END;
-  if ( cust_bill == "Refund" ) {
-    what.form.amount.value = "$credited";
-  }
-}
-</SCRIPT>
-END
-
-print qq!<BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">!,
-      '<OPTION VALUE="">';
-foreach my $cust_bill ( @cust_bill ) {
-  print '<OPTION'. ( $cust_bill->invnum eq $invnum ? ' SELECTED' : '' ).
-        ' VALUE="'. $cust_bill->invnum. '">'. $cust_bill->invnum.
-        ' -  '. time2str("%D",$cust_bill->_date).
-        ' - $'. $cust_bill->owed;
-}
-print qq!<OPTION VALUE="Refund">Refund!;
-print "</SELECT>";
-
-print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
-
-print <<END;
-<BR>
-<INPUT TYPE="submit" VALUE="Apply">
-END
-
-print <<END;
-
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-%>