X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=0b51a875c4e1d0fece30109384818dbad6da6625;hb=589ac6e8730f2d814bc76d9c2f0482f459cd56b6;hp=e0986bbe7678de0794b51e5e33ddcabd6255db4d;hpb=fdfdba16902b3967a9f6deb955e9c6885419bc79;p=freeside.git

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index e0986bbe7..0b51a875c 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -584,6 +584,7 @@ print '</TABLE>';
 
     my $target = "$payby$payinfo";
     $payby =~ s/^BILL$/Check #/ if $payinfo;
+    $payby =~ s/^CHEK$/Electronic check /;
     $payby =~ s/^BILL$//;
     $payby =~ s/^(CARD|COMP)$/$1 /;
     my $info = $payby ? " ($payby$payinfo)" : '';
@@ -639,17 +640,17 @@ print '</TABLE>';
     my $refund = '';
     my $refund_days = $conf->config('card_refund-days') || 120;
     if (    $cust_pay->closed !~ /^Y/i
-         && $cust_pay->payby eq 'CARD' 
+         && $cust_pay->payby =~ /^(CARD|CHEK)$/
          && time-$cust_pay->_date < $refund_days*86400
          && $cust_pay->unrefunded > 0
     ) {
-      $refund = qq! (<A HREF="!. qq!${p}edit/cust_refund.cgi?payby=CARD;!.
+      $refund = qq! (<A HREF="!. qq!${p}edit/cust_refund.cgi?payby=$1;!.
                 qq!paynum=!. $cust_pay->paynum. qq!">refund</A>)!;
     }
 
     my $void = '';
     if (    $cust_pay->closed !~ /^Y/i
-         && $cust_pay->payby ne 'CARD'
+         && $cust_pay->payby !~  /^(CARD|CHEK)$/
        ) {
       $void = qq! (<A HREF="javascript:areyousure('!.
               qq!${p}misc/void-cust_pay.cgi?!. $cust_pay->paynum.
@@ -693,6 +694,7 @@ print '</TABLE>';
                     : $cust_pay_void->payinfo;
 
     $payby =~ s/^BILL$/Check #/ if $payinfo;
+    $payby =~ s/^CHEK$/Electronic check /;
     $payby =~ s/^BILL$//;
     $payby =~ s/^(CARD|COMP)$/$1 /;
     my $info = $payby ? " ($payby$payinfo)" : '';
@@ -797,6 +799,7 @@ print '</TABLE>';
                     : $cust_refund->payinfo;
 
     $payby =~ s/^BILL$/Check #/ if $payinfo;
+    $payby =~ s/^CHEK$/Electronic check /;
     $payby =~ s/^(CARD|COMP)$/$1 /;
 
     push @history, {
@@ -967,11 +970,21 @@ sub svc_label_link {
 sub svc_provision_link {
   my ($pkg, $svcpart, $conf) = @_;
   ( my $svc_nbsp = $svcpart->{svc} ) =~ s/\s+/&nbsp;/g;
-  my $pkgnum_svcpart = "pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}";
   my $num_left = $svcpart->{quantity} - $svcpart->{count};
+  my $pkgnum_svcpart = "pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}";
 
-  my $link = qq!<A CLASS="provision" HREF="${p}edit/$svcpart->{svcdb}.cgi?!.
-             qq!$pkgnum_svcpart">!.
+  my $url;
+  if ( $svcpart->{svcdb} eq 'svc_external'
+       && $conf->exists('svc_external-skip_manual')
+  ) {
+    $url = "${p}edit/process/$svcpart->{svcdb}.cgi?".
+           "pkgnum=$pkg->{pkgnum}&".
+           "svcpart=$svcpart->{svcpart}";
+  } else {
+    $url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart";
+  }
+
+  my $link = qq!<A CLASS="provision" HREF="$url">!.
              "Provision&nbsp;$svc_nbsp&nbsp;($num_left)</A>";
   if ( $conf->exists('legacy_link') ) {
     $link .= '<BR>'.