X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FClientAPI%2FMyAccount.pm;h=d3b58e3a7672b231f26d1bc0623578e99bf68552;hp=54d53063d651e8739696b50f50328927185415de;hb=297ddd01fb112cf45a6dab819ec56803c953bda5;hpb=8b8ebd929229c8376bb81076071c5e76d2baa0ee

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 54d53063d..d3b58e3a7 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -850,6 +850,9 @@ sub payment_info {
 
       'card_types' => card_types(),
 
+      'withcvv'     => $conf->exists('selfservice-require_cvv'), #or enable optional cvv?
+      'require_cvv' => $conf->exists('selfservice-require_cvv'),
+
       'paytypes' => [ @FS::cust_main::paytypes ],
 
       'paybys' => [ $conf->config('signup_server-payby') ],
@@ -1026,6 +1029,8 @@ sub validate_payment {
           or return { 'error' => "CVV2 (CVC2/CID) is three digits." };
         $paycvv = $1;
       }
+    } elsif ( $conf->exists('selfservice-require_cvv') ) { #and you weren't using a card on file?
+      return { 'error' => 'CVV2 is required' };
     }
   
   } else {