continue making hours/input/output/total display on invoices conditional on there...

[freeside.git] / httemplate / edit / cust_pay.cgi

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 6669b9d..f6ae7b2 100755 (executable)
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,28 +1,16 @@
+<!-- mason kludge -->
 <%
-#<!-- $Id: cust_pay.cgi,v 1.6 2001-12-21 21:40:24 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
-use Date::Format;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::Conf;
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl ntable);
 
 my $conf = new FS::Conf;
 
-my $countrydefault = $conf->config('countrydefault') || 'US';
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
+my($link, $linknum, $paid, $payby, $payinfo, $quickpay); 
 if ( $cgi->param('error') ) {
   $link = $cgi->param('link');
   $linknum = $cgi->param('linknum');
   $paid = $cgi->param('paid');
   $payby = $cgi->param('payby');
   $payinfo = $cgi->param('payinfo');
+  $quickpay = $cgi->param('quickpay');
 } elsif ($cgi->keywords) {
   my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
@@ -31,28 +19,33 @@ if ( $cgi->param('error') ) {
   $paid = '';
   $payby = 'BILL';
   $payinfo = "";
+  $quickpay = '';
 } elsif ( $cgi->param('custnum')  =~ /^(\d+)$/ ) {
   $link = 'custnum';
   $linknum = $1;
   $paid = '';
   $payby = 'BILL';
   $payinfo = '';
+  $quickpay = $cgi->param('quickpay');
 } else {
   die "illegal query ". $cgi->keywords;
 }
-$_date = time;
+my $_date = time;
 
-$p1 = popurl(1);
-print header("Enter payment", '');
+my $paybatch = "webui-$_date-$$-". rand() * 2**32;
+
+my $p1 = popurl(1);
+print header("Post payment", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
+      "</FONT><BR><BR>"
   if $cgi->param('error');
 
 print <<END, ntable("#cccccc",2);
     <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
     <INPUT TYPE="hidden" NAME="link" VALUE="$link">
     <INPUT TYPE="hidden" NAME="linknum" VALUE="$linknum">
+    <INPUT TYPE="hidden" NAME="quickpay" VALUE="$quickpay">
 END
 
 my $custnum;
@@ -94,7 +87,7 @@ if ( $link eq 'invnum' ) {
     }
 
   }
-  print '</TD></TR></TABLE>';
+  print '</TD></TR></TABLE><BR><BR>';
 
   $custnum = $cust_bill->custnum;
 
@@ -102,65 +95,32 @@ if ( $link eq 'invnum' ) {
   $custnum = $linknum;
 }
 
-print "<BR><BR>Customer #<B>$custnum</B>". ntable('#e8e8e8');
-my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
-  or die "unknown custnum $custnum";
-
-print '<TR><TD>'. ntable("#cccccc",2).
-      '<TR><TD ALIGN="right" VALIGN="top">Billing</TD><TD BGCOLOR="#ffffff">'.
-      $cust_main->getfield('last'). ', '. $cust_main->first. '<BR>';
-print $cust_main->company. '<BR>' if $cust_main->company;
-print $cust_main->address1. '<BR>';
-print $cust_main->address2. '<BR>' if $cust_main->address2;
-print $cust_main->city. ', '. $cust_main->state. '  '. $cust_main->zip. '<BR>';
-print $cust_main->country. '<BR>' if $cust_main->country
-                                     && $cust_main->country ne $countrydefault;
-
-print '</TD>'.
-      '</TR></TABLE></TD>';
-
-if ( defined $cust_main->dbdef_table->column('ship_last') ) {
-
-  print '<TD>'. ntable("#cccccc",2).
-        '<TR><TD ALIGN="right" VALIGN="top">Service</TD><TD BGCOLOR="#ffffff">'.
-        $cust_main->getfield('ship_last'). ', '. $cust_main->ship_first. '<BR>';
-  print $cust_main->ship_company. '<BR>' if $cust_main->ship_company;
-  print $cust_main->ship_address1. '<BR>';
-  print $cust_main->ship_address2. '<BR>' if $cust_main->ship_address2;
-  print $cust_main->ship_city. ', '. $cust_main->ship_state. '  '. $cust_main->ship_zip. '<BR>';
-  print $cust_main->ship_country. '<BR>'
-    if $cust_main->ship_country && $cust_main->ship_country ne $countrydefault;
-
-  print '</TD>'.
-        '</TR></TABLE></TD>';
-}
-
-print '</TR></TABLE>';
+print small_custview($custnum, $conf->config('countrydefault'));
 
+print qq!<INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
+print qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
 
 print '<BR><BR>Payment'. ntable("#cccccc", 2).
       '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
-      time2str("%D",$_date).  '</TD></TR>'.
-      qq!<INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
+      time2str("%D",$_date).  '</TD></TR>';
 
 print qq!<TR><TD ALIGN="right">Amount</TD><TD BGCOLOR="#ffffff">\$<INPUT TYPE="text" NAME="paid" VALUE="$paid" SIZE=8 MAXLENGTH=8></TD></TR>!;
 
-print qq!<TR><TD ALIGN="right">Payby</TD><TD BGCOLOR="#ffffff">$payby</TD></TR><INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
+print qq!<TR><TD ALIGN="right">Payby</TD><TD BGCOLOR="#ffffff">$payby</TD></TR>!;
 
 #payinfo (check # now as payby="BILL" hardcoded.. what to do later?)
 print qq!<TR><TD ALIGN="right">Check #</TD><TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo"></TD></TR>!;
 
+print qq!<TR><TD ALIGN="right">Auto-apply<BR>to invoices</TD><TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>!;
+
+print "</TABLE>";
+
 #paybatch
-print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
+print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="$paybatch">!;
 
 print <<END;
-</TABLE>
 <BR>
 <INPUT TYPE="submit" VALUE="Post payment">
-END
-
-print <<END;
-
     </FORM>
   </BODY>
 </HTML>