X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FClientAPI%2FMyAccount.pm;h=e8130160b442c4ed9acffb139c48edc7bd45fab3;hp=de35c51978a96ba4849440f0c489565b10fc087d;hb=fe10e6c6a2e5de7a2ff468497790d2a317ec0c77;hpb=0df9455e5c155bc7aea4f515876111825f1931b9

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index de35c5197..e8130160b 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -752,8 +752,13 @@ sub edit_info {
 
     ## 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);
+    if ($cust_payby) {
+      $p->{'custpaybynum'} = $cust_payby->custpaybynum;
+      update_payby($p);
+    }
+    else {
+      insert_payby($p);
+    }
   }
 
   my $new = new FS::cust_main { $cust_main->hash };
@@ -928,6 +933,12 @@ sub payment_info {
   $return{credit_card_surcharge_percentage} = $conf->config('credit-card-surcharge-percentage', $cust_main->agentnum);
   $return{credit_card_surcharge_flatfee} = $conf->config('credit-card-surcharge-flatfee', $cust_main->agentnum);
 
+  # A value for 'payby' must be defined in %return
+  $return{payby} = $return{paybys}->[0]
+    if !$return{payby}
+    && ref $return{paybys}
+    && scalar @{ $return{paybys} };
+
   return { 'error' => '',
            %return,
          };
@@ -1697,6 +1708,9 @@ sub insert_payby {
      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 = new FS::cust_payby {
     'custnum' => $custnum,