}
-sub get_mac_address {
- my $p = shift;
-
-## access radius exports acct tables to get mac
- my @part_export = ();
- @part_export = (
- qsearch( 'part_export', { 'exporttype' => 'sqlradius' } ),
- qsearch( 'part_export', { 'exporttype' => 'sqlradius_withdomain' } ),
- qsearch( 'part_export', { 'exporttype' => 'broadband_sqlradius' } ),
- );
-
- my @sessions;
- foreach my $part_export (@part_export) {
- push @sessions, ( @{ $part_export->usage_sessions( {
- 'ip' => $p->{'ip'},
- } ) } );
- }
-
- my $mac = $sessions[0]->{'callingstationid'};
-
- return { 'mac_address' => $mac, };
-}
-
sub login_info {
my $p = shift;
$svc_x = $svc_phone;
- } elsif ( $p->{'domain'} eq 'ip_mac' ) {
-
- my $mac_address = $p->{'username'};
- $mac_address =~ s/\://g;
-
- my $svc_broadband = qsearchs( 'svc_broadband', { 'mac_addr' => $mac_address } );
- return { error => 'MAC address not found '.$p->{'username'} }
- unless $svc_broadband;
- $svc_x = $svc_broadband;
-
} elsif ( $p->{email}
&& (my $contact = FS::contact->by_selfservice_email($p->{email}))
)
or return { 'error' => "unknown custnum $custnum" };
my $conf = new FS::Conf;
- if (($p->{payby} eq "CHEK" || $p->{payby} eq "DCHEK") && $conf->exists('selfservice-ACH_info_readonly')) {
- return { 'error' => "You do not have authority to add a bank account" };
+
+ if ($p->{payby}) {
+ return { 'error' => "You do not have authority to add a bank account" }
+ if (($p->{payby} eq "CHEK" || $p->{payby} eq "DCHEK") && $conf->exists('selfservice-ACH_info_readonly'));
+
+ ## get default cust_payby and change it. For old v3 selfservice that upgraded to v4. this is for v4 only
+ my ($cust_payby) = $cust_main->cust_payby();
+ $p->{'custpaybynum'} = $cust_payby->custpaybynum;
+ update_payby($p);
}
my $new = new FS::cust_main { $cust_main->hash };
$return{$_} = $cust_main->bill_location->get($_)
for qw(address1 address2 city state zip);
+ $p->{'payment_payby'} = $payment_info->{paybys} if !$p->{'payment_payby'};
+
# look for stored cust_payby info
- # only if we've been given a clear payment_payby (to avoid payname conflicts)
- if ($p->{'payment_payby'} =~ /^(CARD|CHEK)$/) {
- my @search_payby = ($p->{'payment_payby'} eq 'CARD') ? ('CARD','DCRD') : ('CHEK','DCHK');
- my ($cust_payby) = $cust_main->cust_payby(@search_payby);
- if ($cust_payby) {
- $return{payname} = $cust_payby->payname
+ # v3 to v4 upgrade would break change_pay because change_pay does not send payment_payby
+ # so for change_pay to work need to search for all allowed paybys and grab default payment account
+ my @search_payby = ();
+ @search_payby = ($p->{'payment_payby'} eq 'CARD') ? ('CARD','DCRD') : ('CHEK','DCHK')
+ if ($p->{'payment_payby'} =~ /^(CARD|CHEK)$/);
+
+ my ($cust_payby) = $cust_main->cust_payby(@search_payby);
+ if ($cust_payby) {
+ $return{payby} = $cust_payby->payby;
+ $return{payname} = $cust_payby->payname
|| ( $cust_main->first. ' '. $cust_main->get('last') );
- $return{custpaybynum} = $cust_payby->custpaybynum;
+ $return{custpaybynum} = $cust_payby->custpaybynum;
- if ( $cust_payby->payby =~ /^(CARD|DCRD)$/ ) {
- $return{card_type} = cardtype($cust_payby->payinfo);
- $return{payinfo} = $cust_payby->paymask;
+ if ( $cust_payby->payby =~ /^(CARD|DCRD)$/ ) {
+ $return{card_type} = cardtype($cust_payby->payinfo);
+ $return{payinfo} = $cust_payby->paymask;
- @return{'month', 'year'} = $cust_payby->paydate_monthyear;
+ @return{'month', 'year'} = $cust_payby->paydate_monthyear;
- }
+ }
- if ( $cust_payby->payby =~ /^(CHEK|DCHK)$/ ) {
- my ($payinfo1, $payinfo2) = split '@', $cust_payby->paymask;
- $return{payinfo1} = $payinfo1;
- $return{payinfo2} = $payinfo2;
- $return{paytype} = $cust_payby->paytype;
- $return{paystate} = $cust_payby->paystate;
- $return{payname} = $cust_payby->payname; # override 'first/last name' default from above, if any. Is instution-name here. (#15819)
- }
+ if ( $cust_payby->payby =~ /^(CHEK|DCHK)$/ ) {
+ my ($payinfo1, $payinfo2) = split '@', $cust_payby->paymask;
+ $return{payinfo1} = $payinfo1;
+ $return{payinfo2} = $payinfo2;
+ $return{paytype} = $cust_payby->paytype;
+ $return{paystate} = $cust_payby->paystate;
+ $return{payname} = $cust_payby->payname; # override 'first/last name' default from above, if any. Is instution-name here. (#15819)
}
}
or return { 'error' => "illegal ABA/routing number ". $p->{'payinfo2'} };
my $payinfo2 = $1;
$p->{'payinfo'} = $payinfo1. '@'. $payinfo2;
- }
+ }
+ elsif ($p->{'payby'} eq 'CARD') {
+ $p->{paydate} = $p->{year} . '-' . $p->{month} . '-01' unless $p->{paydate};
+ }
my $cust_payby = qsearchs('cust_payby', {
'custnum' => $custnum,
})
or return { 'error' => 'unknown custpaybynum '. $p->{'custpaybynum'} };
+ my $cust_main = qsearchs( 'cust_main', {custnum => $cust_payby->custnum} )
+ or return { 'error' => 'unknown custnum '.$cust_payby->custnum };
+
foreach my $field (
qw( weight payby payinfo paycvv paydate payname paystate paytype payip )
) {
$cust_payby->set($field,$p->{$field});
}
- my $error = $cust_payby->replace;
- if ( $error ) {
- return { 'error' => $error };
- } else {
- return { 'custpaybynum' => $cust_payby->custpaybynum };
+ # Update column if given a value, and the given value wasn't
+ # the value generated by $cust_main->masked($column);
+ $cust_main->set( $_, $p->{$_} )
+ for grep{ $p->{$_} !~ /^x/i; }
+ grep{ exists $p->{$_} }
+ qw/ss stateid/;
+
+ # Perform updates within a transaction
+ local $FS::UID::AutoCommit = 0;
+
+ if ( my $error = $cust_payby->replace || $cust_main->replace ) {
+ dbh->rollback;
+ return { error => $error };
}
-
+
+ dbh->commit;
+ return { custpaybynum => $cust_payby->custpaybynum };
}
sub verify_payby {