X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpayinfo_transaction_Mixin.pm;h=6e4b511d24be586efd40380613b50ad627109612;hb=d8844f49839b56eac11ee931f730d6e47f1ef628;hp=093891e93807186b49ed18a27a96ebd00868755c;hpb=7a618d4493ab7a87f6eabfd1ce3630a6b3436c2f;p=freeside.git

diff --git a/FS/FS/payinfo_transaction_Mixin.pm b/FS/FS/payinfo_transaction_Mixin.pm
index 093891e93..6e4b511d2 100644
--- a/FS/FS/payinfo_transaction_Mixin.pm
+++ b/FS/FS/payinfo_transaction_Mixin.pm
@@ -73,10 +73,7 @@ sub _parse_paybatch {
     my $payment_gateway =
       qsearchs('payment_gateway', { 'gatewaynum' => $gatewaynum } );
 
-    die "payment gateway $gatewaynum not found" #?
-      unless $payment_gateway;
-
-    $processor = $payment_gateway->gateway_module;
+    $processor = $payment_gateway->gateway_module if $payment_gateway;
 
   }
 
@@ -105,7 +102,11 @@ auth, and order_number) as well as payby and payinfo
 sub payinfo_check {
   my $self = shift;
 
-  # All of these can be null, so in principle this could go in payinfo_Mixin.
+  my $conf = new FS::Conf;
+
+  # allow masked payinfo if we never save card numbers
+  local $FS::payinfo_Mixin::ignore_masked_payinfo = 
+    $conf->exists('no_saved_cardnumbers') ? 1 : $FS::payinfo_Mixin::ignore_masked_payinfo;
 
   $self->SUPER::payinfo_check()
   || $self->ut_numbern('gatewaynum')