IS cannot support UTF-8 properly

[Business-OnlinePayment-InternetSecure.git] / InternetSecure.pm

diff --git a/InternetSecure.pm b/InternetSecure.pm
index 65a9112..0029e91 100755 (executable)
--- a/InternetSecure.pm
+++ b/InternetSecure.pm
@@ -37,7 +37,8 @@ sub set_defaults {
        $self->path('/process.cgi');
 
        $self->build_subs(qw(
-                               receipt_number  sales_order_number
+                               receipt_number  sales_number
+                               date
                                card_type
                                total_amount
                                avs_response    cvv2_response
@@ -148,13 +149,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
@@ -183,7 +182,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;
@@ -214,10 +213,11 @@ sub to_xml {
        }
 
        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"?>',
        );
 }
 
@@ -239,6 +239,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)],
@@ -252,7 +254,8 @@ sub parse_response {
 
        $self->infuse($response, qw(
                        ReceiptNumber           receipt_number
-                       SalesOrderNumber        sales_order_number
+                       SalesOrderNumber        sales_number
+                       Date                    date
                        CardType                card_type
                        Page                    result_code
                        ApprovalCode            authorization
@@ -286,15 +289,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);
 }
 
@@ -364,7 +368,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
 
@@ -427,12 +432,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
 
@@ -441,11 +448,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
 
@@ -460,9 +466,19 @@ 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()
+
+Sales order number of this transaction.  This is a number, unique to each
+merchant, which is incremented by 1 each time.
+
+=item date()
 
-Receipt number and sales order number of submitted order.
+Date and time of the transaction.  Format is C<YYYY/MM/DD hh:mm:ss>.
 
 =item total_amount()