X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=InternetSecure.pm;h=cf0eec1a120fabec9b48d7c2a05c08ed2382732d;hb=152f5e48d91d3eee3f77f58a703f2a5cadf76c78;hp=c70b79f89d9c4ebcddb026e98ba438ae6d04fd34;hpb=c205128a87a645f3e65be5f58ca04e124d56e9b2;p=Business-OnlinePayment-InternetSecure.git

diff --git a/InternetSecure.pm b/InternetSecure.pm
index c70b79f..cf0eec1 100755
--- a/InternetSecure.pm
+++ b/InternetSecure.pm
@@ -37,8 +37,9 @@ sub set_defaults {
 	$self->path('/process.cgi');
 
 	$self->build_subs(qw(
-				receipt_number	sales_order_number
-				card_type
+				receipt_number	sales_number
+				date
+				card_type	cardholder
 				total_amount
 				avs_response	cvv2_response
 			));
@@ -56,18 +57,6 @@ sub get_fields {
 	return %new;
 }
 
-# OnlinePayment's remap_fields is buggy, so we simply rewrite it
-#
-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 {
@@ -108,14 +97,13 @@ sub parse_expdate {
 # Convert a single product into a product string
 #
 sub prod_string {
-	my ($self, $currency, $taxes, %data) = @_;
+	my ($self, $currency, %data) = @_;
 
 	croak "Missing amount in product" unless defined $data{amount};
 
 	my @flags = ($currency);
 
-	$taxes = uc $data{taxes} if defined $data{taxes};
-	foreach (split ' ' => $taxes) {
+	foreach (split ' ' => uc($data{taxes} || '')) {
 		croak "Unknown tax code $_" unless /^(GST|PST|HST)$/;
 		push @flags, $_;
 	}
@@ -149,13 +137,11 @@ sub to_xml {
 	croak 'Unsupported action'
 		unless $content{action} =~ /^Normal Authori[zs]ation$/i;
 	
-	$content{currency} ||= 'CAD';
-	$content{currency} = uc $content{currency};
+	$content{currency} = uc($content{currency} || 'CAD');
 	croak "Unknown currency code ", $content{currency}
 		unless $content{currency} =~ /^(CAD|USD)$/;
 	
-	$content{taxes} ||= '';
-	$content{taxes} = uc $content{taxes};
+	$content{taxes} = uc($content{taxes} || '');
 
 	my %data = $self->get_remap_fields(qw(
 			xxxCard_Number		card_number
@@ -184,7 +170,7 @@ sub to_xml {
 	$data{MerchantNumber} = $self->merchant_id;
 
 	$data{xxxCard_Number} =~ tr/ //d;
-	$data{xxxCard_Number} =~ s/^[0-36-9]/4/ if $self->test_transaction;
+	$data{xxxCard_Number} =~ s/^[^3-6]/4/ if $self->test_transaction;
 
 	my ($y, $m) = $self->parse_expdate($content{exp_date});
 	$data{xxxCCYear} = sprintf '%.4u' => $y;
@@ -200,25 +186,26 @@ sub to_xml {
 	
 	if (ref $content{description}) {
 		$data{Products} = join '|' => map $self->prod_string(
-							$content{currency},
-							$content{taxes},
-							%$_),
-						@{ $content{description} };
+						$content{currency},
+						taxes => $content{taxes},
+						%$_),
+					@{ $content{description} };
 	} else {
 		$self->required_fields(qw(amount));
 		$data{Products} = $self->prod_string(
 					$content{currency},
-					$content{taxes},
-					amount => $content{amount},
+					taxes       => $content{taxes},
+					amount      => $content{amount},
 					description => $content{description},
 				);
 	}
 
 	xml_out(\%data,
-		NoAttr => 1,
-		RootName => 'TranxRequest',
-		SuppressEmpty => undef,
-		XMLDecl => '<?xml version="1.0" encoding="utf-8" standalone="yes"?>',
+		NoAttr		=> 1,
+		NumericEscape	=> 2,
+		RootName	=> 'TranxRequest',
+		SuppressEmpty	=> undef,
+		XMLDecl		=> '<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?>',
 	);
 }
 
@@ -240,6 +227,8 @@ sub parse_response {
 	my ($self, $response) = @_;
 
 	$self->server_response($response);
+
+	local $/ = "\n";  # Make sure to avoid bug #17687
 	
 	$response = xml_in($response,
  			ForceArray => [qw(product flag)],
@@ -253,7 +242,9 @@ sub parse_response {
 
 	$self->infuse($response, qw(
 			ReceiptNumber		receipt_number
-			SalesOrderNumber	sales_order_number
+			SalesOrderNumber	sales_number
+			Date			date
+			xxxName			cardholder
 			CardType		card_type
 			Page			result_code
 			ApprovalCode		authorization
@@ -287,15 +278,16 @@ sub submit {
 				undef,
 				make_form(
 					xxxRequestMode => 'X',
-					xxxRequestData => Encode::encode_utf8(
-								$self->to_xml
-							  ),
+					xxxRequestData => $self->to_xml,
 				)
 			);
 
 	croak 'Error connecting to server' unless $page;
 	croak 'Server responded, but not in XML' unless $page =~ /^<\?xml/;
 
+	# The response is marked UTF-8, but it's really Latin-1.  Sigh.
+	$page =~ s/^(<\?xml.*?) encoding="utf-8"/$1 encoding="iso-8859-1"/si;
+
 	$self->parse_response($page);
 }
 
@@ -365,7 +357,8 @@ to the merchant ID assigned to you by InternetSecure.
 
 =head1 METHODS
 
-(See L<Business::OnlinePayment> for more methods.)
+(Other methods are also available -- see L<Business::OnlinePayment> for more
+details.)
 
 =head2 Before order submission
 
@@ -428,12 +421,14 @@ Code (CVC2) or Card Identification number (CID), depending on the card issuer.
 A short description of the purchase.  See L<"Products list syntax"> for
 an alternate syntax that allows a list of products to be specified.
 
-=item amount
+=item amount (usually required)
+
+Total amount to be billed, excluding taxes if they are to be added separately
+by InternetSecure.
 
-Total amount to be billed, excluding taxes if they are to be added separately.
-This field is required if B<description> is a string, and should be left
-undefined if B<description> contains a list of products, as outlined in
-L<"Products list syntax">.
+This field is required if B<description> is a string, but should be left
+undefined if B<description> contains a list of products instead, as outlined
+in L<"Products list syntax">.
 
 =item currency
 
@@ -442,11 +437,10 @@ C<CAD> (default) or C<USD>.
 
 =item taxes
 
-Taxes to be added automatically.  These should not be included in B<amount>;
-they will be automatically added by InternetSecure later on.
+Taxes to be added automatically to B<amount> by InternetSecure.
 
-Available taxes are C<GST>, C<PST> and C<HST>.  Taxes can be combined by
-separating them with spaces, such as C<GST HST>.
+Available taxes are C<GST>, C<PST> and C<HST>.  Multiple taxes can specified
+by concatenating them with spaces, such as C<GST HST>.
 
 =item name / company / address / city / state / zip / country / phone / email
 
@@ -461,14 +455,29 @@ Customer information.  B<Country> should be a two-letter code taken from ISO
 
 =over 4
 
-=item receipt_number() / sales_order_number()
+=item receipt_number()
+
+Receipt number of this transaction; this is actually a string, unique to all
+InternetSecure transactions.
+
+=item sales_number()
 
-Receipt number and sales order number of submitted order.
+Sales order number of this transaction.  This is a number, unique to each
+merchant, which is incremented by 1 each time.
+
+=item date()
+
+Date and time of the transaction.  Format is C<YYYY/MM/DD hh:mm:ss>.
 
 =item total_amount()
 
 Total amount billed for this order, including taxes.
 
+=item cardholder()
+
+Cardholder's name.  This is currently a mere copy of the B<name> field passed
+to B<submit()>.
+
 =item card_type()
 
 Type of the credit card used for the submitted order, being one of the