X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=InternetSecure.pm;h=65847f1aed8cc70bd5c7009aa202f4f129a602ab;hb=e97a2d3512479f30718872b70196a2be18ec2b2e;hp=cb6d00e17306e022f7d21860fec8b263f550c34d;hpb=33cf2e33b4bbd232498303166d1852e9425cd310;p=Business-OnlinePayment-InternetSecure.git

diff --git a/InternetSecure.pm b/InternetSecure.pm
index cb6d00e..65847f1 100755
--- a/InternetSecure.pm
+++ b/InternetSecure.pm
@@ -12,17 +12,17 @@ use XML::Simple qw(xml_in xml_out);
 use base qw(Business::OnlinePayment Exporter);
 
 
-our $VERSION = '0.01';
+our $VERSION = '0.03';
 
 
 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',
 			};
 
 
@@ -50,25 +50,20 @@ sub set_defaults {
 	$self->tax_amounts( {} );
 }
 
-# OnlinePayment's get_fields now filters out undefs in 3.x. :(
-#
-sub get_fields {
-	my ($self, @fields) = @_;
-
-	my %content = $self->content;
-
-	my %new = map +($_ => $content{$_}), @fields;
-
-	return %new;
-}
-
-# Combine get_fields and remap_fields for convenience
+# Combine get_fields and remap_fields for convenience.  Unlike OnlinePayment's
+# remap_fields, this doesn't modify content(), and can therefore be called
+# more than once.  Also, unlike OnlinePayment's get_fields in 3.x, this doesn't
+# exclude undefs.
 #
 sub get_remap_fields {
 	my ($self, %map) = @_;
 
-	$self->remap_fields(reverse %map);
-	my %data = $self->get_fields(keys %map);
+	my %content = $self->content();
+	my %data;
+
+	while (my ($to, $from) = each %map) {
+		$data{$to} = $content{$from};
+	}
 
 	return %data;
 }
@@ -140,11 +135,18 @@ sub to_xml {
 
 	my %content = $self->content;
 
-	$self->required_fields(qw(action card_number exp_date));
+	# Backwards-compatible support for exp_date
+	if (exists $content{exp_date} && ! exists $content{expiration}) {
+		$content{expiration} = delete $content{exp_date};
+		$self->content(%content);
+	}
+
+	$self->required_fields(qw(action card_number expiration));
 
-	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;
@@ -182,7 +184,7 @@ sub to_xml {
 	$data{xxxCard_Number} =~ tr/- //d;
 	$data{xxxCard_Number} =~ s/^[^3-6]/4/ if $self->test_transaction;
 
-	my ($y, $m) = $self->parse_expdate($content{exp_date});
+	my ($y, $m) = $self->parse_expdate($content{expiration});
 	$data{xxxCCYear} = sprintf '%.4u' => $y;
 	$data{xxxCCMonth} = sprintf '%.2u' => $m;
 
@@ -210,13 +212,14 @@ sub to_xml {
 				);
 	}
 
-	xml_out(\%data,
+	# The encode() makes sure to a) strip off non-Latin-1 characters, and
+	# b) turn off the utf8 flag, which confuses XML::Simple
+	encode('ISO-8859-1', xml_out(\%data,
 		NoAttr		=> 1,
-		NumericEscape	=> 2,
 		RootName	=> 'TranxRequest',
 		SuppressEmpty	=> undef,
 		XMLDecl		=> '<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?>',
-	);
+	));
 }
 
 # Map the various fields from the response, and put their values into our
@@ -350,7 +353,7 @@ Business::OnlinePayment::InternetSecure - InternetSecure backend for Business::O
 
   	type		=> 'Visa',			# Optional
 	card_number	=> '4111 1111 1111 1111',
-	exp_date	=> '2004-07',
+	expiration	=> '2004-07',
 	cvv2		=> '000',			# Optional
 
 	name		=> "Fr\x{e9}d\x{e9}ric Bri\x{e8}re",
@@ -424,6 +427,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.)
@@ -432,7 +437,7 @@ Transaction type, being one of the following:
 
 Credit card number.  Spaces and dashes are automatically removed.
 
-=item exp_date (required)
+=item expiration (required)
 
 Credit card expiration date.  Since C<Business::OnlinePayment> does not specify
 any syntax, this module is rather lax regarding what it will accept.  The
@@ -570,6 +575,8 @@ following:
 
 =item - Discover
 
+=item - JCB
+
 =back
 
 
@@ -587,7 +594,7 @@ the following fields:
 
 =over 4
 
-=item amount
+=item amount (required)
 
 Unit price of this product.
 
@@ -616,15 +623,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