fix more bugs

4 files changed, 97 insertions, 42 deletions

diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index a95636662..9b215389a 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
@@ -42,31 +42,29 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
   if $cgi->param('error');
 print <<END;
     <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
-    <PRE>
 END
 
 $crednum = "";
 print qq!Credit #<B>!, $crednum ? $crednum : " <I>(NEW)</I>", qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
 
-print qq!\nCustomer #<B>$custnum</B><INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
+print qq!<BR>Customer #<B>$custnum</B><INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
 
 print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
 
-print qq!\nDate: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
+print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
 
-print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
 print qq!<INPUT TYPE="hidden" NAME="credited" VALUE="">!;
 
 #print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
 
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!;
 
-print qq!\nReason <INPUT TYPE="text" NAME="reason" VALUE="$reason" SIZE=72>!;
+print qq!<BR>Reason <INPUT TYPE="text" NAME="reason" VALUE="$reason">!;
 
 print <<END;
-</PRE>
 <BR>
-<CENTER><INPUT TYPE="submit" VALUE="Post"></CENTER>
+<INPUT TYPE="submit" VALUE="Post">
 END
 
 print <<END;
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index c4cd34eab..13bad1852 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,11 +1,12 @@
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.2 2001-09-02 07:49:52 ivan Exp $ -->
+#<!-- $Id: cust_credit_bill.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $_date $amount $reason $cust_credit );
+use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $amount $reason $cust_credit );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
+use Date::Format;
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::CGI qw(header popurl);
 use FS::Record qw(qsearch fields);
@@ -32,7 +33,6 @@ if ( $cgi->param('error') ) {
   #$refund = 'yes';
   $invnum = '';
 }
-$_date = time;
 
 $otaker = getotaker;
 
@@ -44,31 +44,65 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
   if $cgi->param('error');
 print <<END;
     <FORM ACTION="${p1}process/cust_credit_bill.cgi" METHOD=POST>
-    <PRE>
 END
 
 die unless $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
 
-print qq!Credit #<B>!, $crednum, qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
+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,
+                qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } );
+
+print <<END;
+<SCRIPT>
+function changed(what) {
+  cust_bill = what.options[what.selectedIndex].value;
+END
 
-print qq!\nInvoice # <SELECT NAME="invnum" SIZE=1>!;
-foreach $_ (grep $_->owed != 0, qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } ) ) {
-  print "<OPTION", (($_->invnum eq $invnum) ? " SELECTED" : ""),
-    qq! VALUE="! .$_->invnum. qq!">!. $_->invnum. qq! (! . $_->owed . qq!)!;
+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 qq!<OPTION VALUE="Refund">Refund!;
-print "</SELECT>";
 
-print qq!\nDate: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
+print <<END;
+  if ( cust_bill == "Refund" ) {
+    what.form.amount.value = "$credited";
+  }
+}
+</SCRIPT>
+END
 
-print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+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! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
+print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
 
 print <<END;
-</PRE>
 <BR>
-<CENTER><INPUT TYPE="submit" VALUE="Post"></CENTER>
+<INPUT TYPE="submit" VALUE="Apply">
 END
 
 print <<END;
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index d1823d4b3..c83f585d1 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,8 +1,8 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi $invnum $p1 $_date $payby $payinfo $paid );
+use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
@@ -13,17 +13,27 @@ $cgi = new CGI;
 cgisuidsetup($cgi);
 
 if ( $cgi->param('error') ) {
-  $invnum = $cgi->param('invnum');
+  $link = $cgi->param('link');
+  $linknum = $cgi->param('linknum');
   $paid = $cgi->param('paid');
   $payby = $cgi->param('payby');
   $payinfo = $cgi->param('payinfo');
-} else {
-  my ($query) = $cgi->keywords;
+} elsif ($cgi->keywords) {
+  my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
-  $invnum = $1;
+  $link = 'invnum';
+  $linknum = $1;
   $paid = '';
-  $payby = "BILL";
+  $payby = 'BILL';
   $payinfo = "";
+} elsif ( $cgi->param('custnum')  =~ /^(\d+)$/ ) {
+  $link = 'custnum';
+  $linknum = $1;
+  $paid = '';
+  $payby = 'BILL';
+  $payinfo = '';
+} else {
+  die "illegal query ". $cgi->keywords;
 }
 $_date = time;
 
@@ -36,10 +46,15 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 
 print <<END;
     <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
-    <HR><PRE>
+    <INPUT TYPE="hidden" NAME="link" VALUE="$link">
+    <INPUT TYPE="hidden" NAME="linknum" VALUE="$linknum">
 END
 
-print qq!Invoice #<B>$invnum</B><INPUT TYPE="hidden" NAME="invnum" VALUE="$invnum">!;
+if ( $link eq 'invnum' ) {
+  print "Invoice #<B>$linknum</B>";
+} elsif ( $link eq 'custnum' ) {
+  print "Customer #<B>$linknum</B>";
+}
 
 print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
 
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index fcdc233b9..9be96505d 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,8 +1,8 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi $invnum $new $error );
+use vars qw( $cgi $link $linknum $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -13,24 +13,32 @@ use FS::cust_pay;
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
-$cgi->param('invnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$invnum = $1;
+$cgi->param('linknum') =~ /^(\d+)$/
+  or die "Illegal linknum: ". $cgi->param('linknum');
+$linknum = $1;
+
+$cgi->param('link') =~ /^(custnum|invnum)$/
+  or die "Illegal link: ". $cgi->param('link');
+$link = $1;
 
 $new = new FS::cust_pay ( {
+  $link => $linknum,
   map {
     $_, scalar($cgi->param($_));
-  #} qw(invnum paid _date payby payinfo paybatch)
-  } fields('cust_pay')
+  } qw(paid _date payby payinfo paybatch)
+  #} fields('cust_pay')
 } );
 
-$error=$new->insert;
+$error = $new->insert;
 
 if ($error) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). 'cust_pay.cgi?'. $cgi->query_string );
   exit;
-} else {
-  print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$invnum");
+} elsif ( $link eq 'invnum' ) {
+  print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$linknum");
+} elsif ( $link eq 'custnum' ) {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$linknum");
 }
 
 %>