X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=9595a07e1e720134bbcb6249bf6fa12565c402d8;hp=b17c9277ad788dc9d1448db3ec90207ba24abc24;hb=1fd6d8cf5d7854860ef4fd10ed89828e0c04ec39;hpb=c00273147a2d400779fcdaf34f171b2180faa453

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index b17c9277a..9595a07e1 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,45 +1,18 @@
+<!-- $Id: cust_main.cgi,v 1.19 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: cust_main.cgi,v 1.15 2001-12-21 21:40:24 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
-              @packages $package @history @bills $bill @credits $credit
-              $balance $item @agents @referrals @invoicing_list $n1 $conf
-              $signupurl ); 
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs qsearch);
-use FS::CGI qw(header menubar popurl table itable ntable);
-use FS::cust_credit;
-use FS::cust_pay;
-use FS::cust_bill;
-use FS::part_pkg;
-use FS::cust_pkg;
-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);
-
-$conf = new FS::Conf;
+
+my $conf = new FS::Conf;
 
 print header("Customer View", menubar(
   'Main Menu' => popurl(2)
 ));
 
 die "No customer specified (bad URL)!" unless $cgi->keywords;
-($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
+my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
 $query =~ /^(\d+)$/;
-$custnum = $1;
-$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
+my $custnum = $1;
+my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 die "Customer not found!" unless $cust_main;
-$hashref = $cust_main->hashref;
 
 print qq!<A HREF="!, popurl(2), 
       qq!edit/cust_main.cgi?$custnum">Edit this customer</A>!;
@@ -159,7 +132,8 @@ print '<TD VALIGN="top">';
         $custnum, '</TD></TR>',
   ;
 
-  @agents = qsearch( 'agent', {} );
+  my @agents = qsearch( 'agent', {} );
+  my $agent;
   unless ( scalar(@agents) == 1 ) {
     $agent = qsearchs('agent',{ 'agentnum' => $cust_main->agentnum } );
     print '<TR><TD ALIGN="right">Agent</TD><TD BGCOLOR="#ffffff">',
@@ -167,7 +141,7 @@ print '<TD VALIGN="top">';
   } else {
     $agent = $agents[0];
   }
-  @referrals = qsearch( 'part_referral', {} );
+  my @referrals = qsearch( 'part_referral', {} );
   unless ( scalar(@referrals) == 1 ) {
     my $referral = qsearchs('part_referral', {
       'refnum' => $cust_main->refnum
@@ -202,7 +176,7 @@ print '<TD VALIGN="top">';
 
 print '<BR>';
 
-  @invoicing_list = $cust_main->invoicing_list;
+  my @invoicing_list = $cust_main->invoicing_list;
   print "Billing information (",
        qq!<A HREF="!, popurl(2), qq!misc/bill.cgi?$custnum">!, "Bill now</A>)",
         &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2),
@@ -268,8 +242,11 @@ print '<BR>'.
 
 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; };
+#  my $part_pkg = qsearchs('part_pkg', { 'pkgpart' => $pkgpart } )
+#    or do { warn "unknown type_pkgs.pkgpart $pkgpart"; next; };
+  my $part_pkg =
+    qsearchs('part_pkg', { 'pkgpart' => $pkgpart, 'disabled' => '' } )
+    or next;
   print qq!<OPTION VALUE="$pkgpart">!. $part_pkg->pkg. ' - '.
         $part_pkg->comment;
 }
@@ -295,14 +272,15 @@ print qq!!, &table(), "\n",
       qq!</TR>\n!;
 
 #get package info
+my @packages;
 if ( $conf->exists('hidecancelledpackages') ) {
   @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->ncancelled_pkgs);
 } else {
   @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->all_pkgs);
 }
 
-$n1 = '<TR>';
-foreach $package (@packages) {
+my $n1 = '<TR>';
+foreach my $package (@packages) {
   my $pkgnum = $package->pkgnum;
   my $pkg = $package->part_pkg->pkg;
   my $comment = $package->part_pkg->comment;
@@ -359,10 +337,12 @@ print qq!<BR><BR><A NAME="history">Payment History!.
 # major problem: this whole thing is way too sloppy.
 # minor problem: the description lines need better formatting.
 
-@history = (); #needed for mod_perl :)
+my @history = (); #needed for mod_perl :)
+
+my %target = ();
 
-@bills = qsearch('cust_bill',{'custnum'=>$custnum});
-foreach $bill (@bills) {
+my @bills = qsearch('cust_bill',{'custnum'=>$custnum});
+foreach my $bill (@bills) {
   my($bref)=$bill->hashref;
   my $bpre = ( $bill->owed > 0 )
                ? '<b><font size="+1" color="#ff0000"> Open '
@@ -386,9 +366,13 @@ foreach $bill (@bills) {
                                              $payment->payinfo,
                                              $cust_bill_pay->amount,
                       );
-    $payinfo = substr($payinfo,0,4). 'x'x(length($payinfo)-4) if $payby eq 'CARD';
+    $payinfo = substr($payinfo,0,4). 'x'x(length($payinfo)-4)
+      if $payby eq 'CARD';
+    my $target = "$payby$payinfo";
+    $payby =~ s/^BILL$/Check #/ if $payinfo;
+    $payby =~ s/^(CARD|COMP)$/$1 /;
     push @history,
-      "$date\tPayment, Invoice #$invnum ($payby $payinfo)\t\t$paid\t\t";
+      "$date\tPayment, Invoice #$invnum ($payby$payinfo)\t\t$paid\t\t\t$target";
   }
 
   my(@cust_credit_bill)=
@@ -409,9 +393,9 @@ foreach $bill (@bills) {
   }
 }
 
-@credits = grep { $_->credited > 0 }
+my @credits = grep { $_->credited > 0 }
            qsearch('cust_credit',{'custnum'=>$custnum});
-foreach $credit (@credits) {
+foreach my $credit (@credits) {
   my($cref)=$credit->hashref;
   push @history,
     $cref->{_date} . "\t" .
@@ -438,12 +422,20 @@ foreach my $refund (@refunds) {
 my @unapplied_payments =
   grep { $_->unapplied > 0 } qsearch('cust_pay', { 'custnum' => $custnum } );
 foreach my $payment (@unapplied_payments) {
+  my $payby = $payment->payby;
+  my $payinfo = $payment->payinfo;
+  #false laziness w/above
+  $payinfo = substr($payinfo,0,4). 'x'x(length($payinfo)-4)
+    if $payby eq 'CARD';
+  my $target = "$payby$payinfo";
+  $payby =~ s/^BILL$/Check #/ if $payinfo;
+  $payby =~ s/^(CARD|COMP)$/$1 /;
   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";
+    $payment->paynum . " ($payby$payinfo)</font></b></A>".
+    "\t\t" . $payment->unapplied . "\t\t\t$target";
 }
 
         #formatting
@@ -461,9 +453,9 @@ END
 
 #display payment history
 
-$balance = 0;
-foreach $item (sort keyfield_numerically @history) {
-  my($date,$desc,$charge,$payment,$credit,$refund)=split(/\t/,$item);
+my $balance = 0;
+foreach my $item (sort keyfield_numerically @history) {
+  my($date,$desc,$charge,$payment,$credit,$refund,$target)=split(/\t/,$item);
   $charge ||= 0;
   $payment ||= 0;
   $credit ||= 0;
@@ -472,8 +464,13 @@ foreach $item (sort keyfield_numerically @history) {
   $balance -= $credit - $refund;
   $balance = sprintf("%.2f", $balance);
   $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
+  $target = '' unless defined $target;
 
-  print "<TR><TD><FONT SIZE=-1>",time2str("%D",$date),"</FONT></TD>",
+  print "<TR><TD><FONT SIZE=-1>";
+  print qq!<A NAME="$target">! unless $target && $target{$target}++;
+  print time2str("%D",$date);
+  print '</A>' if $target && $target{$target} == 1;
+  print "</FONT></TD>",
 	"<TD><FONT SIZE=-1>$desc</FONT></TD>",
 	"<TD><FONT SIZE=-1>",
         ( $charge ? "\$".sprintf("%.2f",$charge) : '' ),