summaryrefslogtreecommitdiff
path: root/FS
diff options
context:
space:
mode:
Diffstat (limited to 'FS')
-rw-r--r--FS/FS/Conf.pm2
-rw-r--r--FS/FS/cdr/cia.pm54
-rw-r--r--FS/FS/cust_main.pm3
-rw-r--r--FS/FS/cust_main/Billing_ThirdParty.pm6
-rw-r--r--FS/FS/cust_payby.pm2
-rw-r--r--FS/FS/msg_template.pm1
-rw-r--r--FS/FS/payby.pm10
-rw-r--r--FS/FS/payinfo_Mixin.pm32
8 files changed, 64 insertions, 46 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e584f0042..39f12c25a 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2622,7 +2622,7 @@ and customer address. Include units.',
'section' => 'billing',
'description' => 'Available payment types.',
'type' => 'selectmultiple',
- 'select_enum' => [ qw(CARD DCRD CHEK DCHK BILL CASH WEST MCRD PPAL COMP) ],
+ 'select_enum' => [ qw(CARD DCRD CHEK DCHK BILL CASH WEST MCRD MCHK PPAL COMP) ],
},
{
diff --git a/FS/FS/cdr/cia.pm b/FS/FS/cdr/cia.pm
index ca44c0fdf..0471e9bb4 100644
--- a/FS/FS/cdr/cia.pm
+++ b/FS/FS/cdr/cia.pm
@@ -1,8 +1,9 @@
package FS::cdr::cia;
use strict;
-use vars qw( @ISA %info );
+use vars qw( @ISA %info $date $tmp_mday $tmp_mon $tmp_year);
use FS::cdr qw(_cdr_date_parser_maker);
+use Time::Local;
@ISA = qw(FS::cdr);
@@ -11,26 +12,39 @@ use FS::cdr qw(_cdr_date_parser_maker);
'weight' => 510,
'header' => 1,
'type' => 'csv',
- 'sep_char' => "\t",
+ 'sep_char' => "|",
'import_fields' => [
- skip(2), # Reseller Account Number, Confirmation Number
- 'description', # Conference Name
- skip(3), # Organization Name, Bill Code, Q&A Active
- 'userfield', # Chairperson Name
- skip(2), # Conference Start Time, Conference End Time
- _cdr_date_parser_maker('startdate'), # Connect Time
- _cdr_date_parser_maker('enddate'), # Disconnect Time
- skip(1), # Duration
- sub { my($cdr, $data, $conf, $param) = @_;
- $cdr->duration($data);
- $cdr->billsec( $data);
- }, # Roundup Duration
- skip(1), # User Name
- 'dst', # DNIS
- 'src', # ANI
- skip(2), # Call Type, Toll Free,
- 'accountcode', # Chair Conference Entry Code
- skip(1), # Participant Conference Entry Code,
+ 'accountcode',
+ skip(2), # First and last name
+
+ sub { my($cdr, $date) = @_;
+ $date =~ /^(\d{1,2})\/(\d{1,2})\/(\d\d(\d\d)?)$/
+ or die "unparsable date: $date"; #maybe we shouldn't die...
+ ($tmp_mday, $tmp_mon, $tmp_year) = ( $2, $1-1, $3 );
+ }, #Date
+
+ sub { my($cdr, $time) = @_;
+ #my($sec, $min, $hour, $mday, $mon, $year)= localtime($cdr->startdate);
+ $time =~ /^(\d{1,2}):(\d{1,2}):(\d{1,2})$/
+ or die "unparsable time: $time"; #maybe we shouldn't die...
+ $cdr->startdate( timelocal($3, $2, $1 ,$tmp_mday, $tmp_mon, $tmp_year));
+ $cdr->answerdate( timelocal($3, $2, $1 ,$tmp_mday, $tmp_mon, $tmp_year));
+
+ }, # Start time
+
+ sub { my($cdr, $time) = @_;
+ #my($sec, $min, $hour, $mday, $mon, $year)= localtime($cdr->startdate);
+ $time =~ /^(\d{1,2}):(\d{1,2}):(\d{1,2})$/
+ or die "unparsable time: $time"; #maybe we shouldn't die...
+ #$cdr->startdate( timelocal($3, $2, $1 ,$mday, $mon, $year) );
+ $cdr->enddate(
+ timelocal($3, $2, $1 ,$tmp_mday, $tmp_mon, $tmp_year) );
+ }, # End time
+
+ 'disposition', # Disposition
+ 'dst', # PhoneNumber
+ skip(3), # Extension, Service Type, Filler
+ 'src', # ClientContactID
],
);
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 294546cf9..9f9562059 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -400,7 +400,7 @@ sub insert {
$payby = 'PREP' if $amount;
- } elsif ( $self->payby =~ /^(CASH|WEST|MCRD|PPAL)$/ ) {
+ } elsif ( $self->payby =~ /^(CASH|WEST|MCRD|MCHK|PPAL)$/ ) {
$payby = $1;
$self->payby('BILL');
@@ -3074,6 +3074,7 @@ Old-style:
=cut
+#super false laziness w/quotation::charge
sub charge {
my $self = shift;
my ( $amount, $setup_cost, $quantity, $start_date, $classnum );
diff --git a/FS/FS/cust_main/Billing_ThirdParty.pm b/FS/FS/cust_main/Billing_ThirdParty.pm
index faced8f2b..a1d19fb9e 100644
--- a/FS/FS/cust_main/Billing_ThirdParty.pm
+++ b/FS/FS/cust_main/Billing_ThirdParty.pm
@@ -36,7 +36,11 @@ to that URL.
=cut
my @methods = qw(PAYPAL CC);
-my %method2payby = ( 'PAYPAL' => 'PPAL', 'CC' => 'MCRD' );
+my %method2payby = ( 'PAYPAL' => 'PPAL',
+ 'CC' => 'MCRD', #? but doesn't MCRD mean _offline_
+ #card, not third-party card? but no
+ #one is doing non-paypal right now
+ );
sub create_payment {
my $self = shift;
diff --git a/FS/FS/cust_payby.pm b/FS/FS/cust_payby.pm
index 42bf64a3e..ad3d80a20 100644
--- a/FS/FS/cust_payby.pm
+++ b/FS/FS/cust_payby.pm
@@ -353,7 +353,7 @@ sub check {
if ( $self->paydate eq '' || $self->paydate eq '-' ) {
return "Expiration date required"
# shouldn't payinfo_check do this?
- unless $self->payby =~ /^(BILL|PREPAY|CHEK|DCHK|LECB|CASH|WEST|MCRD|PPAL)$/;
+ unless $self->payby =~ /^(BILL|PREPAY|CHEK|DCHK|LECB|CASH|WEST|MCRD|MCHK|PPAL)$/;
$self->paydate('');
} else {
my( $m, $y );
diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index 5dbd591a8..65890e125 100644
--- a/FS/FS/msg_template.pm
+++ b/FS/FS/msg_template.pm
@@ -598,6 +598,7 @@ sub substitutions {
_date
_date_pretty
due_date
+ due_date2str
)],
#XXX not really thinking about cust_bill substitutions quite yet
diff --git a/FS/FS/payby.pm b/FS/FS/payby.pm
index 197d4995b..c4aa1b1b2 100644
--- a/FS/FS/payby.pm
+++ b/FS/FS/payby.pm
@@ -113,6 +113,12 @@ tie %hash, 'Tie::IxHash',
longname => 'Manual credit card',
cust_main => 'BILL', #this is a payment type only, customers go to BILL...
},
+ 'MCHK' => { #not the same as DCHK
+ tinyname => 'card',
+ shortname => 'Manual electronic check', # initial payment, then billing
+ longname => 'Manual electronic check',
+ cust_main => 'BILL', #this is a payment type only, customers go to BILL...
+ },
'APPL' => {
tinyname => 'apple store',
shortname => 'Apple Store',
@@ -207,7 +213,9 @@ sub longname {
%payby2bop = (
'CARD' => 'CC',
'CHEK' => 'ECHECK',
- 'MCRD' => 'CC',
+ 'MCRD' => 'CC', #? but doesn't MCRD mean _offline_ card? i think it got
+ # overloaded for third-party card payments -- but no one is
+ # doing those other than paypal now
'PPAL' => 'PAYPAL',
);
diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm
index e14c5895f..c66e3bc37 100644
--- a/FS/FS/payinfo_Mixin.pm
+++ b/FS/FS/payinfo_Mixin.pm
@@ -38,14 +38,15 @@ For Customers (cust_main):
For Refunds (cust_refund):
'CARD' (credit cards), 'CHEK' (electronic check/ACH),
'LECB' (Phone bill billing), 'BILL' (billing), 'CASH' (cash),
-'WEST' (Western Union), 'MCRD' (Manual credit card), 'CBAK' Chargeback, or 'COMP' (free)
+'WEST' (Western Union), 'MCRD' (Manual credit card), 'MCHK' (Manual electronic
+check), 'CBAK' Chargeback, or 'COMP' (free)
For Payments (cust_pay):
'CARD' (credit cards), 'CHEK' (electronic check/ACH),
'LECB' (phone bill billing), 'BILL' (billing), 'PREP' (prepaid card),
-'CASH' (cash), 'WEST' (Western Union), 'MCRD' (Manual credit card),
-'PPAL' (PayPal)
+'CASH' (cash), 'WEST' (Western Union), 'MCRD' (Manual credit card), 'MCHK'
+(Manual electronic check), 'PPAL' (PayPal)
'COMP' (free) is depricated as a payment type in cust_pay
=cut
@@ -129,7 +130,11 @@ sub mask_payinfo {
return 'N/A (tokenized)'; #?
} else { # if not, mask it...
- if ($payby eq 'CARD' || $payby eq 'DCRD' || $payby eq 'MCRD') {
+ if ($payby eq 'CARD' || $payby eq 'DCRD') {
+ #|| $payby eq 'MCRD') {
+ #MCRD isn't a card in payinfo,
+ #its a record of an _offline_
+ #card
# Credit Cards
@@ -177,23 +182,6 @@ sub mask_payinfo {
Checks payby and payinfo.
-For Customers (cust_main):
-'CARD' (credit card - automatic), 'DCRD' (credit card - on-demand),
-'CHEK' (electronic check - automatic), 'DCHK' (electronic check - on-demand),
-'LECB' (Phone bill billing), 'BILL' (billing), 'COMP' (free), or
-'PREPAY' (special billing type: applies a credit - see L<FS::prepay_credit> and sets billing type to I<BILL>)
-
-For Refunds (cust_refund):
-'CARD' (credit cards), 'CHEK' (electronic check/ACH),
-'LECB' (Phone bill billing), 'BILL' (billing), 'CASH' (cash),
-'WEST' (Western Union), 'MCRD' (Manual credit card), 'CBAK' (Chargeback), or 'COMP' (free)
-
-For Payments (cust_pay):
-'CARD' (credit cards), 'CHEK' (electronic check/ACH),
-'LECB' (phone bill billing), 'BILL' (billing), 'PREP' (prepaid card),
-'CASH' (cash), 'WEST' (Western Union), or 'MCRD' (Manual credit card)
-'COMP' (free) is depricated as a payment type in cust_pay
-
=cut
sub payinfo_check {
@@ -276,6 +264,8 @@ sub payby_payinfo_pretty {
$lh->maketext('Western Union');
} elsif ( $self->payby eq 'MCRD' ) {
$lh->maketext('Manual credit card');
+ } elsif ( $self->payby eq 'MCHK' ) {
+ $lh->maketext('Manual electronic check');
} elsif ( $self->payby eq 'EDI' ) {
$lh->maketext('EDI') . ' ' . $self->paymask;
} elsif ( $self->payby eq 'PPAL' ) {
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-23 08:58:05 +0000