X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=b3ea336e9f20107eee44166e798543e32b6a33e3;hp=cba7026704a97b128f8f948616ec5414417a4722;hb=1e4aa8069f25e1b4101da20bb9e0d3f60357ea52;hpb=aa7b51c0794f6a61e522fbba978f6c64446d8696

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index cba702670..b3ea336e9 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.5 2001-08-28 14:34:14 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.9 2001-09-04 14:44:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -20,6 +20,8 @@ use FS::part_referral;
 use FS::agent;
 use FS::cust_main;
 use FS::cust_refund;
+use FS::cust_bill_pay;
+use FS::cust_credit_bill;
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
@@ -151,11 +153,11 @@ print '<TD VALIGN="top">';
 
   @agents = qsearch( 'agent', {} );
   unless ( scalar(@agents) == 1 ) {
-    $agent = qsearchs('agent',{
-      'agentnum' => $cust_main->agentnum
-    } );
+    $agent = qsearchs('agent',{ 'agentnum' => $cust_main->agentnum } );
     print '<TR><TD ALIGN="right">Agent</TD><TD BGCOLOR="#ffffff">',
         $agent->agentnum, ": ", $agent->agent, '</TD></TR>';
+  } else {
+    $agent = $agents[0];
   }
   @referrals = qsearch( 'part_referral', {} );
   unless ( scalar(@referrals) == 1 ) {
@@ -190,7 +192,7 @@ print '<BR>';
 
   @invoicing_list = $cust_main->invoicing_list;
   print "Billing information (",
-       qq!<A HREF="!, popurl(2), qq!/misc/bill.cgi?$custnum">!, "Bill now</A>)",
+       qq!<A HREF="!, popurl(2), qq!misc/bill.cgi?$custnum">!, "Bill now</A>)",
         &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2),
         '<TR><TD ALIGN="right">Tax exempt</TD><TD BGCOLOR="#ffffff">',
         $cust_main->tax ? 'yes' : 'no',
@@ -247,6 +249,21 @@ if ( defined $cust_main->dbdef_table->column('comments')
 
 print '</TD></TR></TABLE>';
 
+print '<BR>'.
+  '<FORM ACTION="'.popurl(2).'edit/process/quick-cust_pkg.cgi" METHOD="POST">'.
+  qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
+  '<SELECT NAME="pkgpart"><OPTION>';
+
+foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+  my $pkgpart = $type_pkgs->pkgpart;
+  my $part_pkg = qsearchs('part_pkg', { 'pkgpart' => $pkgpart } )
+    or do { warn "unknown type_pkgs.pkgpart $pkgpart"; next; };
+  print qq!<OPTION VALUE="$pkgpart">!. $part_pkg->pkg. ' - '.
+        $part_pkg->comment;
+}
+
+print '</SELECT><INPUT TYPE="submit" VALUE="Order Package"><BR>';
+
 print qq!<BR><A NAME="cust_pkg">Packages</A> !,
 #      qq!<BR>Click on package number to view/edit package.!,
       qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> (preserves services) )!,
@@ -267,9 +284,9 @@ print qq!!, &table(), "\n",
 
 #get package info
 if ( $conf->exists('hidecancelledpackages') ) {
-  @packages = $cust_main->ncancelled_pkgs;
+  @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->ncancelled_pkgs);
 } else {
-  @packages = $cust_main->all_pkgs;
+  @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->all_pkgs);
 }
 
 $n1 = '<TR>';
@@ -318,11 +335,12 @@ print "</TR>";
 print "</TABLE>";
 
 #formatting
-print qq!<BR><BR><A NAME="history">Payment History!,
-      qq!</A>!,
-      qq! ( Click on invoice to view invoice/enter payment. | !,
-      qq!<A HREF="!, popurl(2), qq!edit/cust_credit.cgi?$custnum">!,
-      qq!Post credit / refund</A> )!;
+print qq!<BR><BR><A NAME="history">Payment History!.
+      qq!</A> ( !.
+      qq!<A HREF="!. popurl(2). qq!edit/cust_pay.cgi?custnum=$custnum">!.
+      qq!Post payment</A> | !.
+      qq!<A HREF="!. popurl(2). qq!edit/cust_credit.cgi?$custnum">!.
+      qq!Post credit</A> )!;
 
 #get payment history
 #
@@ -334,44 +352,86 @@ print qq!<BR><BR><A NAME="history">Payment History!,
 @bills = qsearch('cust_bill',{'custnum'=>$custnum});
 foreach $bill (@bills) {
   my($bref)=$bill->hashref;
+  my $bpre = ( $bill->owed > 0 )
+               ? '<b><font size="+1" color="#ff0000"> Open '
+               : '';
+  my $bpost = ( $bill->owed > 0 ) ? '</font></b>' : '';
   push @history,
     $bref->{_date} . qq!\t<A HREF="!. popurl(2). qq!view/cust_bill.cgi?! .
-    $bref->{invnum} . qq!">Invoice #! . $bref->{invnum} .
-    qq! (Balance \$! . $bill->owed . qq!)</A>\t! .
+    $bref->{invnum} . qq!">${bpre}Invoice #! . $bref->{invnum} .
+    qq! (Balance \$! . $bill->owed . qq!)$bpost</A>\t! .
     $bref->{charged} . qq!\t\t\t!;
 
-  my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
-  my($payment);
-  foreach $payment (@payments) {
-    my($date,$invnum,$payby,$payinfo,$paid)=($payment->getfield('_date'),
-                                             $payment->getfield('invnum'),
-                                             $payment->getfield('payby'),
-                                             $payment->getfield('payinfo'),
-                                             $payment->getfield('paid'),
+  my(@cust_bill_pay)=qsearch('cust_bill_pay',{'invnum'=> $bref->{invnum} } );
+#  my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
+#  my($payment);
+#  foreach $payment (@payments) {
+  foreach my $cust_bill_pay (@cust_bill_pay) {
+    my $payment = $cust_bill_pay->cust_pay;
+    my($date,$invnum,$payby,$payinfo,$paid)=($payment->_date,
+                                             $cust_bill_pay->invnum,
+                                             $payment->payby,
+                                             $payment->payinfo,
+                                             $cust_bill_pay->amount,
                       );
+    $payinfo = substr($payinfo,0,4). 'x'x(length($payinfo)-4) if $payby eq 'CARD';
     push @history,
       "$date\tPayment, Invoice #$invnum ($payby $payinfo)\t\t$paid\t\t";
   }
+
+  my(@cust_credit_bill)=
+    qsearch('cust_credit_bill', { 'invnum'=> $bref->{invnum} } );
+  foreach my $cust_credit_bill (@cust_credit_bill) {
+    my $cust_credit = $cust_credit_bill->cust_credit;
+    my($date, $invnum, $crednum, $amount, $reason, $app_date ) = (
+      $cust_credit->_date,
+      $cust_credit_bill->invnum,
+      $cust_credit_bill->crednum,
+      $cust_credit_bill->amount,
+      $cust_credit->reason,
+      time2str("%D", $cust_credit_bill->_date),
+    );
+    push @history,
+      "$date\tCredit #$crednum: $reason<BR>".
+      "(applied to invoice #$invnum on $app_date)\t\t\t$amount\t";
+  }
 }
 
-@credits = qsearch('cust_credit',{'custnum'=>$custnum});
+@credits = grep { $_->credited > 0 }
+           qsearch('cust_credit',{'custnum'=>$custnum});
 foreach $credit (@credits) {
   my($cref)=$credit->hashref;
   push @history,
-    $cref->{_date} . "\tCredit #" . $cref->{crednum} . ", (Balance \$" .
-    $cref->{credited} . ") by " . $cref->{otaker} . " - " .
-    $cref->{reason} . "\t\t\t" . $cref->{amount} . "\t";
-
-  my(@refunds)=qsearch('cust_refund',{'crednum'=> $cref->{crednum} } );
-  my($refund);
-  foreach $refund (@refunds) {
-    my($rref)=$refund->hashref;
-    push @history,
-      $rref->{_date} . "\tRefund, Credit #" . $rref->{crednum} . " (" .
-      $rref->{payby} . " " . $rref->{payinfo} . ") by " .
-      $rref->{otaker} . " - ". $rref->{reason} . "\t\t\t\t" .
-      $rref->{refund};
-  }
+    $cref->{_date} . "\t" .
+    qq!<A HREF="! . popurl(2). qq!edit/cust_credit_bill.cgi?!. $cref->{crednum} . qq!">!.
+    '<b><font size="+1" color="#ff0000">Unapplied credit #' .
+    $cref->{crednum} . "</font></b></A>: ".
+    $cref->{reason} . "\t\t\t" . $credit->credited . "\t";
+}
+
+my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );
+foreach my $refund (@refunds) {
+  my($rref)=$refund->hashref;
+  my($refundnum) = (
+    $refund->refundnum,
+  );
+
+  push @history,
+    $rref->{_date} . "\tRefund #$refundnum, (" .
+    $rref->{payby} . " " . $rref->{payinfo} . ") by " .
+    $rref->{otaker} . " - ". $rref->{reason} . "\t\t\t\t" .
+    $rref->{refund};
+}
+
+my @unapplied_payments =
+  grep { $_->unapplied > 0 } qsearch('cust_pay', { 'custnum' => $custnum } );
+foreach my $payment (@unapplied_payments) {
+  push @history,
+    $payment->_date. "\t".
+    '<A HREF="'. popurl(2). 'edit/cust_bill_pay.cgi?'. $payment->paynum. '">'.
+    '<b><font size="+1" color="#ff0000">Unapplied payment #' .
+    $payment->paynum . "</font></b></A>".
+    "\t\t" . $payment->unapplied . "\t\t";
 }
 
         #formatting