X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpayinfo_Mixin.pm;h=2d7b4ffe0923125c064d7d9646a3ce34b85b4e45;hb=92fc1fd3db74e352e09b2f362dba605f8c6f16e8;hp=847fcc62ad9ec8660ca0b11460c1e0ea6fd2b354;hpb=0d6bdb9706b6925e4be85d7dabfb9155e1d1f2aa;p=freeside.git diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm index 847fcc62a..2d7b4ffe0 100644 --- a/FS/FS/payinfo_Mixin.pm +++ b/FS/FS/payinfo_Mixin.pm @@ -110,21 +110,26 @@ sub paycvv { =cut sub paymask { - my($self,$paymask)=@_; + my($self, $paymask) = @_; - - if ($paymask ne '') { - # I hate this little bit of magic... I don't expect it to cause a problem, but who knows... - # If the payinfo is passed in masked then ignore it and set it based on the payinfo - # The only guy that should call this in this way is... $self->payinfo + if ( defined($paymask) && $paymask ne '' ) { + # I hate this little bit of magic... I don't expect it to cause a problem, + # but who knows... If the payinfo is passed in masked then ignore it and + # set it based on the payinfo. The only guy that should call this in this + # way is... $self->payinfo $self->setfield('paymask', $self->mask_payinfo()); + } else { + $paymask=$self->getfield('paymask'); if (!defined($paymask) || $paymask eq '') { - # Generate it if it's blank - Note that we're not going to set it - just generate + # Generate it if it's blank - Note that we're not going to set it - just + # generate $paymask = $self->mask_payinfo(); } + } + return $paymask; }