[freeside-commits] freeside/FS/FS Conf.pm, 1.144, 1.145 cust_main.pm, 1.201, 1.202 cust_pay.pm, 1.43, 1.44 cust_refund.pm, 1.25, 1.26 cust_pay_void.pm, 1.2, 1.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv1481/FS/FS

Modified Files:
	Conf.pm cust_main.pm cust_pay.pm cust_refund.pm 
	cust_pay_void.pm 
Log Message:
add MCRD payment type for manually processed ccards

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- Conf.pm	21 Nov 2005 05:18:51 -0000	1.144
+++ Conf.pm	21 Nov 2005 10:47:11 -0000	1.145
@@ -1298,7 +1298,7 @@
     'section'     => 'billing',
     'description' => 'Available payment types.',
     'type'        => 'selectmultiple',
-    'select_enum' => [ qw(CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP) ],
+    'select_enum' => [ qw(CARD DCRD CHEK DCHK LECB BILL CASH WEST MCRD COMP) ],
   },
 
   {
@@ -1306,7 +1306,7 @@
     'section'     => 'UI',
     'description' => 'Default payment type.  HIDE disables display of billing information and sets customers to BILL.',
     'type'        => 'select',
-    'select_enum' => [ '', qw(CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP HIDE) ],
+    'select_enum' => [ '', qw(CARD DCRD CHEK DCHK LECB BILL CASH WEST MCRD COMP HIDE) ],
   },
 
   {

Index: cust_pay_void.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pay_void.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cust_pay_void.pm	21 Oct 2005 15:21:37 -0000	1.2
+++ cust_pay_void.pm	21 Nov 2005 10:47:11 -0000	1.3
@@ -48,7 +48,7 @@
 
 =item payby - `CARD' (credit cards), `CHEK' (electronic check/ACH),
 `LECB' (phone bill billing), `BILL' (billing), `CASH' (cash),
-`WEST' (Western Union) or `COMP' (free)
+`WEST' (Western Union), `MCRD' (Manual credit card), or `COMP' (free)
 
 =item payinfo - card number, check #, or comp issuer (4-8 lowercase alphanumerics; think username), respectively
 
@@ -129,7 +129,7 @@
 
   $self->void_date(time) unless $self->void_date;
 
-  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP|PREP|CASH|WEST)$/
+  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP|PREP|CASH|WEST|MCRD)$/
     or return "Illegal payby";
   $self->payby($1);
 

Index: cust_refund.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_refund.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- cust_refund.pm	21 Oct 2005 15:21:37 -0000	1.25
+++ cust_refund.pm	21 Nov 2005 10:47:11 -0000	1.26
@@ -52,7 +52,7 @@
 
 =item payby - `CARD' (credit cards), `CHEK' (electronic check/ACH),
 `LECB' (Phone bill billing), `BILL' (billing), `CASH' (cash),
-`WEST' (Western Union), or `COMP' (free)
+`WEST' (Western Union), `MCRD' (Manual credit card), or `COMP' (free)
 
 =item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
 
@@ -212,7 +212,7 @@
     unless $self->crednum 
            || qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 
-  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP|CASH|WEST)$/
+  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP|CASH|WEST|MCRD)$/
     or return "Illegal payby";
   $self->payby($1);
 

Index: cust_pay.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pay.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- cust_pay.pm	21 Oct 2005 15:21:37 -0000	1.43
+++ cust_pay.pm	21 Nov 2005 10:47:11 -0000	1.44
@@ -62,7 +62,8 @@
 
 =item payby - `CARD' (credit cards), `CHEK' (electronic check/ACH),
 `LECB' (phone bill billing), `BILL' (billing), `PREP` (prepaid card),
-`CASH' (cash), `WEST' (Western Union) or `COMP' (free)
+`CASH' (cash), `WEST' (Western Union), `MCRD' (Manual credit card), or
+`COMP' (free)
 
 =item payinfo - card number, check #, or comp issuer (4-8 lowercase alphanumerics; think username), respectively
 
@@ -374,7 +375,7 @@
 
   $self->_date(time) unless $self->_date;
 
-  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP|PREP|CASH|WEST)$/
+  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP|PREP|CASH|WEST|MCRD)$/
     or return "Illegal payby";
   $self->payby($1);
 

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- cust_main.pm	18 Nov 2005 03:48:30 -0000	1.201
+++ cust_main.pm	21 Nov 2005 10:47:11 -0000	1.202
@@ -377,7 +377,7 @@
 
     $payby = 'PREP' if $amount;
 
-  } elsif ( $self->payby =~ /^(CASH|WEST)$/ ) {
+  } elsif ( $self->payby =~ /^(CASH|WEST|MCRD)$/ ) {
 
     $payby = $1;
     $self->payby('BILL');
@@ -718,7 +718,7 @@
   shift->insert_cust_pay('CASH', @_);
 }
 
-=item insert_cust_pay_prepay AMOUNT [ PAYINFO ]
+=item insert_cust_pay_west AMOUNT [ PAYINFO ]
 
 Inserts a Western Union payment in the specified amount for this customer.  An
 optional second argument can specify the prepayment identifier for tracking
@@ -1150,7 +1150,7 @@
     }
   }
 
-  $self->payby =~ /^(CARD|DCRD|CHEK|DCHK|LECB|BILL|COMP|PREPAY|CASH|WEST)$/
+  $self->payby =~ /^(CARD|DCRD|CHEK|DCHK|LECB|BILL|COMP|PREPAY|CASH|WEST|MCRD)$/
     or return "Illegal payby: ". $self->payby;
 
   $error =    $self->ut_numbern('paystart_month')
@@ -1287,7 +1287,7 @@
 
   if ( $self->paydate eq '' || $self->paydate eq '-' ) {
     return "Expriation date required"
-      unless $self->payby =~ /^(BILL|PREPAY|CHEK|DCHK|LECB|CASH|WEST)$/;
+      unless $self->payby =~ /^(BILL|PREPAY|CHEK|DCHK|LECB|CASH|WEST|MCRD)$/;
     $self->paydate('');
   } else {
     my( $m, $y );