X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=InternetSecure.pm;h=61e210b69a4aa5d1fe0fa0dbcb43ec527388eb76;hb=aee9564f2cae2cd7b63aba4d52105dbf24422bae;hp=c7f71b7d71ebb523076545fa11dbfccf12c76610;hpb=303113808d37201863a56a5dc48e96eff9dc8ee6;p=Business-OnlinePayment-InternetSecure.git

diff --git a/InternetSecure.pm b/InternetSecure.pm
index c7f71b7..61e210b 100755
--- a/InternetSecure.pm
+++ b/InternetSecure.pm
@@ -18,11 +18,11 @@ our $VERSION = '0.01';
 use constant SUCCESS_CODES => qw(2000 90000 900P1);
 
 use constant CARD_TYPES => {
-				VI => 'Visa',
+				AM => 'American Express',
+				JB => 'JCB',
 				MC => 'MasterCard',
-				AX => 'American Express', # FIXME: AM?
 				NN => 'Discover',
-				# JB?
+				VI => 'Visa',
 			};
 
 
@@ -62,6 +62,18 @@ sub get_fields {
 	return %new;
 }
 
+# OnlinePayment's remap_fields is buggy in 2.x; this is copied from 3.x
+#
+sub remap_fields {
+	my ($self, %map) = @_;
+
+	my %content = $self->content();
+	foreach (keys %map) {
+		$content{$map{$_}} = delete $content{$_};
+	}
+	$self->content(%content);
+}
+
 # Combine get_fields and remap_fields for convenience
 #
 sub get_remap_fields {
@@ -142,9 +154,10 @@ sub to_xml {
 
 	$self->required_fields(qw(action card_number exp_date));
 
-	croak 'Unsupported transaction type'
-		if $content{type} && $content{type} !~
-			/^(Visa|MasterCard|American Express|Discover)$/i;
+	croak "Unsupported transaction type: $content{type}"
+		if $content{type} &&
+			! grep lc($content{type}) eq lc($_),
+				values %{+CARD_TYPES};
 	
 	croak 'Unsupported action'
 		unless $content{action} =~ /^Normal Authori[zs]ation$/i;
@@ -425,6 +438,8 @@ Transaction type, being one of the following:
 
 =item - Discover
 
+=item - JCB
+
 =back
 
 (This is actually ignored for the moment, and can be left blank or undefined.)
@@ -571,6 +586,8 @@ following:
 
 =item - Discover
 
+=item - JCB
+
 =back
 
 
@@ -617,15 +634,13 @@ be left undefined.
 
 =head2 Character encoding
 
-Since communication to/from InternetSecure is encoded with UTF-8, all Unicode
-characters are theoretically available when submitting information via
-B<submit>().  (Further restrictions may be imposed by InternetSecure itself.)
+When using non-ASCII characters, all data provided to B<contents>() should
+have been decoded beforehand via the C<Encode> module, unless your data is in
+ISO-8859-1 and you haven't meddled with the C<encoding> pragma.  (Please
+don't.)
 
-When using non-ASCII characters, all data provided to B<submit>() should either
-be in the current native encoding (typically latin-1, unless it was modified
-via the C<encoding> pragma), or be decoded via the C<Encode> module.
-Conversely, all data returned after calling B<submit>() will be automatically
-decoded.
+InternetSecure currently does not handle characters outside of ISO-8859-1, so
+these will be replaced with C<?> before being transmitted.
 
 
 =head1 EXPORT