X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=cf899d0410684c5e58b109900867d5b6e918dd59;hp=8d8af63d697b6bd57686705deaf9bea7951a5eaf;hb=b377b1408398c471689e35dabb1bf14ef263a644;hpb=351b0af13ba6c449151c1bec2303294051c073d1

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 8d8af63d6..cf899d041 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -3,7 +3,6 @@
 
 my $conf = new FS::Conf;
 
-#false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
 my %uiview = ();
 my %uiadd = ();
 foreach my $part_svc ( qsearch('part_svc',{}) ) {
@@ -236,8 +235,7 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
   ;
 
   if ( $cust_main->payby eq 'CARD' || $cust_main->payby eq 'DCRD' ) {
-    my $payinfo = $cust_main->payinfo;
-    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
+    my $payinfo = $cust_main->payinfo_masked;
     print 'Credit card ',
           ( $cust_main->payby eq 'CARD' ? '(automatic)' : '(on-demand)' ),
           '</TD></TR>',
@@ -324,7 +322,7 @@ print '</SELECT><INPUT TYPE="submit" VALUE="Order Package"></FORM><BR>';
 
 if ( $conf->config('payby-default') ne 'HIDE' ) {
 
-  print '<BR>'.
+  print
     qq!<FORM ACTION="${p}edit/process/quick-charge.cgi" METHOD="POST">!.
     qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!.
     qq!Description:<INPUT TYPE="text" NAME="pkg">!.
@@ -366,8 +364,7 @@ function svc_areyousure(href) {
 
 <%
 
-print qq!<BR><A NAME="cust_pkg">Packages</A> !,
-#      qq!<BR>Click on package number to view/edit package.!,
+print qq!<A NAME="cust_pkg">Packages</A> !,
       qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> (preserves services) )!,
 ;
 
@@ -402,7 +399,7 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
 <!--pkgnum: <%=$pkg->{pkgnum}%>-->
 <TR>
   <TD ROWSPAN=<%=$rowspan%>>
-    <%=$pkg->{pkgnum}%>:
+    <A NAME="cust_pkg<%=$pkg->{pkgnum}%>"><%=$pkg->{pkgnum}%></A>:
     <%=$pkg->{pkg}%> - <%=$pkg->{comment}%><BR>
 <% unless ($pkg->{cancel}) { %>
     (&nbsp;<%=pkg_change_link($pkg)%>&nbsp;)
@@ -572,9 +569,12 @@ function cust_credit_areyousure(href) {
 
 <% if ( $conf->config('payby-default') ne 'HIDE' ) { %>
   
-  <BR><BR><A NAME="history">Payment History</A>
-  (<A HREF="<%= $p %>edit/cust_pay.cgi?custnum=<%= $custnum %>">Post payment</A>
-  | <A HREF="<%= $p %>edit/cust_credit.cgi?<%= $custnum %>">Post credit</A>)
+  <BR><BR><A NAME="history"><FONT SIZE="+2">Payment History</FONT></A><BR>
+  <A HREF="<%= $p %>edit/cust_pay.cgi?custnum=<%= $custnum %>">Post cash/check payment</A>
+  | <A HREF="<%= $p %>misc/payment.cgi?payby=CARD;custnum=<%= $custnum %>">Process credit card payment</A>
+  | <A HREF="<%= $p %>misc/payment.cgi?payby=CHEK;custnum=<%= $custnum %>">Process electronic check (ACH) payment</A>
+  <BR><A HREF="<%= $p %>edit/cust_credit.cgi?<%= $custnum %>">Post credit</A>
+  <BR>
 
   <%
   #get payment history
@@ -600,11 +600,11 @@ function cust_credit_areyousure(href) {
   foreach my $cust_pay ($cust_main->cust_pay) {
 
     my $payby = $cust_pay->payby;
-    my $payinfo = $cust_pay->payinfo;
+    my $payinfo = $payby eq 'CARD'
+                    ? $cust_pay->payinfo_masked
+                    : $cust_pay->payinfo;
     my @cust_bill_pay = $cust_pay->cust_bill_pay;
 
-    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
-      if $payby eq 'CARD';
     my $target = "$payby$payinfo";
     $payby =~ s/^BILL$/Check #/ if $payinfo;
     $payby =~ s/^BILL$//;
@@ -712,10 +712,10 @@ function cust_credit_areyousure(href) {
         }
       }
       if ( $cust_credit->credited > 0 ) {
-        $desc .= ' - <B><FONT COLOR="#FF0000">$'.
-                 $cust_credit->unapplied. ' unapplied</FONT></B>'.
+        $desc .= '&nbsp;&nbsp;<B><FONT COLOR="#FF0000">$'.
+                 $cust_credit->credited. ' unapplied</FONT></B>'.
                  qq! (<A HREF="${p}edit/cust_credit_bill.cgi?!.
-                 $cust_credit->crednum. '">apply</A>'.
+                 $cust_credit->crednum. '">apply</A>)'.
                  '<BR>';
       }
     }
@@ -750,10 +750,10 @@ function cust_credit_areyousure(href) {
   foreach my $cust_refund ($cust_main->cust_refund) {
 
     my $payby = $cust_refund->payby;
-    my $payinfo = $cust_refund->payinfo;
+    my $payinfo = $payby eq 'CARD'
+                    ? $cust_refund->payinfo_masked
+                    : $cust_refund->payinfo;
 
-    $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
-      if $payby eq 'CARD';
     $payby =~ s/^BILL$/Check #/ if $payinfo;
     $payby =~ s/^(CARD|COMP)$/$1 /;
 
@@ -806,6 +806,7 @@ function cust_credit_areyousure(href) {
     $balance += $item->{'refund'}  if exists $item->{'refund'};
     $balance = sprintf("%.2f", $balance);
     $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
+    ( my $showbalance = '$'. $balance ) =~ s/^\$\-/-&nbsp;\$/;
 
   %>
   
@@ -821,11 +822,11 @@ function cust_credit_areyousure(href) {
         </FONT>
       </TD>
       <TD><%= $item->{'desc'} %></TD>
-      <TD><%= $charge  %></TD>
-      <TD><%= $payment %></TD>
-      <TD><%= $credit  %></TD>
-      <TD><%= $refund  %></TD>
-      <TD>$<%= $balance %></TD>
+      <TD ALIGN="right"><%= $charge  %></TD>
+      <TD ALIGN="right"><%= $payment %></TD>
+      <TD ALIGN="right"><%= $credit  %></TD>
+      <TD ALIGN="right"><%= $refund  %></TD>
+      <TD ALIGN="right"><%= $showbalance %></TD>
     </TR>
 
   <% } %>
@@ -889,15 +890,8 @@ sub get_packages {
 
     }
 
-    foreach my $cust_svc (
-      qsearch( 'cust_svc', {
-                             'pkgnum' => $cust_pkg->pkgnum,
-                             #'svcpart' => $part_svc->svcpart,
-                           }
-      )
-    ) {
-
-      warn "svcnum ". $cust_svc->svcnum. " / svcpart ". $cust_svc->svcpart. "\n";
+    foreach my $cust_svc ( $cust_pkg->cust_svc ) {
+      #warn "svcnum ". $cust_svc->svcnum. " / svcpart ". $cust_svc->svcpart. "\n";
       my $svc = {
         'svcnum' => $cust_svc->svcnum,
         'label'  => ($cust_svc->label)[1],
@@ -990,11 +984,6 @@ sub pkg_datestr {
   $strip;
 }
 
-#sub pkg_details_link {
-#  my $pkg = shift or return '';
-#  return qq!<a href="${p}view/cust_pkg.cgi?$pkg->{pkgnum}">Details</a>!;
-#}
-
 sub pkg_change_link {
   my $pkg = shift or return '';
   return qq!<a href="${p}misc/change_pkg.cgi?$pkg->{pkgnum}">Change&nbsp;package</a>!;